Author: jajcus Date: Wed May 24 12:19:22 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- BR: jpackage-utils
- ExclusiveArch
- API documentation moved to javadoc subpackage
- examples subpackage added
- versioned JARs, unversioned links
---- Files affected:
SPECS:
xalan-j.spec (1.23 -> 1.24)
---- Diffs:
================================================================
Index: SPECS/xalan-j.spec
diff -u SPECS/xalan-j.spec:1.23 SPECS/xalan-j.spec:1.24
--- SPECS/xalan-j.spec:1.23 Tue May 23 22:34:37 2006
+++ SPECS/xalan-j.spec Wed May 24 14:19:17 2006
@@ -18,6 +18,7 @@
BuildRequires: jakarta-bcel
BuildRequires: jaxp_parser_impl
BuildRequires: jdk >= 1.2
+BuildRequires: jpackage-utils
BuildRequires: rpmbuild(macros) >= 1.300
BuildRequires: xml-commons
# servlet provided by jakarta-servletapi.spec
@@ -29,6 +30,7 @@
Requires: jre >= 1.2
Provides: jaxp_transform_impl
BuildArch: noarch
+ExclusiveArch: i586 i686 pentium3 pentium4 athlon %{x8664} noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -37,16 +39,28 @@
%description -l pl
Procesor XSLT napisany w Javie.
-%package doc
-Summary: Documentation for xalan-j, an XSLT processor for Java
-Summary: Dokumentacja dla xalan-j, procesora XSLT napisanego w Javie
+%package javadoc
+Summary: API documentation for xalan-j, an XSLT processor for Java
+Summary: Dokumentacja API dla xalan-j, procesora XSLT napisanego w Javie
Group: Documentation
+Obsoletes: %{name}-doc
-%description doc
-Documentation for xalan-j, an XSLT processor for Java.
+%description javadoc
+API documentation for xalan-j, an XSLT processor for Java.
-%description doc -l pl
-Dokumentacja dla xalan-j, procesora XSLT napisanego w Javie.
+%description javadoc -l pl
+Dokumentacja API dla xalan-j, procesora XSLT napisanego w Javie.
+
+%package examples
+Summary: Xalan-j, an XSLT processor for Java examples
+Summary: Przykłady dla xalan-j, procesora XSLT napisanego w Javie
+Group: Documentation
+
+%description examples
+Xalan-j, an XSLT processor for Java examples.
+
+%description examples -l pl
+Przykłady dla xalan-j, procesora XSLT napisanego w Javie.
%prep
%setup -q -n xalan-j_%{_ver}
@@ -64,18 +78,22 @@
ln -sf %{_javadir}/bcel.jar bin/BCEL.jar
ln -sf %{_javadir}/regexp.jar bin/regexp.jar
ln -sf %{_javadir}/java_cup-runtime.jar bin/runtime.jar
+
+
%{ant} xsltc.unbundledjar docs xsltc.docs javadocs samples servlet
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_javadir},%{_examplesdir}}
+install -d
$RPM_BUILD_ROOT{%{_javadir},%{_examplesdir},%{_javadocdir}/%{name}-%{version}}
-install build/{xalan,xsltc}.jar $RPM_BUILD_ROOT%{_javadir}
-ln -sf xalan.jar $RPM_BUILD_ROOT%{_javadir}/xalan-%{version}.jar
-ln -sf xalan.jar $RPM_BUILD_ROOT%{_javadir}/jaxp_transform_impl.jar
-ln -sf xsltc.jar $RPM_BUILD_ROOT%{_javadir}/xsltc-%{version}.jar
+install build/xalan.jar $RPM_BUILD_ROOT%{_javadir}/xalan-%{version}.jar
+install build/xsltc.jar $RPM_BUILD_ROOT%{_javadir}/xsltc-%{version}.jar
+ln -sf xalan-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/xalan.jar
+ln -sf xalan-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/jaxp_transform_impl.jar
+ln -sf xsltc-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/xsltc.jar
cp -r samples $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+cp -r build/docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -83,11 +101,14 @@
%files
%defattr(644,root,root,755)
%{_javadir}/*.jar
-%doc NOTICE
+%doc NOTICE build/docs/design build/docs/xsltc
+
+%files javadoc
+%defattr(644,root,root,755)
+%doc %{_javadocdir}/%{name}-%{version}
-%files doc
+%files examples
%defattr(644,root,root,755)
-%doc build/docs/*
%{_examplesdir}/%{name}-%{version}
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -96,6 +117,13 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.24 2006/05/24 12:19:17 jajcus
+- BR: jpackage-utils
+- ExclusiveArch
+- API documentation moved to javadoc subpackage
+- examples subpackage added
+- versioned JARs, unversioned links
+
Revision 1.23 2006/05/23 20:34:37 glen
- rpmbuild(macros) >= 1.300 instead of macros.java rpm-javaprov
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/xalan-j.spec?r1=1.23&r2=1.24&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
