SPECS: jakarta-commons-digester.spec - unify java package

[glen]

Author: glen                         Date: Thu Dec 13 23:20:47 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unify java package

---- Files affected:
SPECS:
   jakarta-commons-digester.spec (1.16 -> 1.17) 

---- Diffs:

================================================================
Index: SPECS/jakarta-commons-digester.spec
diff -u SPECS/jakarta-commons-digester.spec:1.16 SPECS/jakarta-commons-digester.spec:1.17
--- SPECS/jakarta-commons-digester.spec:1.16	Mon Apr  9 23:34:08 2007
+++ SPECS/jakarta-commons-digester.spec	Fri Dec 14 00:20:42 2007
@@ -1,4 +1,5 @@
 # $Revision$, $Date$
+%include	/usr/lib/rpm/macros.java
 Summary:	Jakarta Commons Digester - XML to Java object mapping
 Summary(pl.UTF-8):	Jakarta Commons Digester - odwzorowanie XML-a na obiekty Javy
 Name:		jakarta-commons-digester
@@ -15,11 +16,12 @@
 BuildRequires:	jakarta-commons-logging
 BuildRequires:	jdk >= 1.2
 BuildRequires:	jpackage-utils
+BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
 Requires:	jakarta-commons-beanutils
 Requires:	jakarta-commons-collections
 Requires:	jakarta-commons-logging
-Requires:	jre >= 1.2
+Requires:	jpackage-utils
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -60,7 +62,8 @@
 
 %build
 required_jars="commons-beanutils commons-collections commons-logging"
-export CLASSPATH=$(/usr/bin/build-classpath $required_jars)
+CLASSPATH=$(build-classpath $required_jars)
+export CLASSPATH
 %ant dist
 
 %install
@@ -75,19 +78,14 @@
 
 # javadoc
 install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr dist/docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -a dist/docs/* $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)
@@ -97,6 +95,7 @@
 %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
@@ -104,6 +103,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.17  2007-12-13 23:20:42  glen
+- unify java package
+
 Revision 1.16  2007-04-09 21:34:08  glen
 - Group Documentation for -javadoc
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/jakarta-commons-digester.spec?r1=1.16&r2=1.17&f=u