rpms/jakarta-commons-collections/devel commons-collections-3.2-build_xml.patch, NONE, 1.1 commons-collections-3.2-project_xml.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 jakarta-commons-collections.spec, 1.48, 1.49 sources, 1.7, 1.8 commons-collections-3.1-jpp-depmap.xml, 1.1, NONE commons-collections-3.1-navigation_xml.patch, 1.1, NONE commons-collections-3.1-project_properties.patch, 1.1, NONE
Devrim GÜNDÜZ (devrim)
fedora-extras-commits at redhat.com
Sun Feb 10 02:49:33 UTC 2008
Author: devrim
Update of /cvs/extras/rpms/jakarta-commons-collections/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8578
Modified Files:
.cvsignore jakarta-commons-collections.spec sources
Added Files:
commons-collections-3.2-build_xml.patch
commons-collections-3.2-project_xml.patch
Removed Files:
commons-collections-3.1-jpp-depmap.xml
commons-collections-3.1-navigation_xml.patch
commons-collections-3.1-project_properties.patch
Log Message:
- Updated to 3.2
- Removed patch2 and patch3
- Updated patch1 and patch4.
commons-collections-3.2-build_xml.patch:
--- NEW FILE commons-collections-3.2-build_xml.patch ---
--- build.xml.save 2008-02-09 18:32:49.000000000 -0800
+++ build.xml 2008-02-09 18:34:26.000000000 -0800
@@ -283,7 +283,7 @@
<!-- Runs all tests -->
<target name="-test-all" depends="compile.tests" unless="testcase">
- <junit printsummary="yes" haltonfailure="yes" showoutput="yes">
+ <junit printsummary="yes" haltonfailure="no" showoutput="yes">
<formatter type="brief" />
<classpath>
<pathelement location="${build.classes}"/>
@@ -309,7 +309,7 @@
<!-- Runs a single test -->
<target name="-test-single" depends="compile.tests" if="testcase">
- <junit printsummary="yes" haltonfailure="yes" showoutput="yes">
+ <junit printsummary="yes" haltonfailure="no" showoutput="yes">
<formatter type="brief" />
<classpath>
<pathelement location="${build.classes}"/>
@@ -328,7 +328,7 @@
<target name="testjar" depends="compile.tests,jar"
description="Run all unit test cases">
<echo message="Running collections tests against built jar ..."/>
- <junit printsummary="yes" haltonfailure="yes">
+ <junit printsummary="yes" haltonfailure="no">
<classpath>
<pathelement location="${build.jar.name}"/>
<pathelement location="${build.tests}"/>
commons-collections-3.2-project_xml.patch:
--- NEW FILE commons-collections-3.2-project_xml.patch ---
--- project.xml.sav 2008-02-09 18:25:35.000000000 -0800
+++ project.xml 2008-02-09 18:26:05.000000000 -0800
@@ -451,7 +451,6 @@
<nagEmailAddress>commons-dev at jakarta.apache.org</nagEmailAddress>
<sourceDirectory>src/java</sourceDirectory>
<unitTestSourceDirectory>src/test</unitTestSourceDirectory>
- <integrationUnitTestSourceDirectory/>
<aspectSourceDirectory/>
<unitTest>
<includes>
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jakarta-commons-collections/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 12 Mar 2007 23:30:05 -0000 1.9
+++ .cvsignore 10 Feb 2008 02:48:57 -0000 1.10
@@ -1,2 +1 @@
-commons-collections-3.1-src.tar.gz
-commons-build.tar.gz
+commons-collections-3.2-src.tar.gz
Index: jakarta-commons-collections.spec
===================================================================
RCS file: /cvs/extras/rpms/jakarta-commons-collections/devel/jakarta-commons-collections.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- jakarta-commons-collections.spec 26 Apr 2007 00:49:34 -0000 1.48
+++ jakarta-commons-collections.spec 10 Feb 2008 02:48:57 -0000 1.49
@@ -38,66 +38,62 @@
%define with_maven %{!?_without_maven:1}%{?_without_maven:0}
%define without_maven %{?_without_maven:1}%{!?_without_maven:0}
-%define base_name collections
-%define short_name commons-%{base_name}
-%define section free
-
-Name: jakarta-%{short_name}
-Version: 3.1
-Release: 9jpp.2%{?dist}
-Epoch: 0
-Summary: Provides new interfaces, implementations and utilities for Java Collections
-License: Apache Software License
-Group: Development/Libraries/Java
-Source0: http://www.apache.org/dist/jakarta/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
-Source1: pom-maven2jpp-depcat.xsl
-Source2: pom-maven2jpp-newdepmap.xsl
-Source3: pom-maven2jpp-mapdeps.xsl
-Source4: commons-collections-3.1-jpp-depmap.xml
-Source5: commons-build.tar.gz
-# svn export -r '{2007-02-15}' http://svn.apache.org/repos/asf/jakarta/commons/proper/commons-build/trunk/ commons-build
-# tar czf commons-build.tar.gz commons-build
-Source6: collections-tomcat5-build.xml
+%define base_name collections
+%define short_name commons-%{base_name}
+%define section free
+
+Name: jakarta-%{short_name}
+Version: 3.2
+Release: 1jpp.1%{?dist}
+Epoch: 0
+Summary: Provides new interfaces, implementations and utilities for Java Collections
+License: ASL 2.0
+Group: Development/Libraries/Java
+Source0: http://www.apache.org/dist/jakarta/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
+Source1: pom-maven2jpp-depcat.xsl
+Source2: pom-maven2jpp-newdepmap.xsl
+Source3: pom-maven2jpp-mapdeps.xsl
+Source4: commons-collections-3.2-jpp-depmap.xml
+Source5: commons-build.tar.gz
+Source6: collections-tomcat5-build.xml
Patch0: %{name}-javadoc-nonet.patch
-Patch1: commons-collections-3.1-project_xml.patch
-Patch2: commons-collections-3.1-navigation_xml.patch
-Patch3: commons-collections-3.1-project_properties.patch
-Patch4: commons-collections-3.1-build_xml.patch
+Patch1: commons-collections-3.2-project_xml.patch
+Patch4: commons-collections-3.2-build_xml.patch
Url: http://jakarta.apache.org/commons/%{base_name}/
-BuildRequires: ant
-BuildRequires: ant-junit
-BuildRequires: jpackage-utils >= 0:1.6
-BuildRequires: xml-commons-apis >= 1.3
+BuildRequires: ant
+BuildRequires: ant-junit
+BuildRequires: jpackage-utils >= 0:1.6
+BuildRequires: xml-commons-apis >= 1.3
%if %{with_maven}
-BuildRequires: maven >= 0:1.1
-BuildRequires: maven-plugins-base
-BuildRequires: maven-plugin-test
-BuildRequires: maven-plugin-xdoc
-BuildRequires: maven-plugin-license
-BuildRequires: maven-plugin-changes
-BuildRequires: maven-plugin-jdepend
-BuildRequires: maven-plugin-jdiff
-BuildRequires: maven-plugin-jxr
-BuildRequires: maven-plugin-tasklist
-BuildRequires: maven-plugin-developer-activity
-BuildRequires: maven-plugin-file-activity
-BuildRequires: saxon
-BuildRequires: saxon-scripts
+BuildRequires: maven >= 0:1.1
+BuildRequires: maven-plugins-base
+BuildRequires: maven-plugin-test
+BuildRequires: maven-plugin-xdoc
+BuildRequires: maven-plugin-license
+BuildRequires: maven-plugin-changes
+BuildRequires: maven-plugin-jdepend
+BuildRequires: maven-plugin-jdiff
+BuildRequires: maven-plugin-jxr
+BuildRequires: maven-plugin-tasklist
+BuildRequires: maven-plugin-developer-activity
+BuildRequires: maven-plugin-file-activity
+BuildRequires: saxon
+BuildRequires: saxon-scripts
%endif
%if ! %{gcj_support}
-BuildArch: noarch
+BuildArch: noarch
%endif
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Provides: %{short_name} = %{epoch}:%{version}-%{release}
-Obsoletes: %{short_name} < %{epoch}:%{version}-%{release}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Provides: %{short_name} = %{epoch}:%{version}-%{release}
+Obsoletes: %{short_name} < %{epoch}:%{version}-%{release}
%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
+BuildRequires: java-gcj-compat-devel
+Requires(post): java-gcj-compat
+Requires(postun): java-gcj-compat
%endif
%description
@@ -116,50 +112,50 @@
such as union, intersection, and closure.
%package testframework
-Summary: Testframework for %{name}
-Group: Development/Testing
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Summary: Testframework for %{name}
+Group: Development/Testing
+Requires: %{name} = %{epoch}:%{version}-%{release}
%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
+BuildRequires: java-gcj-compat-devel
+Requires(post): java-gcj-compat
+Requires(postun): java-gcj-compat
%endif
%description testframework
%{summary}.
%package javadoc
-Summary: Javadoc for %{name}
-Group: Development/Documentation
+Summary: Javadoc for %{name}
+Group: Development/Documentation
%description javadoc
%{summary}.
%package tomcat5
-Summary: Jakarta Commons Collection dependency for Tomcat5
-Group: Development/Libraries/Java
+Summary: Jakarta Commons Collection dependency for Tomcat5
+Group: Development/Libraries/Java
%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
+BuildRequires: java-gcj-compat-devel
+Requires(post): java-gcj-compat
+Requires(postun): java-gcj-compat
%endif
%description tomcat5
A package that is specifically designed to fulfill to a Tomcat5 dependency.
%package testframework-javadoc
-Summary: Javadoc for %{name}-testframework
-Group: Development/Documentation
+Summary: Javadoc for %{name}-testframework
+Group: Development/Documentation
%description testframework-javadoc
%{summary}.
%if %{with_maven}
%package manual
-Summary: Documents for %{name}
-Group: Development/Documentation
+Summary: Documents for %{name}
+Group: Development/Documentation
%description manual
%{summary}.
@@ -173,15 +169,13 @@
EOT
-%setup -q -n %{short_name}-%{version}
+%setup -q -n %{short_name}-%{version}-src
gzip -dc %{SOURCE5} | tar xf -
# remove all binary libs
find . -name "*.jar" -exec rm -f {} \;
%patch0 -p1
%patch1 -b .sav
-%patch2 -b .sav
-%patch3 -b .sav
# Avoid fail on error for GCJ. See FIXME below.
%if %{gcj_support}
%patch4 -b .sav
@@ -198,7 +192,7 @@
%build
%if %{with_maven}
-export DEPCAT=$(pwd)/commons-collections-3.1-depcat.new.xml
+export DEPCAT=$(pwd)/commons-collections-3.2-depcat.new.xml
echo '<?xml version="1.0" standalone="yes"?>' > $DEPCAT
echo '<depset>' >> $DEPCAT
for p in $(find . -name project.xml); do
@@ -208,7 +202,7 @@
done
echo >> $DEPCAT
echo '</depset>' >> $DEPCAT
-/usr/bin/saxon $DEPCAT %{SOURCE2} > commons-collections-3.1-depmap.new.xml
+/usr/bin/saxon $DEPCAT %{SOURCE2} > commons-collections-3.2-depmap.new.xml
for p in $(find . -name project.xml); do
pushd $(dirname $p)
@@ -342,7 +336,7 @@
%{_javadir}/%{short_name}.jar
%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/jakarta-commons-collections-3.1.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/jakarta-commons-collections-3.2.jar.*
%endif
%files testframework
@@ -353,7 +347,7 @@
%{_javadir}/%{short_name}-testframework.jar
%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/jakarta-commons-collections-testframework-3.1.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/jakarta-commons-collections-testframework-3.2.jar.*
%endif
%files tomcat5
@@ -381,6 +375,11 @@
%endif
%changelog
+* Sat Feb 9 2008 Devrim GUNDUZ <devrim at commandprompt.com> - 0:3.2-1jpp.1
+- Updated to 3.2
+- Removed patch2 and patch3
+- Updated patch1 and patch4.
+
* Wed Apr 25 2007 Matt Wringe <mwringe at redhat.com> - 0:3.1-9jpp.2
- A couple of spec file cleanups for Fedora Review
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jakarta-commons-collections/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 12 Mar 2007 23:30:05 -0000 1.7
+++ sources 10 Feb 2008 02:48:57 -0000 1.8
@@ -1,2 +1 @@
-2da710d9c81ae85ee3a386e7ed1b1fe8 commons-collections-3.1-src.tar.gz
-ae5c78642da2f356e0d9806c6ce5f265 commons-build.tar.gz
+dbf80727b384bfb9c220d78af30ebc14 commons-collections-3.2-src.tar.gz
--- commons-collections-3.1-jpp-depmap.xml DELETED ---
--- commons-collections-3.1-navigation_xml.patch DELETED ---
--- commons-collections-3.1-project_properties.patch DELETED ---
More information about the fedora-extras-commits
mailing list