Author: glen Date: Wed Dec 12 22:07:12 2007 GMT Module: SPECS Tag: HEAD ---- Log message: - unify java package; rel 2
---- Files affected: SPECS: xml-commons-external.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/xml-commons-external.spec diff -u SPECS/xml-commons-external.spec:1.4 SPECS/xml-commons-external.spec:1.5 --- SPECS/xml-commons-external.spec:1.4 Mon Feb 12 23:09:23 2007 +++ SPECS/xml-commons-external.spec Wed Dec 12 23:07:07 2007 @@ -1,11 +1,13 @@ # $Revision$, $Date$ -# TODO: something with org.apache.env.which (currently xml-commons-which.jar in xml-commons), -# then obsolete xml-commons here +# TODO +# - something with org.apache.env.which (currently xml-commons-which.jar in +# xml-commons), then obsolete xml-commons here +%include /usr/lib/rpm/macros.java Summary: Apache XML Commons External classes Summary(pl.UTF-8): Klasy Apache XML Commons External Name: xml-commons-external Version: 1.3.04 -Release: 1 +Release: 2 License: Apache v2.0 Group: Development/Languages/Java Source0: http://www.apache.org/dist/xml/commons/%{name}-%{version}-src.tar.gz @@ -16,9 +18,10 @@ BuildRequires: ant BuildRequires: jdk BuildRequires: jpackage-utils +BuildRequires: rpm-javaprov BuildRequires: rpmbuild(macros) >= 1.300 +Requires: jpackage-utils BuildArch: noarch -ExclusiveArch: i586 i686 pentium3 pentium4 athlon %{x8664} noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -45,7 +48,6 @@ %prep %setup -q -c - cp %{SOURCE1} build.xml # for build.xml @@ -53,7 +55,6 @@ ln -s ../javax ../org ../manifest.commons src %build -export JAVA_HOME="%{java_home}" # default 64m is too low #export ANT_OPTS="-Xmx128m" %ant jar javadoc @@ -64,32 +65,28 @@ install build/xml-apis.jar $RPM_BUILD_ROOT%{_javadir}/xml-apis-%{version}.jar install build/xml-apis-ext.jar $RPM_BUILD_ROOT%{_javadir}/xml-apis-ext-%{version}.jar -ln -sf xml-apis-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/xml-apis.jar -ln -sf xml-apis-ext-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/xml-apis-ext.jar +ln -s xml-apis-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/xml-apis.jar +ln -s xml-apis-ext-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/xml-apis-ext.jar install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -cp -pr build/docs/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} +cp -a build/docs/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} +ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink %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 +ln -nfs %{name}-%{version} %{_javadocdir}/%{name} %files %defattr(644,root,root,755) %doc LICENSE* NOTICE README.* -%{_javadir}/xml-apis*.jar +%{_javadir}/*.jar %files javadoc %defattr(644,root,root,755) %{_javadocdir}/%{name}-%{version} +%ghost %{_javadocdir}/%{name} %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -97,6 +94,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.5 2007-12-12 22:07:07 glen +- unify java package; rel 2 + Revision 1.4 2007-02-12 22:09:23 glen - tabs in preamble ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/xml-commons-external.spec?r1=1.4&r2=1.5&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
