SPECS: xerces-j.spec - unify java package, doc->javadoc rename - b...

[glen]

Author: glen                         Date: Sun Dec  2 22:27:59 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unify java package, doc->javadoc rename
- build with jdk 1.3 target/source

---- Files affected:
SPECS:
   xerces-j.spec (1.35 -> 1.36) 

---- Diffs:

================================================================
Index: SPECS/xerces-j.spec
diff -u SPECS/xerces-j.spec:1.35 SPECS/xerces-j.spec:1.36
--- SPECS/xerces-j.spec:1.35	Sun Dec  2 23:19:08 2007
+++ SPECS/xerces-j.spec	Sun Dec  2 23:27:53 2007
@@ -4,9 +4,9 @@
 Summary(pl.UTF-8):	Analizator składniowy XML-a napisany w Javie
 Name:		xerces-j
 Version:	2.9.0
-Release:	2
+Release:	3
 # appears that portions of the code are on other licenses.
-# can it all be called "apache 2.0"?
+# can it all be called "Apache 2.0"?
 License:	Apache v2.0
 Group:		Applications/Publishing/XML/Java
 Source0:	http://www.apache.org/dist/xml/xerces-j/Xerces-J-src.%{version}.tar.gz
@@ -14,6 +14,7 @@
 # Get Xerces-J-tools to avoid BuildRequires: xerces-j
 Source1:	http://www.apache.org/dist/xml/xerces-j/Xerces-J-tools.%{version}.tar.gz
 # Source1-md5:	79d48733b0ab41af190f1af7ca89ab3f
+Patch0:		%{name}-target.patch
 URL:		http://xml.apache.org/xerces-j/
 BuildRequires:	ant >= 1.5
 BuildRequires:	jdk >= 1.1
@@ -33,45 +34,61 @@
 %description -l pl.UTF-8
 Analizator składniowy XML-a napisany w Javie.
 
-%package doc
+%package javadoc
 Summary:	Documentation for Xerces-J - XML parser for Java
 Summary(pl.UTF-8):	Dokumentacja do Xercesa-J - analizatora składniowego XML-a w Javie
 Group:		Documentation
+Requires:	jpackage-utils
+Obsoletes:	xerces-j-doc
 
-%description doc
+%description javadoc
 Documentation for Xerces-J - XML parser for Java.
 
-%description doc -l pl.UTF-8
+%description javadoc -l pl.UTF-8
 Dokumentacja do Xercesa-J - analizatora składniowego XML-a w Javie.
 
+%description javadoc -l fr.UTF-8
+Javadoc pour %{name}.
+
 %prep
 %setup -q -n xerces-%(echo %{version} | tr . _) -a1
+%patch0 -p1
 
 %build
 required_jars='xml-commons-apis'
 export CLASSPATH=$(build-classpath $required_jars):./tools/xercesImpl.jar:./tools/bin/xjavac.jar
 
-%ant clean jars javadocs
+%ant jars javadocs
 
 %install
 rm -rf $RPM_BUILD_ROOT
+# jars
 install -d $RPM_BUILD_ROOT%{_javadir}
 cp -a build/xercesImpl.jar $RPM_BUILD_ROOT%{_javadir}/xerces-j2-%{version}.jar
 ln -sf xerces-j2-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/xerces-j2.jar
 ln -sf xerces-j2-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/jaxp_parser_impl.jar
 ln -sf xerces-j2-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/xercesImpl.jar
 
+# javadoc
+install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -a build/docs/javadocs/* $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
+ln -nfs %{name}-%{version} %{_javadocdir}/%{name}
+
 %files
 %defattr(644,root,root,755)
 %doc LICENSE* NOTICE* README Readme.html
 %{_javadir}/*.jar
 
-%files doc
+%files javadoc
 %defattr(644,root,root,755)
-%doc build/docs/javadocs/*
+%{_javadocdir}/%{name}-%{version}
+%ghost %{_javadocdir}/%{name}
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -79,6 +96,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.36  2007-12-02 22:27:53  glen
+- unify java package, doc->javadoc rename
+- build with jdk 1.3 target/source
+
 Revision 1.35  2007-12-02 22:19:08  glen
 - one more link
 
@@ -146,8 +167,8 @@
 - release 4 - license fix, new doc
 
 Revision 1.14  2002/03/12 17:23:11  aflinta
- - moved xerces.jar to /usr/share/java where other jar files are stored
- - release 3
+- moved xerces.jar to /usr/share/java where other jar files are stored
+- release 3
 
 Revision 1.13  2002/02/22 23:30:05  kloczek
 - removed all Group fields translations (oure rpm now can handle translating
@@ -164,10 +185,10 @@
 - adapterized
 
 Revision 1.10  2002/01/18 02:15:39  kloczek
-perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
+- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
 
 Revision 1.9  2001/09/25 09:36:27  pascalek
--updated to 1.4.3
+- updated to 1.4.3
 
 Revision 1.8  2001/09/18 10:25:42  blues
 - Lecense field must be present
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/xerces-j.spec?r1=1.35&r2=1.36&f=u