rpms/classpathx-jaf/devel classpathx-jaf.spec,1.25,1.26

[David Walluck]

Author: dwalluck

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

Modified Files:
	classpathx-jaf.spec 
Log Message:
- add %%{_javadir}/jaf.jar as %%ghost
- add %%{_javadir}/activation.jar as alternative
- remove jaf-%%{jafver}.jar link
- own %%{_libdir}/gcj/%%{name}
- add generic javadoc directories as alternatives



Index: classpathx-jaf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/classpathx-jaf/devel/classpathx-jaf.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- classpathx-jaf.spec	24 Sep 2008 00:36:10 -0000	1.25
+++ classpathx-jaf.spec	23 Oct 2008 20:02:20 -0000	1.26
@@ -35,7 +35,7 @@
 
 Name:           classpathx-jaf
 Version:        1.0
-Release:        13%{?dist}
+Release:        13.1%{?dist}
 Epoch:          0
 Summary:        GNU JavaBeans(tm) Activation Framework
 Group:          System Environment/Libraries
@@ -46,11 +46,8 @@
 Patch0:         classpathx-jaf-MimeType.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if ! %{gcj_support}
-BuildArch:      noarch
-%endif
-Requires(preun):  /usr/sbin/update-alternatives
-Requires(post):  /usr/sbin/update-alternatives
+Requires(preun): %{_sbindir}/update-alternatives
+Requires(post): %{_sbindir}/update-alternatives
 BuildRequires:  jpackage-utils >= 0:1.6
 BuildRequires:  java-devel
 Provides:       jaf = 0:%{jafver}
@@ -60,6 +57,8 @@
 BuildRequires:          java-gcj-compat-devel
 Requires(post):         java-gcj-compat
 Requires(postun):       java-gcj-compat
+%else
+BuildArch:      noarch
 %endif
 
 %description
@@ -72,15 +71,13 @@
 Group:          Development/Documentation
 Provides:       jaf-javadoc = 0:%{jafver}
 Obsoletes:      gnujaf-javadoc <= 0:1.0-0.rc1.1jpp
+Requires(preun): %{_sbindir}/update-alternatives
+Requires(post): %{_sbindir}/update-alternatives
 BuildRequires:  java-javadoc
-Requires(post):         /bin/ln
-Requires(post):         /bin/rm
-Requires(postun):       /bin/rm
 
 %description    javadoc
 %{summary}.
 
-
 %prep
 %setup -q -n activation-%{version}
 
@@ -103,13 +100,16 @@
 cd $RPM_BUILD_ROOT%{_javadir}
 mv activation.jar %{name}-%{version}.jar
 ln -s %{name}-%{version}.jar %{name}.jar
-ln -s %{name}-%{version}.jar jaf-%{jafver}.jar
+ln -s %{name}.jar jaf.jar
+#ln -s %{name}-%{version}.jar jaf-%{jafver}.jar
 ln -s %{name}-%{version}.jar activation.jar
-#touch jaf.jar
 cd -
-install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/jaf
-cp -pR docs/* $RPM_BUILD_ROOT%{_javadocdir}/jaf
-
+install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -pR docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+# for %%ghost
+ln -s %{name} $RPM_BUILD_ROOT%{_javadocdir}/jaf 
+ln -s %{name} $RPM_BUILD_ROOT%{_javadocdir}/activation
 
 %if %{gcj_support}
 %{_bindir}/aot-compile-rpm
@@ -120,12 +120,15 @@
 
 %triggerpostun -- classpathx-jaf <= 0:1.0-7jpp_5fc
 # Remove file from old non-free packages
-rm -f %{_javadir}/jaf.jar
+%{__rm} -f %{_javadir}/jaf.jar
 # Recreate the link as update-alternatives could not do it
-ln -s %{_sysconfdir}/alternatives/jaf %{_javadir}/jaf.jar
+%{__ln_s} %{_sysconfdir}/alternatives/jaf %{_javadir}/jaf.jar
 
 %post
-/usr/sbin/update-alternatives --install %{_javadir}/jaf.jar jaf %{_javadir}/%{name}.jar 10002
+%{_sbindir}/update-alternatives --install %{_javadir}/jaf.jar jaf %{_javadir}/%{name}.jar 10002
+%{_sbindir}/update-alternatives --install %{_javadir}/activation.jar activation %{_javadir}/%{name}.jar 10002
+%{_sbindir}/update-alternatives --install %{_javadocdir}/jaf jaf_javadoc %{_javadocdir}/%{name} 10002
+%{_sbindir}/update-alternatives --install %{_javadocdir}/activation activation_javadoc %{_javadocdir}/%{name} 10002
 
 %if %{gcj_support}
 if [ -x %{_bindir}/rebuild-gcj-db ]
@@ -144,27 +147,39 @@
 
 %preun
 if [ "$1" = "0" ]; then
-    /usr/sbin/update-alternatives --remove jaf %{_javadir}/%{name}.jar
+    %{_sbindir}/update-alternatives --remove jaf %{_javadir}/%{name}.jar
+    %{_sbindir}/update-alternatives --remove activation %{_javadir}/%{name}.jar
+    %{_sbindir}/update-alternatives --remove jaf_javadoc %{_javadocdir}/%{name}
+    %{_sbindir}/update-alternatives --remove activation_javadoc %{_javadocdir}/%{name}
 fi
 
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog COPYING
-%{_javadir}/activation.jar
-%{_javadir}/jaf-%{jafver}.jar
-#%ghost %{_javadir}/jaf*.jar
-%{_javadir}/%{name}*.jar
-
+%{_javadir}/%{name}.jar
+%{_javadir}/%{name}-%{version}.jar
+%ghost %{_javadir}/activation.jar
+%ghost %{_javadir}/jaf.jar
 %if %{gcj_support}
+%dir %{_libdir}/gcj/%{name}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/classpathx-jaf-1.0.jar.*
 %endif
 
 %files javadoc
 %defattr(644,root,root,755)
-%doc %{_javadocdir}/jaf
-
+%{_javadocdir}/%{name}
+%{_javadocdir}/%{name}-%{version}
+%ghost %{_javadocdir}/jaf
+%ghost %{_javadocdir}/activation
 
 %changelog
+* Thu Oct 23 2008 David Walluck <dwalluck at redhat.com> 0:1.0-13.1
+- add %%{_javadir}/jaf.jar as %%ghost
+- add %%{_javadir}/activation.jar as alternative
+- remove jaf-%%{jafver}.jar link
+- own %%{_libdir}/gcj/%%{name}
+- add generic javadoc directories as alternatives
+
 * Sun Sep 21 2008 Ville Skyttä <ville.skytta at iki.fi> - 0:1.0-13
 - Fix Patch0:/%%patch mismatch.