Author: glen Date: Wed Dec 12 22:01:03 2007 GMT Module: SPECS Tag: HEAD ---- Log message: - unify java package; rel 2
---- Files affected: SPECS: xml-commons-resolver.spec (1.10 -> 1.11) ---- Diffs: ================================================================ Index: SPECS/xml-commons-resolver.spec diff -u SPECS/xml-commons-resolver.spec:1.10 SPECS/xml-commons-resolver.spec:1.11 --- SPECS/xml-commons-resolver.spec:1.10 Mon Feb 12 23:09:23 2007 +++ SPECS/xml-commons-resolver.spec Wed Dec 12 23:00:58 2007 @@ -1,9 +1,10 @@ # $Revision$, $Date$ +%include /usr/lib/rpm/macros.java Summary: Apache XML Commons Resolver classes Summary(pl.UTF-8): Klasy Apache XML Commons Resolver Name: xml-commons-resolver Version: 1.2 -Release: 1 +Release: 2 License: Apache v1.1 Group: Development/Languages/Java Source0: http://www.apache.org/dist/xml/commons/%{name}-%{version}.tar.gz @@ -12,9 +13,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 @@ -40,12 +42,10 @@ %prep %setup -q -rm -rf `find . -name "*.jar"` -mv -f resolver.xml build.xml +find -name "*.jar" | xargs rm -v +mv resolver.xml build.xml %build -export JAVA_HOME="%{java_home}" - %ant jar javadocs %install @@ -56,28 +56,24 @@ ln -sf resolver-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/resolver.jar install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -cp -pr build/apidocs/resolver/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} +cp -a build/apidocs/resolver/* $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 KEYS LICENSE.resolver.txt -%{_javadir}/resolver*.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 @@ -85,6 +81,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.11 2007-12-12 22:00:58 glen +- unify java package; rel 2 + Revision 1.10 2007-02-12 22:09:23 glen - tabs in preamble ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/xml-commons-resolver.spec?r1=1.10&r2=1.11&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
