SPECS: xml-commons.spec - unify java package; rel 3

[glen]

Author: glen                         Date: Fri Dec 14 08:17:26 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unify java package; rel 3

---- Files affected:
SPECS:
   xml-commons.spec (1.15 -> 1.16) 

---- Diffs:

================================================================
Index: SPECS/xml-commons.spec
diff -u SPECS/xml-commons.spec:1.15 SPECS/xml-commons.spec:1.16
--- SPECS/xml-commons.spec:1.15	Mon Feb 12 23:09:23 2007
+++ SPECS/xml-commons.spec	Fri Dec 14 09:17:21 2007
@@ -1,11 +1,12 @@
 # $Revision$, $Date$
 %define		_beta	b2
-%define		_rel	2
+%define		_rel	3
+%include	/usr/lib/rpm/macros.java
 Summary:	Common code for XML projects
 Summary(pl.UTF-8):	Wspólny kod dla projektów XML
 Name:		xml-commons
 Version:	1.0
-Release:	0.%{_beta}.1
+Release:	0.%{_beta}.%{_rel}
 License:	Apache Software License
 Group:		Development/Languages/Java
 Source0:	http://www.apache.org/dist/xml/commons/%{name}-%{version}.%{_beta}.tar.gz
@@ -15,9 +16,10 @@
 URL:		http://xml.apache.org/commons/
 BuildRequires:	ant
 BuildRequires:	jpackage-utils
+BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
+Requires:	jpackage-utils
 BuildArch:	noarch
-ExclusiveArch:	i586 i686 pentium3 pentium4 athlon %{x8664} noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -68,24 +70,19 @@
 install java/external/build/xml-apis.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-apis-%{version}.jar
 install java/build/which.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-which-%{version}.jar
 
-ln -sf %{name}-apis-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-apis.jar
-ln -sf %{name}-which-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-which.jar
+ln -s %{name}-apis-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-apis.jar
+ln -s %{name}-which-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-which.jar
 
 # javadoc
 install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -a java/external/build/docs/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post javadoc
-rm -f %{_javadocdir}/%{name}
-ln -s %{name}-%{version} %{_javadocdir}/%{name}
-
-%postun javadoc
-if [ "$1" = "0" ]; then
-	rm -f %{_javadocdir}/%{name}
-fi
+ln -nfs %{name}-%{version} %{_javadocdir}/%{name}
 
 %files
 %defattr(644,root,root,755)
@@ -95,6 +92,7 @@
 %files javadoc
 %defattr(644,root,root,755)
 %{_javadocdir}/%{name}-%{version}
+%ghost %{_javadocdir}/%{name}
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -102,6 +100,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2007-12-14 08:17:21  glen
+- unify java package; rel 3
+
 Revision 1.15  2007-02-12 22:09:23  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/xml-commons.spec?r1=1.15&r2=1.16&f=u