rpms/classpathx-mail/devel classpathx-mail.spec,1.28,1.29

[David Walluck]

Author: dwalluck

Update of /cvs/pkgs/rpms/classpathx-mail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18076

Modified Files:
	classpathx-mail.spec 
Log Message:
- remove javadoc scriptlets (Resolves: #205191)
- replace /usr/sbin with %%{_sbindir}



Index: classpathx-mail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/classpathx-mail/devel/classpathx-mail.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- classpathx-mail.spec	9 Jul 2008 17:45:21 -0000	1.28
+++ classpathx-mail.spec	23 Oct 2008 17:07:16 -0000	1.29
@@ -37,7 +37,7 @@
 
 Name:           classpathx-mail
 Version:        1.1.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Epoch:          0
 Summary:        GNU JavaMail(tm)
 
@@ -67,8 +67,8 @@
 Requires:       jaf >= 0:1.0
 Requires:       jce
 Requires:       java-sasl
-Requires(preun):  /usr/sbin/update-alternatives
-Requires(post):  /usr/sbin/update-alternatives
+Requires(preun):  %{_sbindir}/update-alternatives
+Requires(post):  %{_sbindir}/update-alternatives
 Provides:       javamail = 0:%{jmailver}
 # For backward compatibility with former monolithic subpackages
 Provides:       javamail-monolithic = 0:%{jmailver}
@@ -88,8 +88,6 @@
 Group:          Development/Documentation
 Provides:       javamail-javadoc = 0:%{jmailver}
 BuildRequires:  java-javadoc, jaf-javadoc
-Requires(post): /bin/rm /bin/ln
-Requires(postun): /bin/rm
 
 %description    javadoc
 %{summary}.
@@ -171,7 +169,6 @@
 cp -pR docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{jmailver}
 ln -s %{name}-%{jmailver} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
 
-
 %if %{gcj_support}
 %{_bindir}/aot-compile-rpm
 %endif
@@ -187,7 +184,7 @@
 ln -s %{_sysconfdir}/alternatives/javamail %{_javadir}/javamail.jar
 
 %post
-/usr/sbin/update-alternatives --install %{_javadir}/javamail.jar javamail %{_javadir}/classpathx-mail-1.3.1-monolithic.jar 010301
+%{_sbindir}/update-alternatives --install %{_javadir}/javamail.jar javamail %{_javadir}/classpathx-mail-1.3.1-monolithic.jar 010301
 
 %if %{gcj_support}
 if [ -x %{_bindir}/rebuild-gcj-db ]
@@ -206,19 +203,9 @@
 
 %preun
 if [ "$1" = "0" ]; then
-    /usr/sbin/update-alternatives --remove javamail %{_javadir}/classpathx-mail-1.3.1-monolithic.jar
-fi
-
-%post javadoc
-rm -f %{_javadocdir}/%{name}
-ln -s %{name}-%{jmailver} %{_javadocdir}/%{name}
-
-%postun javadoc
-if [ "$1" = "0" ]; then
-    rm -f %{_javadocdir}/%{name}
+    %{_sbindir}/update-alternatives --remove javamail %{_javadir}/classpathx-mail-1.3.1-monolithic.jar
 fi
 
-
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog COPYING
@@ -251,11 +238,14 @@
 
 %files javadoc
 %defattr(644,root,root,755)
-%doc %{_javadocdir}/%{name}-%{jmailver}
-%ghost %{_javadocdir}/%{name}
-
+%{_javadocdir}/%{name}-%{jmailver}
+%{_javadocdir}/%{name}
 
 %changelog
+* Thu Oct 23 2008 David Walluck <dwalluck at redhat.com> 0:1.1.1-7
+- remove javadoc scriptlets (Resolves: #205191)
+- replace /usr/sbin with %%{_sbindir}
+
 * Wed Jul  9 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0:1.1.1-6
 - drop repotag
 - fix license tag