[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/jakarta-commons-discovery/devel jakarta-commons-discovery.spec, 1.10, 1.11



Author: mwringe

Update of /cvs/dist/rpms/jakarta-commons-discovery/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21997

Modified Files:
	jakarta-commons-discovery.spec 
Log Message:
- Merge with upstream version
 - Add missing javadoc post and postun
 - Add missing javadoc requires



Index: jakarta-commons-discovery.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-discovery/devel/jakarta-commons-discovery.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- jakarta-commons-discovery.spec	22 Jul 2006 08:41:57 -0000	1.10
+++ jakarta-commons-discovery.spec	10 Aug 2006 19:26:52 -0000	1.11
@@ -38,7 +38,7 @@
 Summary:        Jakarta Commons Discovery
 Name:           jakarta-commons-discovery
 Version:        0.3
-Release:        3jpp_2fc
+Release:        4jpp.1
 Epoch:          1
 Group:          Development/Libraries/Java
 License:        Apache Software License
@@ -72,6 +72,8 @@
 %package javadoc
 Group:          Development/Documentation
 Summary:        Javadoc for %{name}
+Requires(post): /bin/rm /bin/ln
+Requires(postun): /bin/rm
 
 %description javadoc
 Javadoc for %{name}.
@@ -106,6 +108,7 @@
 # javadoc
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
 
 # -----------------------------------------------------------------------------
 
@@ -117,6 +120,14 @@
 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
 
 %post
 %if %{gcj_support}
@@ -146,10 +157,16 @@
 %files javadoc
 %defattr(0644,root,root,0755)
 %{_javadocdir}/%{name}-%{version}
+%ghost %doc %{_javadocdir}/%{name}
 
 # -----------------------------------------------------------------------------
 
 %changelog
+* Thu Aug 10 2006 Matt Wringe <mwringe at redhat.com> - 1:0:3-4jpp.1
+- Merge with upstream version
+ - Add missing javadoc post and postun
+ - Add missing javadoc requires
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub redhat com> - 1:0.3-3jpp_2fc
 - Rebuilt
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]