SPECS: jakarta-regexp.spec - BR: jpackage-utils, rpmbuild(macros) ...

[jajcus]

Author: jajcus                       Date: Wed May 24 10:25:38 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- BR: jpackage-utils, rpmbuild(macros) >= 1.300
- ExclusiveArch added for builders with JDK
- javadoc subpackage instead of doc subpackage, API docs moved to %{_javadocdir}

---- Files affected:
SPECS:
   jakarta-regexp.spec (1.24 -> 1.25) 

---- Diffs:

================================================================
Index: SPECS/jakarta-regexp.spec
diff -u SPECS/jakarta-regexp.spec:1.24 SPECS/jakarta-regexp.spec:1.25
--- SPECS/jakarta-regexp.spec:1.24	Fri May 19 13:28:19 2006
+++ SPECS/jakarta-regexp.spec	Wed May 24 12:25:32 2006
@@ -11,8 +11,11 @@
 Patch0:		%{name}-build.patch
 URL:		http://jakarta.apache.org/regexp/index.html
 BuildRequires:	ant
+BuildRequires:	jpackage-utils
+BuildRequires:	rpmbuild(macros) >= 1.300
 Requires:	jre
 BuildArch:	noarch
+ExclusiveArch:	i586 i686 pentium3 pentium4 athlon %{x8664} noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -31,16 +34,16 @@
 pakietu obsługującego wyrażenia regularne w Javie na licencji typu
 BSD?".
 
-%package doc
-Summary:	Java Regular Expression documentation
-Summary(pl):	Dokumentacja do javowych wyrażeń regularnych
+%package javadoc
+Summary:	Java Regular Expression API documentation
+Summary(pl):	Dokumentacja API javowych wyrażeń regularnych
 Group:		Development/Languages/Java
 
-%description doc
-Java Regular Expression documentation.
+%description javadoc
+Java Regular Expression API documentation.
 
-%description doc -l pl
-Dokumentacja do javowych wyrażeń regularnych.
+%description javadoc -l pl
+Dokumentacja API javowych wyrażeń regularnych.
 
 %prep
 %setup -q
@@ -53,21 +56,24 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT%{_javadir}
+install -d $RPM_BUILD_ROOT{%{_javadir},%{_javadocdir}/%{name}-%{version}}
+
 install build/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}
 ln -sf %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/regexp.jar
 
+cp -R docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc LICENSE
+%doc LICENSE docs/*.html docs/*.txt
 %{_javadir}/*.jar
 
-%files doc
+%files javadoc
 %defattr(644,root,root,755)
-%doc xdocs docs
+%doc %{_javadocdir}/%{name}-%{version}
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -75,6 +81,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.25  2006/05/24 10:25:32  jajcus
+- BR: jpackage-utils, rpmbuild(macros) >= 1.300
+- ExclusiveArch added for builders with JDK
+- javadoc subpackage instead of doc subpackage, API docs moved to %{_javadocdir}
+
 Revision 1.24  2006/05/19 11:28:19  jajcus
 - s/jakarta-ant/ant/ in BR
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/jakarta-regexp.spec?r1=1.24&r2=1.25&f=u