SPECS: xml-commons-resolver.spec - updated to 1.2, removed obsolet...

[qboosh]

Author: qboosh                       Date: Sun Jan  7 15:49:16 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 1.2, removed obsolete source1.4 patch
- separated -javadoc, updated java build system

---- Files affected:
SPECS:
   xml-commons-resolver.spec (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: SPECS/xml-commons-resolver.spec
diff -u SPECS/xml-commons-resolver.spec:1.7 SPECS/xml-commons-resolver.spec:1.8
--- SPECS/xml-commons-resolver.spec:1.7	Fri May 19 13:28:19 2006
+++ SPECS/xml-commons-resolver.spec	Sun Jan  7 16:49:11 2007
@@ -2,20 +2,21 @@
 Summary:	Apache XML Commons Resolver classes
 Summary(pl):	Klasy Apache XML Commons Resolver
 Name:		xml-commons-resolver
-Version:	1.1
+Version:	1.2
 Release:	1
 License:	Apache v1.1
 Group:		Development/Languages/Java
 Source0:	http://www.apache.org/dist/xml/commons/%{name}-%{version}.tar.gz
-# Source0-md5:	deb95bdf88687430445d34e8c11d475e
-Patch0:		%{name}-source1.4.patch
+# Source0-md5:	46d52acdb67ba60f0156043f30108766
 URL:		http://xml.apache.org/commons/
 BuildRequires:	ant
+BuildRequires:	jdk
+BuildRequires:	jpackage-utils
+BuildRequires:	rpmbuild(macros) >= 1.300
 BuildArch:	noarch
+ExclusiveArch:	i586 i686 pentium3 pentium4 athlon %{x8664} noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_javalibdir	%{_datadir}/java
-
 %description
 The Apache XML Commons Resolver classes implement Catalog-based entity
 and URI resolution.
@@ -24,30 +25,59 @@
 Klasy Apache XML Commons Resolver są implementacją rozwiązywania encji
 i URI na podstawie katalogu.
 
+%package javadoc
+Summary:	javadoc documentation for Apache XML Commons Resolver
+Summary(pl):	Dokumentacja javadoc dla pakietu Apache XML Commons Resolver
+Group:		Documentation
+Requires:	jpackage-utils
+
+%description javadoc
+javadoc documentation for Apache XML Commons Resolver.
+
+%description javadoc -l pl
+Dokumentacja javadoc dla pakietu Apache XML Commons Resolver.
+
 %prep
 %setup -q
-%patch0 -p1
 
 rm -rf `find . -name "*.jar"`
 mv -f resolver.xml build.xml
 
 %build
-ant jar javadocs
+export JAVA_HOME="%{java_home}"
+
+%ant jar javadocs
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_javalibdir}
+install -d $RPM_BUILD_ROOT%{_javadir}
 
-install build/resolver.jar $RPM_BUILD_ROOT%{_javalibdir}
-ln -sf resolver.jar $RPM_BUILD_ROOT%{_javalibdir}/resolver-%{version}.jar
+install build/resolver.jar $RPM_BUILD_ROOT%{_javadir}/resolver-%{version}.jar
+ln -sf resolver-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/resolver.jar
+
+install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -pr build/apidocs/resolver/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 
 %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
+
 %files
 %defattr(644,root,root,755)
-%doc KEYS LICENSE.resolver.txt build/apidocs
-%{_javalibdir}/*.jar
+%doc KEYS LICENSE.resolver.txt
+%{_javadir}/resolver*.jar
+
+%files javadoc
+%defattr(644,root,root,755)
+%{_javadocdir}/%{name}-%{version}
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -55,6 +85,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2007/01/07 15:49:11  qboosh
+- updated to 1.2, removed obsolete source1.4 patch
+- separated -javadoc, updated java build system
+
 Revision 1.7  2006/05/19 11:28:19  jajcus
 - s/jakarta-ant/ant/ in BR
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/xml-commons-resolver.spec?r1=1.7&r2=1.8&f=u