rpms/jakarta-commons-el/devel jakarta-commons-el.spec,1.33,1.34

[fedora-cvs-commits at redhat.com]

Author: fnasser

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

Modified Files:
	jakarta-commons-el.spec 
Log Message:
Merge with upstream




Index: jakarta-commons-el.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-el/devel/jakarta-commons-el.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- jakarta-commons-el.spec	22 Jul 2006 08:42:19 -0000	1.33
+++ jakarta-commons-el.spec	17 Aug 2006 20:16:34 -0000	1.34
@@ -39,7 +39,7 @@
 
 Name:           %{name}
 Version:        1.0
-Release:        5jpp_4fc
+Release:        7jpp.1
 Epoch:          0
 Summary:        The Jakarta Commons Extension Language
 License:        Apache Software License
@@ -72,7 +72,8 @@
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
 BuildRequires:  java-javadoc
-PreReq: coreutils
+Requires(post): /bin/rm /bin/ln
+Requires(postun): /bin/rm
 %if %{gcj_support}
 BuildRequires:		java-gcj-compat-devel
 Requires(post):		java-gcj-compat
@@ -133,8 +134,21 @@
 rm -f %{_javadocdir}/%{name}
 ln -s %{name}-%{version} %{_javadocdir}/%{name}
 
+%postun javadoc
+if [ "$1" = "0" ]; then
+    rm -f %{_javadocdir}/%{name}
+fi
+
+%if %{gcj_support}
+%post
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
 
 %if %{gcj_support}
+%postun
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
@@ -147,6 +161,7 @@
 %{_javadir}/*
 
 %if %{gcj_support}
+%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/jakarta-commons-el-1.0.jar.*
 %endif
 
@@ -156,11 +171,13 @@
 %ghost %doc %{_javadocdir}/%{name}
 
 
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/jakarta-commons-el-1.0.jar.*
-%endif
-
 %changelog
+* Thu Aug 17 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.0-7jpp.1
+- Merge with upstream
+
+* Thu Aug 17 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.0-7jpp
+- Fix AOT support
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.0-5jpp_4fc
 - Rebuilt
 
@@ -171,6 +188,9 @@
 - Build with gcj_support enabled
 - Add missing BR for jsp (API)
 
+* Fri May 19 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.0-6jpp
+- Add AOT support
+
 * Fri May 19 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.0-5jpp_1fc
 - First build for FC6