SPECS: template-java.spec - some better ideas from jpackage

glen glen at pld-linux.org
Wed Apr 11 23:09:23 CEST 2007


Author: glen                         Date: Wed Apr 11 21:09:23 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- some better ideas from jpackage

---- Files affected:
SPECS:
   template-java.spec (1.11 -> 1.12) 

---- Diffs:

================================================================
Index: SPECS/template-java.spec
diff -u SPECS/template-java.spec:1.11 SPECS/template-java.spec:1.12
--- SPECS/template-java.spec:1.11	Wed Apr 11 19:02:46 2007
+++ SPECS/template-java.spec	Wed Apr 11 23:09:18 2007
@@ -79,21 +79,17 @@
 # javadoc
 install -d $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)
+%{_javadir}/*.jar
 
 %files doc
 %defattr(644,root,root,755)
@@ -102,6 +98,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
@@ -109,6 +106,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2007/04/11 21:09:18  glen
+- some better ideas from jpackage
+
 Revision 1.11  2007/04/11 17:02:46  glen
 - without api/ subdir in -javadoc
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/template-java.spec?r1=1.11&r2=1.12&f=u



More information about the pld-cvs-commit mailing list