rpms/jakarta-commons-collections/devel collections-tomcat5-build.xml, NONE, 1.1 .cvsignore, 1.8, 1.9 jakarta-commons-collections.spec, 1.45, 1.46 sources, 1.6, 1.7
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Mar 12 23:30:08 UTC 2007
Author: mwringe
Update of /cvs/dist/rpms/jakarta-commons-collections/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32334
Modified Files:
.cvsignore jakarta-commons-collections.spec sources
Added Files:
collections-tomcat5-build.xml
Log Message:
* Mon Mar 12 2007 Matt Wringe <mwringe at redhat.com> - 0:3.1-9jpp.1
- Merge with jpp version
- Fix rpmlint issues
--- NEW FILE collections-tomcat5-build.xml ---
<project name="commons-collections-tomcat5" default="build" basedir=".">
<property name="tomcat-collections.home" value="collections-tomcat5"/>
<property name="commons-collections.home" value="."/>
<property name="tomcat-collections.jar" value="commons-collections-tomcat5.jar"/>
<!-- Java Options -->
<property name="compile.debug" value="true"/>
<property name="compile.deprecation" value="false"/>
<property name="compile.source" value="1.4"/>
<target name="clean">
<delete dir="${tomcat-collections.home}"/>
</target>
<target name="build">
<copy todir="${tomcat-collections.home}">
<fileset dir="${commons-collections.home}" >
<include name="**/collections/CursorableLinkedList.java" />
<include name="**/collections/KeyValue.java" />
<include name="**/collections/LRUMap.java" />
<include name="**/collections/SequencedHashMap.java" />
</fileset>
<!-- <fileset dir="${commons-pool.home}">
<include name="**/*.java" />
<exclude name="**/Stack*.java" />
<exclude name="**/SoftReferenceObjectPool.java" />
<exclude name="**/test/**" />
</fileset>
<fileset dir="${commons-dbcp.home}">
<include name="**/*.java" />
<exclude name="**/test/**" />
<exclude name="${tomcat-dbcp.home}/**"/>
</fileset> -->
</copy>
<replace dir="${tomcat-collections.home}/src/java/org/apache/commons">
<replacefilter token="return UnmodifiableList.decorate(l);"
value="return l;" />
<replacefilter token="import org.apache.commons.collections.list.UnmodifiableList;"
value=" " />
</replace>
<replace dir="${tomcat-collections.home}/src/java/org/apache/commons" >
<replacefilter token="org.apache.commons"
value="org.apache.tomcat.dbcp" />
</replace>
<mkdir dir="${tomcat-collections.home}/src/java/org/apache/tomcat/dbcp" />
<move todir="${tomcat-collections.home}/src/java/org/apache/tomcat/dbcp">
<fileset dir="${tomcat-collections.home}/src/java/org/apache/commons" />
</move>
<mkdir dir="${tomcat-collections.home}/classes"/>
<javac destdir="${tomcat-collections.home}/classes"
optimize="off"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
source="${compile.source}"
sourcepath="${tomcat-collections.home}/src/java"
srcdir="${tomcat-collections.home}/src/java" >
<include name="**" />
</javac>
<jar destfile="${tomcat-collections.home}/${tomcat-collections.jar}"
index="true">
<fileset dir="${tomcat-collections.home}/classes">
<include name="**/*.class" />
<include name="**/*.properties" />
</fileset>
</jar>
</target>
</project>
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-collections/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 18 Jul 2006 01:56:29 -0000 1.8
+++ .cvsignore 12 Mar 2007 23:30:05 -0000 1.9
@@ -1,2 +1,2 @@
+commons-collections-3.1-src.tar.gz
commons-build.tar.gz
-commons-collections-3.1-src-RHCLEAN.tar.bz2
Index: jakarta-commons-collections.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-collections/devel/jakarta-commons-collections.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- jakarta-commons-collections.spec 5 Aug 2006 01:21:11 -0000 1.45
+++ jakarta-commons-collections.spec 12 Mar 2007 23:30:05 -0000 1.46
@@ -38,51 +38,66 @@
%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: 6jpp.1
-Epoch: 0
-Summary: Jakarta Commons Collections Package
-License: Apache Software License v2
-Group: Development/Libraries/Java
-#Source0: http://www.apache.org/dist/jakarta/commons/collections/source/commons-collections-3.1-src.tar.gz
-Source0: %{short_name}-%{version}-src-RHCLEAN.tar.bz2
-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
-
-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
-
-Url: http://jakarta.apache.org/commons/%{base_name}/
-BuildRequires: ant
-BuildRequires: ant-junit
-BuildRequires: jpackage-utils >= 0:1.6
+%define base_name collections
+%define short_name commons-%{base_name}
+%define section free
+
+Name: jakarta-%{short_name}
+Version: 3.1
+Release: 9jpp.1%{?dist}
+Epoch: 0
+Summary: Jakarta Commons Collections Package
+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
+
+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
+
+Url: http://jakarta.apache.org/commons/%{base_name}/
+BuildRequires: ant
+BuildRequires: ant-junit
+BuildRequires: jpackage-utils >= 0:1.6
+BuildRequires: xml-commons-jaxp-1.3-apis
%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
%endif
+
%if ! %{gcj_support}
-BuildArch: noarch
+BuildArch: noarch
%endif
-BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
-Provides: %{short_name}
-Obsoletes: %{short_name}
+BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
+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
@@ -101,43 +116,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
-Requires(post): %{__rm}
-Requires(post): /bin/ln
-Requires(postun): %{__rm}
+Summary: Javadoc for %{name}
+Group: Development/Documentation
%description javadoc
%{summary}.
+%package tomcat5
+Summary: 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
+%endif
+
+%description tomcat5
+Collections dependency for Tomcat5
+
%package testframework-javadoc
-Summary: Javadoc for %{name}-testframework
-Group: Development/Documentation
-Requires(post): %{__rm}
-Requires(post): /bin/ln
-Requires(postun): %{__rm}
+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}.
@@ -164,6 +186,15 @@
%if %{gcj_support}
%patch4 -b .sav
%endif
+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
+%{__sed} -i 's/\r//' README.txt
+%{__sed} -i 's/\r//' NOTICE.txt
%build
%if %{with_maven}
@@ -204,7 +235,11 @@
%endif
%endif
+# commons-collections-tomcat5
+ant -f collections-tomcat5-build.xml
+
%install
+rm -rf $RPM_BUILD_ROOT
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
%if %{with_maven}
@@ -214,6 +249,10 @@
install -m 644 build/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
install -m 644 build/%{short_name}-testframework-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-testframework-%{version}.jar
%endif
+
+#tomcat5
+install -m 644 collections-tomcat5/%{short_name}-tomcat5.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-tomcat5-%{version}.jar
+
(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|jakarta-||g"`; done)
(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
@@ -224,13 +263,13 @@
%else
cp -pr build/docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
%endif
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
rm -rf target/docs/apidocs
# testframework-javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-testframework-%{version}
cp -pr build/docs/testframework/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-testframework-%{version}
-ln -s %{name}-testframework-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}-testframework # ghost symlink
+ln -s %{name}-testframework-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}-testframework
# manual
%if %{with_maven}
@@ -245,24 +284,6 @@
%clean
rm -rf $RPM_BUILD_ROOT
-%post javadoc
-rm -f %{_javadocdir}/%{name}
-ln -s %{name}-%{version} %{_javadocdir}/%{name}
-
-%postun javadoc
-if [ "$1" = "0" ]; then
- rm -f %{_javadocdir}/%{name}
-fi
-
-%post testframework-javadoc
-rm -f %{_javadocdir}/%{name}-testframework
-ln -s %{name}-testframework-%{version} %{_javadocdir}/%{name}-testframework
-
-%postun testframework-javadoc
-if [ "$1" = "0" ]; then
- rm -f %{_javadocdir}/%{name}-testframework
-fi
-
%post
%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
@@ -295,9 +316,26 @@
fi
%endif
+%post tomcat5
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+ %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun tomcat5
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+ %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+
%files
%defattr(0644,root,root,0755)
-%doc PROPOSAL.html README.txt STATUS.html LICENSE.txt RELEASE-NOTES.html
+%doc PROPOSAL.html README.txt STATUS.html LICENSE.txt RELEASE-NOTES.html NOTICE.txt
%{_javadir}/%{name}-%{version}.jar
%{_javadir}/%{name}.jar
%{_javadir}/%{short_name}-%{version}.jar
@@ -318,15 +356,23 @@
%attr(-,root,root) %{_libdir}/gcj/%{name}/jakarta-commons-collections-testframework-3.1.jar.*
%endif
+%files tomcat5
+%defattr(0644,root,root,0755)
+%{_javadir}/*-tomcat5*.jar
+%doc LICENSE.txt NOTICE.txt
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/*-tomcat5*
+%endif
+
%files javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}-%{version}
-%ghost %{_javadocdir}/%{name}
+%{_javadocdir}/%{name}
%files testframework-javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}-testframework-%{version}
-%ghost %{_javadocdir}/%{name}-testframework
+%{_javadocdir}/%{name}-testframework
%if %{with_maven}
%files manual
@@ -335,6 +381,23 @@
%endif
%changelog
+* Mon Mar 12 2007 Matt Wringe <mwringe at redhat.com> - 0:3.1-9jpp.1
+- Merge with jpp version
+- Fix rpmlint issues
+
+* Fri Feb 23 2007 Jason Corley <jason.corley at gmail.com> 0:3.1-9jpp
+- update copyright to contain current year
+- rebuild on RHEL4 to avoid broken jar repack script in FC6
+
+* Fri Jan 26 2007 Matt Wringe <mwringe at redhat.com> - 0:3.1-8jpp
+- Fix bug in collections-tomcat5-build.xml
+
+* Fri Jan 19 2007 Matt Wringe <mwringe at redhat.com> - 0:3.1-7jpp
+- Add tomcat5 subpackage
+- Add versioning to provides and obsoletes
+- Move rm -rf %%RPM_BUILD_ROOT from %%prep to %%install
+- Add missing maven dependencies
+
* Fri Aug 04 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:3.1-6jpp.1
- Resync with JPP.
@@ -399,7 +462,7 @@
- Use absolute paths for rebuild-gcj-db.
* Thu May 5 2005 Gary Benson <gbenson at redhat.com> - 0:3.1-1jpp_3fc
-- Add dependencies for %post and %postun scriptlets (#156901).
+- Add dependencies for %%post and %%postun scriptlets (#156901).
* Wed May 4 2005 Gary Benson <gbenson at redhat.com> - 0:3.1-1jpp_2fc
- BC-compile.
@@ -460,7 +523,7 @@
with distro using bash 1.1x
* Fri Jun 07 2002 Henri Gomez <hgomez at users.sourceforge.net> 2.0-2jpp
-- added short names in %{_javadir}, as does jakarta developpers
+- added short names in %%{_javadir}, as does jakarta developpers
* Mon May 06 2002 Guillaume Rousse <guillomovitch at users.sourceforge.net> 2.0-1jpp
- 2.0
@@ -469,7 +532,7 @@
- regenerated patch
* Sat Jan 19 2002 Guillaume Rousse <guillomovitch at users.sourceforge.net> 1.0-5jpp
-- renamed to %{name}
+- renamed to %%{name}
- additional sources in individual archives
- versioned dir for javadoc
- section macro
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-collections/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 18 Jul 2006 01:56:29 -0000 1.6
+++ sources 12 Mar 2007 23:30:05 -0000 1.7
@@ -1,2 +1,2 @@
-a9522fe95e0fe85857174b3c19763c97 commons-build.tar.gz
-3d6210f5d37eec3b85b17fa30b486072 commons-collections-3.1-src-RHCLEAN.tar.bz2
+2da710d9c81ae85ee3a386e7ed1b1fe8 commons-collections-3.1-src.tar.gz
+ae5c78642da2f356e0d9806c6ce5f265 commons-build.tar.gz
More information about the fedora-cvs-commits
mailing list