diff --git a/.apache-commons-collections.metadata b/.apache-commons-collections.metadata new file mode 100644 index 0000000..302cfa7 --- /dev/null +++ b/.apache-commons-collections.metadata @@ -0,0 +1 @@ +6925f4a487d58538a4d3ef11d63aefdd66ee2405 SOURCES/commons-collections-3.2.1-src.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index 0e7897f..0000000 --- a/README.md +++ /dev/null @@ -1,5 +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/commons-collections-3.2-build_xml.patch b/SOURCES/commons-collections-3.2-build_xml.patch new file mode 100644 index 0000000..c9169f1 --- /dev/null +++ b/SOURCES/commons-collections-3.2-build_xml.patch @@ -0,0 +1,20 @@ +--- build.xml.orig 2008-11-29 21:16:01.000000000 +0200 ++++ build.xml 2008-11-29 21:17:28.000000000 +0200 +@@ -286,7 +286,7 @@ + + + +- ++ + + + +@@ -331,7 +331,7 @@ + + +- ++ + + + diff --git a/SOURCES/jakarta-commons-collections-javadoc-nonet.patch b/SOURCES/jakarta-commons-collections-javadoc-nonet.patch new file mode 100644 index 0000000..1dcb47a --- /dev/null +++ b/SOURCES/jakarta-commons-collections-javadoc-nonet.patch @@ -0,0 +1,26 @@ +--- commons-collections-3.1/build.xml~ 2004-06-23 00:17:14.000000000 +0100 ++++ commons-collections-3.1/build.xml 2005-05-04 13:58:44.000000000 +0100 +@@ -80,7 +80,6 @@ + + + +- + + + +@@ -362,7 +361,6 @@ + author="true" + version="true" + use="true" +- link="${javadoc.links}" + overview="${source.java}/org/apache/commons/collections/overview.html" + doctitle="${component.title} ${component.version} API;" + windowtitle="${component.title} ${component.version} API" +@@ -470,7 +468,6 @@ + access="protected" + author="false" + version="false" +- link="${javadoc.links}" + overview="${source.test}/org/apache/commons/collections/overview.html" + doctitle="${tf.title} ${tf.version} API;" + windowtitle="${tf.title} ${tf.version} API" diff --git a/SPECS/apache-commons-collections.spec b/SPECS/apache-commons-collections.spec new file mode 100644 index 0000000..45a0df8 --- /dev/null +++ b/SPECS/apache-commons-collections.spec @@ -0,0 +1,190 @@ +%global base_name collections +%global short_name commons-%{base_name} + +Name: apache-%{short_name} +Version: 3.2.1 +Release: 20%{?dist} +Summary: Provides new interfaces, implementations and utilities for Java Collections +License: ASL 2.0 +Group: Development/Libraries +URL: http://commons.apache.org/%{base_name}/ +Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz + +Patch0: jakarta-%{short_name}-javadoc-nonet.patch +Patch4: commons-collections-3.2-build_xml.patch + +BuildArch: noarch + +BuildRequires: java-devel +BuildRequires: jpackage-utils +BuildRequires: maven-local +BuildRequires: maven-antrun-plugin +BuildRequires: maven-assembly-plugin +BuildRequires: maven-compiler-plugin +BuildRequires: maven-jar-plugin +BuildRequires: maven-javadoc-plugin +BuildRequires: maven-install-plugin +BuildRequires: maven-resources-plugin +BuildRequires: maven-doxia-sitetools +BuildRequires: maven-plugin-bundle +BuildRequires: maven-surefire-plugin +BuildRequires: maven-surefire-provider-junit +BuildRequires: ant +BuildRequires: apache-commons-parent >= 26-7 + +Provides: jakarta-%{short_name} = %{version}-%{release} +Obsoletes: jakarta-%{short_name} < %{version}-%{release} +Obsoletes: %{name}-tomcat5 < %{version}-%{release} + +%description +The introduction of the Collections API by Sun in JDK 1.2 has been a +boon to quick and effective Java programming. Ready access to powerful +data structures has accelerated development by reducing the need for +custom container classes around each core object. Most Java2 APIs are +significantly easier to use because of the Collections API. +However, there are certain holes left unfilled by Sun's +implementations, and the Jakarta-Commons Collections Component strives +to fulfill them. Among the features of this package are: +- special-purpose implementations of Lists and Maps for fast access +- adapter classes from Java1-style containers (arrays, enumerations) to +Java2-style collections. +- methods to test or create typical set-theory properties of collections +such as union, intersection, and closure. + +%package testframework +Summary: Testframework for %{name} +Group: Development/Tools +Requires: %{name} = %{version}-%{release} +Provides: jakarta-%{short_name}-testframework = %{version}-%{release} +Obsoletes: jakarta-%{short_name}-testframework < %{version}-%{release} + +%description testframework +%{summary}. + +%package javadoc +Summary: Javadoc for %{name} +Group: Documentation +Provides: jakarta-%{short_name}-javadoc = %{version}-%{release} +Obsoletes: jakarta-%{short_name}-javadoc < %{version}-%{release} + +%description javadoc +%{summary}. + +%package testframework-javadoc +Summary: Javadoc for %{name}-testframework +Group: Documentation +Provides: jakarta-%{short_name}-testframework-javadoc = %{version}-%{release} +Obsoletes: jakarta-%{short_name}-testframework-javadoc < %{version}-%{release} + +%description testframework-javadoc +%{summary}. + +%prep + +%setup -q -n %{short_name}-%{version}-src +# remove all binary libs +find . -name "*.jar" -exec rm -f {} \; + +%patch0 -p1 +%patch4 -b .sav + +# Fix file eof +%{__sed} -i 's/\r//' LICENSE.txt +%{__sed} -i 's/\r//' PROPOSAL.html +%{__sed} -i 's/\r//' RELEASE-NOTES.html +%{__sed} -i 's/\r//' README.txt +%{__sed} -i 's/\r//' NOTICE.txt + +%mvn_file : %{name} %{short_name} +%mvn_alias : "org.apache.commons:%{short_name}" + +%build +%mvn_build + +ant tf.javadoc + +%install +%mvn_install + +# this JAR doesn't have POM file +install -Dm 644 target/%{short_name}-testframework-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-testframework.jar +ln -sr $RPM_BUILD_ROOT%{_javadir}/%{name}-testframework.jar $RPM_BUILD_ROOT%{_javadir}/%{short_name}-testframework.jar + +# testframework-javadoc +install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-testframework +cp -pr build/docs/testframework/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-testframework + +%files -f .mfiles +%doc PROPOSAL.html README.txt LICENSE.txt RELEASE-NOTES.html NOTICE.txt + +%files testframework +%{_javadir}/%{name}-testframework.jar +%{_javadir}/%{short_name}-testframework.jar + +%files javadoc -f .mfiles-javadoc +%doc LICENSE.txt NOTICE.txt + +%files testframework-javadoc +%{_javadocdir}/%{name}-testframework +%doc LICENSE.txt NOTICE.txt + + +%changelog +* Fri Sep 20 2013 Mikolaj Izdebski - 3.2.1-20 +- Add BuildRequires on apache-commons-parent >= 26-7 + +* Mon Aug 26 2013 Michal Srb - 3.2.1-19 +- Migrate away from mvn-rpmbuild (Resolves: #997509) + +* Fri Jun 28 2013 Mikolaj Izdebski - 3.2.1-18 +- Rebuild to regenerate API documentation +- Resolves: CVE-2013-1571 + +* Mon Apr 29 2013 Mikolaj Izdebski - 3.2.1-17 +- Remove unneeded BR: maven-idea-plugin + +* Wed Feb 13 2013 Fedora Release Engineering - 3.2.1-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Feb 06 2013 Java SIG - 3.2.1-15 +- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild +- Replace maven BuildRequires with maven-local + +* Wed Jul 18 2012 Fedora Release Engineering - 3.2.1-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Wed Feb 08 2012 Jaromir Capik 3.2.1-13 +- saxon dependency removed - not needed +- minor spec file changes according to the latest guidelines + +* Thu Jan 12 2012 Fedora Release Engineering - 3.2.1-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Jun 6 2011 Chris Spike 3.2.1-11 +- Added *-testframework depmap entries. + +* Wed Mar 16 2011 Alexander Kurtakov 3.2.1-10 +- Drop tomcat5 subpackage. + +* Mon Feb 07 2011 Fedora Release Engineering - 3.2.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Mon Nov 8 2010 Alexander Kurtakov 3.2.1-8 +- Add commons-collections:commons-collections depmap. + +* Mon Oct 4 2010 Alexander Kurtakov 3.2.1-7 +- Fix pom name. +- Use newer maven plugins names. + +* Tue Aug 30 2010 Carl Green - 3.2.1-6 +- Change package to own files in directories, not the directories + +* Mon Aug 30 2010 Carl Green - 3.2.1-5 +- Remove source and patches no longer needed for Maven +- Fix non-standard groups and remove empty sections +- Fix file permissions + +* Sat Aug 28 2010 Carl Green - 3.2.1-4 +- Renamed from jakarta-commons-collections +- Updated to use maven2 +- Replaced saxon:group instruction with xsl:for-each-group in pom-maven2jpp-newdepmap.xsl