From cb9fe2321c92279fe5965bb30d95cd2d4587a7ff Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Oct 24 2017 08:38:19 +0000 Subject: import rh-maven35-apache-commons-compress-1.14-1.2.el7 --- diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f6e51a8 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/commons-compress-1.14-src.tar.gz diff --git a/.rh-maven35-apache-commons-compress.metadata b/.rh-maven35-apache-commons-compress.metadata new file mode 100644 index 0000000..571b049 --- /dev/null +++ b/.rh-maven35-apache-commons-compress.metadata @@ -0,0 +1 @@ +d0dfc1e5afb577dc7700020814fa91bc8d77e182 SOURCES/commons-compress-1.14-src.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index 98f42b4..0000000 --- a/README.md +++ /dev/null @@ -1,4 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/0001-Remove-Brotli-compressor.patch b/SOURCES/0001-Remove-Brotli-compressor.patch new file mode 100644 index 0000000..10908e0 --- /dev/null +++ b/SOURCES/0001-Remove-Brotli-compressor.patch @@ -0,0 +1,39 @@ +From 93736372a66cc6d35c2b848fd710b39b40293f0d Mon Sep 17 00:00:00 2001 +From: Roman Vais +Date: Wed, 14 Jun 2017 14:00:28 +0200 +Subject: [PATCH] Remove Brotli compressor + +--- + .../commons/compress/compressors/CompressorStreamFactory.java | 9 --------- + 1 file changed, 9 deletions(-) + +diff --git a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java +index 4bd22aa..238257d 100644 +--- a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java ++++ b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java +@@ -31,8 +31,6 @@ import java.util.Set; + import java.util.SortedMap; + import java.util.TreeMap; + +-import org.apache.commons.compress.compressors.brotli.BrotliCompressorInputStream; +-import org.apache.commons.compress.compressors.brotli.BrotliUtils; + import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream; + import org.apache.commons.compress.compressors.bzip2.BZip2CompressorOutputStream; + import org.apache.commons.compress.compressors.deflate.DeflateCompressorInputStream; +@@ -540,13 +538,6 @@ public class CompressorStreamFactory implements CompressorStreamProvider { + if (BZIP2.equalsIgnoreCase(name)) { + return new BZip2CompressorInputStream(in, actualDecompressConcatenated); + } +- +- if (BROTLI.equalsIgnoreCase(name)) { +- if (!BrotliUtils.isBrotliCompressionAvailable()) { +- throw new CompressorException("Brotli compression is not available."); +- } +- return new BrotliCompressorInputStream(in); +- } + + if (XZ.equalsIgnoreCase(name)) { + if (!XZUtils.isXZCompressionAvailable()) { +-- +2.7.4 + diff --git a/SPECS/apache-commons-compress.spec b/SPECS/apache-commons-compress.spec new file mode 100644 index 0000000..eb16a82 --- /dev/null +++ b/SPECS/apache-commons-compress.spec @@ -0,0 +1,192 @@ +%{?scl:%scl_package apache-%{short_name}} +%{!?scl:%global pkg_name %{name}} + +%global base_name compress +%global short_name commons-%{base_name} + +Name: %{?scl_prefix}apache-%{short_name} +Version: 1.14 +Release: 1.2%{?dist} +Summary: Java API for working with compressed files and archivers +License: ASL 2.0 +URL: http://commons.apache.org/proper/commons-compress/ +BuildArch: noarch + +Source0: http://archive.apache.org/dist/commons/compress/source/%{short_name}-%{version}-src.tar.gz + +Patch0: 0001-Remove-Brotli-compressor.patch + +BuildRequires: %{?scl_prefix}maven-local +BuildRequires: %{?scl_prefix}mvn(junit:junit) +BuildRequires: %{?scl_prefix}mvn(org.apache.commons:commons-parent:pom:) +BuildRequires: %{?scl_prefix}mvn(org.apache.felix:maven-bundle-plugin) +BuildRequires: %{?scl_prefix}mvn(org.powermock:powermock-api-mockito) +BuildRequires: %{?scl_prefix}mvn(org.powermock:powermock-module-junit4) +BuildRequires: %{?scl_prefix}mvn(org.tukaani:xz) + +%description +The Apache Commons Compress library defines an API for working with +ar, cpio, Unix dump, tar, zip, gzip, XZ, Pack200 and bzip2 files. +In version 1.14 read-only support for Brotli decompression has been added, +but it has been removed form this package. + +%package javadoc +Summary: API documentation for %{pkg_name} + +%description javadoc +This package provides %{summary}. + +%prep +%setup -q -n %{short_name}-%{version}-src +%patch0 -p1 +%pom_remove_dep org.brotli:dec + +rm -r src/main/java/org/apache/commons/compress/compressors/brotli +rm -r src/test/java/org/apache/commons/compress/compressors/brotli + +%build +%mvn_file : %{short_name} %{pkg_name} +%mvn_alias : commons: +%mvn_build + +%install +%mvn_install + +%files -f .mfiles +%doc LICENSE.txt NOTICE.txt + +%files javadoc -f .mfiles-javadoc +%doc LICENSE.txt NOTICE.txt + +%changelog +* Thu Jun 22 2017 Michael Simacek - 1.14-1.2 +- Mass rebuild 2017-06-22 + +* Wed Jun 21 2017 Java Maintainers - 1.14-1.1 +- Automated package import and SCL-ization + +* Wed Jun 14 2017 Roman Vais - 1.14-1 +- Update to upstream version 1.14 +- Remove Brotli support, it is not packaged for fedora + +* Fri Feb 10 2017 Fedora Release Engineering - 1.13-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Mon Jan 02 2017 Michael Simacek - 1.13-1 +- Update to upstream version 1.13 + +* Wed Jun 22 2016 Michael Simacek - 1.12-1 +- Update to upstream version 1.12 + +* Mon May 02 2016 Michael Simacek - 1.11-1 +- Update to upstream version 1.11 + +* Wed Feb 03 2016 Fedora Release Engineering - 1.10-0.3.svn1684406 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 1.10-0.2.svn1684406 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Tue Jun 9 2015 Mikolaj Izdebski - 1.10-0.1.svn1684406 +- Update to latest upstream snapshot + +* Tue Oct 14 2014 Mikolaj Izdebski - 1.9-2 +- Remove legacy Obsoletes/Provides for jakarta-commons + +* Mon Oct 13 2014 Mikolaj Izdebski - 1.9-1 +- Update to upstream version 1.9 + +* Wed Jul 30 2014 Mikolaj Izdebski - 1.8.1-3 +- Fix build-requires on apache-commons-parent + +* Sat Jun 07 2014 Fedora Release Engineering - 1.8.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Fri May 23 2014 Mikolaj Izdebski - 1.8.1-1 +- Update to upstream version 1.8.1 + +* Mon Mar 17 2014 Mikolaj Izdebski - 1.8-2 +- Remove dependency on maven-scm-publish-plugin + +* Fri Mar 14 2014 Mikolaj Izdebski - 1.8-1 +- Update to upstream version 1.8 + +* Tue Mar 04 2014 Stanislav Ochotnicky - 1.7-2 +- Use Requires: java-headless rebuild (#1067528) + +* Mon Jan 20 2014 Mikolaj Izdebski - 1.7-1 +- Update to upstream version 1.7 + +* Tue Oct 29 2013 Mikolaj Izdebski - 1.6-1 +- Update to upstream version 1.6 + +* Sat Aug 03 2013 Fedora Release Engineering - 1.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Mar 14 2013 Mikolaj Izdebski - 1.5-1 +- Update to upstream version 1.5 + +* Wed Feb 13 2013 Fedora Release Engineering - 1.4.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Feb 06 2013 Java SIG - 1.4.1-5 +- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild +- Replace maven BuildRequires with maven-local + +* Wed Jan 9 2013 Mikolaj Izdebski - 1.4.1-4 +- Bump release tag + +* Tue Jan 8 2013 Mikolaj Izdebski - 1.4.1-3 +- Build with xmvn +- Update to current packaging guidelines + +* Wed Jul 18 2012 Fedora Release Engineering - 1.4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu May 24 2012 Sandro Mathys - 1.4.1-1 +- Updated to 1.4.1 +- Fixes CVE-2012-2098 Low: Denial of Service + +* Fri Apr 27 2012 Sandro Mathys - 1.4-1 +- Updated to 1.4 + +* Thu Jan 12 2012 Fedora Release Engineering - 1.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Nov 01 2011 Sandro Mathys - 1.3-1 +- Updated to 1.3 + +* Thu Aug 04 2011 Sandro Mathys - 1.2-2 +- Fixing mistake where different versions of the spec file got mixed up + +* Thu Aug 04 2011 Sandro Mathys - 1.2-1 +- Updated to 1.2 + +* Sat Apr 16 2011 Chris Spike 1.1-1 +- Updated to 1.1 +- Adapted to current java packaging guidelines + +* Mon Feb 07 2011 Fedora Release Engineering - 1.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Sun Jul 11 2010 Sandro Mathys - 1.0-8 +- Fixed the Maven depmap line by replacing org.apache.maven by org.apache.commons + +* Mon May 31 2010 Sandro Mathys - 1.0-7 +- Fixed regression with missing Provides/Obsoletes for javadocs +- Fixed changelog format + +* Sun May 23 2010 Sandro Mathys - 1.0-6 +- Fixed Maven depmap to use commons-compress + +* Thu May 13 2010 Sandro Mathys - 1.0-5 +- Added missing Provides/Obsoletes for javadocs + +* Mon May 10 2010 Sandro Mathys - 1.0-4 +- Cleared some problems after the review + +* Thu May 06 2010 Sandro Mathys - 1.0-3 +- Now using maven2 (mvn-jpp) instead of directly calling javac & co + +* Tue May 04 2010 Sandro Mathys - 1.0-2 +- Renamed from jakarta-commons-compress