rpms/xdoclet/devel xdoclet.spec,1.25,1.26

[fedora-cvs-commits at redhat.com]

Author: mwringe

Update of /cvs/dist/rpms/xdoclet/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12875

Modified Files:
	xdoclet.spec 
Log Message:
- Merge with upstream version
- Remove unnecessary define with_gcj_support
- Add missing javadoc requires
- Add missing javadoc postun



Index: xdoclet.spec
===================================================================
RCS file: /cvs/dist/rpms/xdoclet/devel/xdoclet.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- xdoclet.spec	26 Jul 2006 21:02:40 -0000	1.25
+++ xdoclet.spec	4 Aug 2006 15:55:58 -0000	1.26
@@ -28,8 +28,6 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%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
@@ -43,7 +41,7 @@
 
 Name:		xdoclet
 Version:	1.2.3
-Release:	6jpp_4fc
+Release:	7jpp.1
 Epoch:		0
 Summary:	XDoclet Attribute Orientated Programming Framework
 License:	XDoclet Open Source Licence
@@ -132,6 +130,8 @@
 %package javadoc
 Summary:	XDoclet Javadoc
 Group:		Development/Documentation
+Requires(post): /bin/rm /bin/ln
+Requires(postun): /bin/rm
 
 %description javadoc
 This package contains XDoclet javadoc
@@ -217,6 +217,11 @@
 rm -f %{_javadocdir}/%{name}
 ln -s %{name}-%{version} %{_javadocdir}/%{name}
 
+%postun javadoc
+if [ "$1" = "0" ]; then
+    rm -f %{_javadocdir}/%{name}
+fi
+
 %post
 %if %{gcj_support}
 if [ -x %{_bindir}/rebuild-gcj-db ]
@@ -292,6 +297,12 @@
 %doc %{_docdir}/%{name}-%{version}
 
 %changelog
+* Thu Aug 03 2006 Matt Wringe <mwringe at redhat.com> - 0:1.2.3-7jpp.1
+- Merge with upstream version
+- Remove unnecessary define with_gcj_support
+- Add missing javadoc requires
+- Add missing javadoc postun
+
 * Wed Jul 26 2006 Matt Wringe <mwringe at redhat.com> - 0:1.2.3-6jpp_4fc
 - Remove xalan-j2 and xalan-j2-serializer from the ant OPT_JAR_LIST