SPECS: jakarta-commons-modeler.spec - do not package src.jar - upd...

[glen]

Author: glen                         Date: Wed Apr 11 21:17:53 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- do not package src.jar
- update from template-java.spec

---- Files affected:
SPECS:
   jakarta-commons-modeler.spec (1.13 -> 1.14) 

---- Diffs:

================================================================
Index: SPECS/jakarta-commons-modeler.spec
diff -u SPECS/jakarta-commons-modeler.spec:1.13 SPECS/jakarta-commons-modeler.spec:1.14
--- SPECS/jakarta-commons-modeler.spec:1.13	Tue Apr 10 00:44:45 2007
+++ SPECS/jakarta-commons-modeler.spec	Wed Apr 11 23:17:45 2007
@@ -1,4 +1,5 @@
 # $Revision$, $Date$
+%include	/usr/lib/rpm/macros.java
 Summary:	Jakarta Commons Modeler - managing resources via Java Management Extensions
 Summary(pl.UTF-8):	Jakarta Commons Modeler - zarządzanie zasobami z użyciem Java Management Extensions
 Name:		jakarta-commons-modeler
@@ -10,6 +11,7 @@
 # Source0-md5:	6de043186a348758c845f1a2321e8308
 URL:		http://jakarta.apache.org/commons/modeler/
 BuildRequires:	ant
+BuildRequires:	rpm-javaprov
 BuildRequires:	jakarta-commons-digester
 BuildRequires:	jakarta-commons-logging
 BuildRequires:	jdk >= 1.2
@@ -53,8 +55,9 @@
 
 %build
 required_jars="commons-digester commons-logging jre/jmx"
-export CLASSPATH=$(/usr/bin/build-classpath $required_jars)
+export CLASSPATH=$(build-classpath $required_jars)
 %ant dist
+mv dist/commons-modeler-src.jar .
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -67,19 +70,14 @@
 
 # javadoc
 install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr dist/docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -a dist/docs/api/* $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 -sf %{name}-%{version} %{_javadocdir}/%{name}
 
 %files
 %defattr(644,root,root,755)
@@ -89,6 +87,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
@@ -96,6 +95,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2007/04/11 21:17:45  glen
+- do not package src.jar
+- update from template-java.spec
+
 Revision 1.13  2007/04/09 22:44:45  glen
 - unify java package, builds with java 1.5
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/jakarta-commons-modeler.spec?r1=1.13&r2=1.14&f=u