rpms/classpathx-jaf/devel classpathx-jaf.spec,1.21,1.22

[fedora-cvs-commits at redhat.com]

Author: vivekl

Update of /cvs/dist/rpms/classpathx-jaf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21115

Modified Files:
	classpathx-jaf.spec 
Log Message:
- Resync with latest from JPP




Index: classpathx-jaf.spec
===================================================================
RCS file: /cvs/dist/rpms/classpathx-jaf/devel/classpathx-jaf.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- classpathx-jaf.spec	18 Aug 2006 16:07:01 -0000	1.21
+++ classpathx-jaf.spec	12 Mar 2007 04:18:38 -0000	1.22
@@ -31,23 +31,19 @@
 %define _with_gcj_support 1
 
 %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
-
-%define section free
 %define jafver  1.0.2
 
 Name:           classpathx-jaf
 Version:        1.0
-Release:        9jpp.1
+Release:        10jpp.1%{?dist}
 Epoch:          0
 Summary:        GNU JavaBeans(tm) Activation Framework
-
-
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://www.gnu.org/software/classpathx/
 Source0:        http://ftp.gnu.org/gnu/classpathx/activation-1.0.tar.gz
 Source1:        http://ftp.gnu.org/gnu/classpathx/activation-1.0.tar.gz.sig
-Patch0:		classpathx-jaf-MimeType.patch
+Patch0:         classpathx-jaf-MimeType.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if ! %{gcj_support}
@@ -56,14 +52,14 @@
 Requires(preun):  /usr/sbin/update-alternatives
 Requires(post):  /usr/sbin/update-alternatives
 BuildRequires:  jpackage-utils >= 0:1.6
-BuildRequires:  %{__make}
+BuildRequires:  java-devel
 Provides:       jaf = 0:%{jafver}
 Obsoletes:      gnujaf <= 0:1.0-0.rc1.1jpp
 
 %if %{gcj_support}
-BuildRequires:		java-gcj-compat-devel
-Requires(post):		java-gcj-compat
-Requires(postun):	java-gcj-compat
+BuildRequires:          java-gcj-compat-devel
+Requires(post):         java-gcj-compat
+Requires(postun):       java-gcj-compat
 %endif
 
 %description
@@ -77,9 +73,9 @@
 Provides:       jaf-javadoc = 0:%{jafver}
 Obsoletes:      gnujaf-javadoc <= 0:1.0-0.rc1.1jpp
 BuildRequires:  java-javadoc
-Requires(post):		/bin/ln
-Requires(post): 	/bin/rm
-Requires(postun):	/bin/rm
+Requires(post):         /bin/ln
+Requires(post):         /bin/rm
+Requires(postun):       /bin/rm
 
 %description    javadoc
 %{summary}.
@@ -111,9 +107,8 @@
 ln -s %{name}-%{version}.jar activation.jar
 #touch jaf.jar
 cd -
-install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/jaf-%{jafver}
-cp -pR docs/* $RPM_BUILD_ROOT%{_javadocdir}/jaf-%{jafver}
-ln -s jaf-%{jafver} $RPM_BUILD_ROOT%{_javadocdir}/jaf
+install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/jaf
+cp -pR docs/* $RPM_BUILD_ROOT%{_javadocdir}/jaf
 
 
 %if %{gcj_support}
@@ -152,16 +147,6 @@
     /usr/sbin/update-alternatives --remove jaf %{_javadir}/%{name}.jar
 fi
 
-
-%post javadoc
-rm -f %{_javadocdir}/jaf
-ln -s jaf-%{jafver} %{_javadocdir}/jaf
-
-%postun javadoc
-if [ "$1" = "0" ]; then
-    rm -f %{_javadocdir}/jaf
-fi
-
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog COPYING
@@ -176,11 +161,13 @@
 
 %files javadoc
 %defattr(644,root,root,755)
-%doc %{_javadocdir}/jaf-%{jafver}
-%ghost %doc %{_javadocdir}/jaf
+%doc %{_javadocdir}/jaf
 
 
 %changelog
+* Sun Mar 11 2007 Vivek Lakshmanan <vivekl at redhat.com> - 0:1.0-10jpp.1.fc7
+- Resync with latest from JPP
+
 * Fri Aug 18 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:1.0-9jpp.1
 - Resync with latest from JPP.