rpms/jakarta-commons-collections/F-10 .cvsignore, 1.10, 1.11 commons-collections-3.2-build_xml.patch, 1.1, 1.2 commons-collections-3.2-project_xml.patch, 1.1, 1.2 jakarta-commons-collections.spec, 1.53, 1.54 sources, 1.9, 1.10

Devrim GÜNDÜZ devrim at fedoraproject.org
Sat Nov 29 20:46:25 UTC 2008


Author: devrim

Update of /cvs/extras/rpms/jakarta-commons-collections/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26732/F-10

Modified Files:
	.cvsignore commons-collections-3.2-build_xml.patch 
	commons-collections-3.2-project_xml.patch 
	jakarta-commons-collections.spec sources 
Log Message:
- Updated to 3.2.1
- Updated patch #1 and #4
- Own %dir %{_libdir}/gcj/%{name}, per #473612.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jakarta-commons-collections/F-10/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	10 Feb 2008 02:48:57 -0000	1.10
+++ .cvsignore	29 Nov 2008 20:45:54 -0000	1.11
@@ -1 +1,2 @@
-commons-collections-3.2-src.tar.gz
+commons-collections-3.2.1-src.tar.gz
+commons-build.tar.gz

commons-collections-3.2-build_xml.patch:

Index: commons-collections-3.2-build_xml.patch
===================================================================
RCS file: /cvs/extras/rpms/jakarta-commons-collections/F-10/commons-collections-3.2-build_xml.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- commons-collections-3.2-build_xml.patch	10 Feb 2008 02:48:57 -0000	1.1
+++ commons-collections-3.2-build_xml.patch	29 Nov 2008 20:45:54 -0000	1.2
@@ -1,24 +1,15 @@
---- 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 @@
- 
+--- 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 @@
    <!-- Runs all tests -->
    <target name="-test-all" depends="compile.tests" unless="testcase">
+     <mkdir dir="${build.test.reports}"/>
 -    <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 @@
+@@ -331,7 +331,7 @@
    <target name="testjar"  depends="compile.tests,jar"
            description="Run all unit test cases">
      <echo message="Running collections tests against built jar ..."/>

commons-collections-3.2-project_xml.patch:

Index: commons-collections-3.2-project_xml.patch
===================================================================
RCS file: /cvs/extras/rpms/jakarta-commons-collections/F-10/commons-collections-3.2-project_xml.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- commons-collections-3.2-project_xml.patch	10 Feb 2008 02:48:57 -0000	1.1
+++ commons-collections-3.2-project_xml.patch	29 Nov 2008 20:45:54 -0000	1.2
@@ -1,7 +1,7 @@
---- 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>
+--- project.xml.old	2008-11-29 22:21:57.000000000 +0200
++++ project.xml	2008-11-29 22:22:05.000000000 +0200
+@@ -455,7 +455,6 @@
+     <nagEmailAddress>dev at commons.apache.org</nagEmailAddress>
      <sourceDirectory>src/java</sourceDirectory>
      <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
 -    <integrationUnitTestSourceDirectory/>


Index: jakarta-commons-collections.spec
===================================================================
RCS file: /cvs/extras/rpms/jakarta-commons-collections/F-10/jakarta-commons-collections.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- jakarta-commons-collections.spec	9 Jul 2008 19:23:23 -0000	1.53
+++ jakarta-commons-collections.spec	29 Nov 2008 20:45:54 -0000	1.54
@@ -43,8 +43,8 @@
 %define section		free
 
 Name:		jakarta-%{short_name}
-Version:	3.2
-Release:	2.3%{?dist}
+Version:	3.2.1
+Release:	1%{?dist}
 Epoch:		0
 Summary:	Provides new interfaces, implementations and utilities for Java Collections
 License:	ASL 2.0
@@ -183,7 +183,6 @@
 cp %{SOURCE6} .
 
 # Fix file eof
-%{__sed} -i 's/\r//' STATUS.html
 %{__sed} -i 's/\r//' LICENSE.txt
 %{__sed} -i 's/\r//' PROPOSAL.html
 %{__sed} -i 's/\r//' RELEASE-NOTES.html
@@ -329,14 +328,18 @@
 
 %files
 %defattr(0644,root,root,0755)
-%doc PROPOSAL.html README.txt STATUS.html LICENSE.txt RELEASE-NOTES.html NOTICE.txt
+%doc PROPOSAL.html README.txt LICENSE.txt RELEASE-NOTES.html NOTICE.txt
 %{_javadir}/%{name}-%{version}.jar
 %{_javadir}/%{name}.jar
 %{_javadir}/%{short_name}-%{version}.jar
 %{_javadir}/%{short_name}.jar
 
 %if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/jakarta-commons-collections-3.2.jar.*
+%dir %{_libdir}/gcj/%{name}
+%endif
+
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/jakarta-commons-collections-3.2.1.jar.*
 %endif
 
 %files testframework
@@ -347,7 +350,7 @@
 %{_javadir}/%{short_name}-testframework.jar
 
 %if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/jakarta-commons-collections-testframework-3.2.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/jakarta-commons-collections-testframework-3.2.1.jar.*
 %endif
 
 %files tomcat5
@@ -375,6 +378,11 @@
 %endif
 
 %changelog
+* Sat Nov 29 2008 Devrim GUNDUZ <devrim at commandprompt.com> - 0:3.2.1-1
+- Updated to 3.2.1
+- Updated patch #1 and #4
+- Own %dir %{_libdir}/gcj/%{name}, per #473612.
+
 * Wed Jul  9 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0:3.2-2.3
 - drop repotag
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jakarta-commons-collections/F-10/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	3 Mar 2008 07:02:56 -0000	1.9
+++ sources	29 Nov 2008 20:45:54 -0000	1.10
@@ -1,2 +1,2 @@
+031ce05872ddb0462f0dcce1e5babbe9  commons-collections-3.2.1-src.tar.gz
 ae5c78642da2f356e0d9806c6ce5f265  commons-build.tar.gz
-dbf80727b384bfb9c220d78af30ebc14  commons-collections-3.2-src.tar.gz




More information about the fedora-extras-commits mailing list