rpms/mx4j/devel mx4j.spec,1.65,1.66

[David Walluck]

Author: dwalluck

Update of /cvs/pkgs/rpms/mx4j/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18855

Modified Files:
	mx4j.spec 
Log Message:
- own %%{_libdir}/gcj/%%{name}
- add %%{_javadocdir}/%%{name} to file list
- remove javadoc scriptlets
- replace /usr/sbin with %%{_sbindir}



Index: mx4j.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mx4j/devel/mx4j.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- mx4j.spec	9 Jul 2008 21:53:21 -0000	1.65
+++ mx4j.spec	24 Oct 2008 20:02:51 -0000	1.66
@@ -40,7 +40,7 @@
 
 Name:           mx4j
 Version:        3.0.1
-Release:        7.6%{?dist}
+Release:        7.7%{?dist}
 Epoch:		1
 Summary:        Open source implementation of JMX Java API
 License:        ASL 1.1
@@ -91,8 +91,8 @@
 Buildarch:      noarch
 %endif
 Requires(pre):	/bin/rm
-Requires(post):       /usr/sbin/update-alternatives
-Requires(postun):       /usr/sbin/update-alternatives
+Requires(post):       %{_sbindir}/update-alternatives
+Requires(postun):       %{_sbindir}/update-alternatives
 Requires:	jaf
 Requires:	javamail >= 0:1.2-5jpp
 Requires:	log4j >= 0:1.2.7
@@ -122,8 +122,6 @@
 Group:          Development/Documentation
 Summary:        Javadoc for %{name}
 Obsoletes:      openjmx-javadoc
-Requires(post):   /bin/rm,/bin/ln
-Requires(postun): /bin/rm
 
 %description javadoc
 Javadoc for %{name}.
@@ -223,6 +221,7 @@
 
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -r dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 %if %{gcj_support}
 %{_bindir}/aot-compile-rpm
@@ -235,7 +234,7 @@
 rm -f %{_javadir}/%{name}.jar
 
 %post
-/usr/sbin/update-alternatives --install %{_javadir}/jmxri.jar jmxri %{_javadir}/%{name}/%{name}-jmx.jar 0
+%{_sbindir}/update-alternatives --install %{_javadir}/jmxri.jar jmxri %{_javadir}/%{name}/%{name}-jmx.jar 0
 
 %if %{gcj_support}
 if [ -x %{_bindir}/rebuild-gcj-db ]
@@ -246,16 +245,7 @@
 
 %postun
 if [ "$1" = "0" ]; then
-	/usr/sbin/update-alternatives --remove jmxri %{_javadir}/%{name}/%{name}-jmx.jar
-fi
-
-%post javadoc
-rm -f %{_javadocdir}/%{name}
-ln -s %{name}-%{version} %{_javadocdir}/%{name}
-
-%postun javadoc
-if [ "$1" = "0" ]; then
-    rm -f %{_javadocdir}/%{name}
+	%{_sbindir}/update-alternatives --remove jmxri %{_javadir}/%{name}/%{name}-jmx.jar
 fi
 
 %if %{gcj_support}
@@ -270,8 +260,8 @@
 %dir %{_javadir}/%{name}
 %{_javadir}/%{name}/*.jar
 %{_javadir}/%{name}/boa/*.jar
-
 %if %{gcj_support}
+%dir %{_libdir}/gcj/%{name}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/mx4j-3.0.1.jar.*
 %attr(-,root,root) %{_libdir}/gcj/%{name}/mx4j-tools-3.0.1.jar.*
 %attr(-,root,root) %{_libdir}/gcj/%{name}/mx4j-remote-boa-3.0.1.jar.*
@@ -286,6 +276,12 @@
 %doc dist/docs/*
 
 %changelog
+* Fri Oct 24 2008 David Walluck <dwalluck at redhat.com> 1:3.0.1-7.7
+- own %%{_libdir}/gcj/%%{name}
+- add %%{_javadocdir}/%%{name} to file list
+- remove javadoc scriptlets
+- replace /usr/sbin with %%{_sbindir}
+
 * Wed Jul  9 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1:3.0.1-7.6
 - really fix license tag