Author: glen Date: Sun Dec 2 21:26:37 2007 GMT Module: SPECS Tag: HEAD ---- Log message: - build -tomcat5 dependancy instead of -source for tomcat; rel 3
---- Files affected: SPECS: jakarta-commons-collections.spec (1.18 -> 1.19) ---- Diffs: ================================================================ Index: SPECS/jakarta-commons-collections.spec diff -u SPECS/jakarta-commons-collections.spec:1.18 SPECS/jakarta-commons-collections.spec:1.19 --- SPECS/jakarta-commons-collections.spec:1.18 Sun Dec 2 14:03:07 2007 +++ SPECS/jakarta-commons-collections.spec Sun Dec 2 22:26:32 2007 @@ -4,11 +4,12 @@ Summary(pl.UTF-8): Jakarta Commons Collections - rozszerzenia Java Collections Name: jakarta-commons-collections Version: 3.1 -Release: 2 +Release: 3 License: Apache Group: Development/Languages/Java Source0: http://www.apache.org/dist/jakarta/commons/collections/source/commons-collections-%{version}-src.tar.gz # Source0-md5: 2da710d9c81ae85ee3a386e7ed1b1fe8 +Source1: %{name}-tomcat5-build.xml URL: http://jakarta.apache.org/commons/collections/ BuildRequires: ant BuildRequires: jpackage-utils @@ -39,21 +40,17 @@ %description javadoc -l pl.UTF-8 Dokumentacja do Jakarta Commons Collections. -%package source -Summary: Jakarta Commons Collections source code -Summary(pl.UTF-8): Kod źródłowy Jakarta Commons Collections +%package tomcat5 +Summary: Collection dependency for Tomcat5 Group: Development/Languages/Java -AutoReq: no -AutoProv: no +Obsoletes: jakarta-commons-collections-source -%description source -Jakarta Commons Collections source code. - -%description source -l pl.UTF-8 -Kod źródłowy Jakarta Commons Collections. +%description tomcat5 +Collections dependency for Tomcat5 %prep %setup -q -n commons-collections-%{version} +cp %{SOURCE1} tomcat5-build.xml %build cat <<EOF > build.properties @@ -61,6 +58,9 @@ EOF %ant jar javadoc +# commons-collections-tomcat5 +%ant -f tomcat5-build.xml + %install rm -rf $RPM_BUILD_ROOT # jars @@ -68,15 +68,14 @@ install build/commons-collections-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/commons-collections-%{version}.jar ln -sf commons-collections-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/commons-collections.jar +install collections-tomcat5/commons-collections-tomcat5.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-tomcat5-%{version}.jar +ln -sf %{name}-tomcat5-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-tomcat5.jar + # javadoc install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} cp -a build/docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink -# source code -install -d $RPM_BUILD_ROOT%{_prefix}/src/%{name}-%{version} -cp -a src $RPM_BUILD_ROOT%{_prefix}/src/%{name}-%{version} - %clean rm -rf $RPM_BUILD_ROOT @@ -85,23 +84,28 @@ %files %defattr(644,root,root,755) -%{_javadir}/*.jar +%{_javadir}/commons-collections.jar +%{_javadir}/commons-collections-%{version}.jar + +%files tomcat5 +%defattr(0644,root,root,0755) +%{_javadir}/%{name}-tomcat5.jar +%{_javadir}/%{name}-tomcat5-%{version}.jar %files javadoc %defattr(644,root,root,755) %{_javadocdir}/%{name}-%{version} %ghost %{_javadocdir}/%{name} -%files source -%defattr(644,root,root,755) -%{_prefix}/src/%{name}-%{version} - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team <[EMAIL PROTECTED]> All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.19 2007-12-02 21:26:32 glen +- build -tomcat5 dependancy instead of -source for tomcat; rel 3 + Revision 1.18 2007-12-02 13:03:07 glen - rel 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/jakarta-commons-collections.spec?r1=1.18&r2=1.19&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
