SPECS: jakarta-oro.spec - BR: jdk, jpackage-utils, rpmbuild(macros...

[jajcus]

Author: jajcus                       Date: Thu May 25 12:30:16 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- BR: jdk, jpackage-utils, rpmbuild(macros) >= 1.300
- ExclusiveArch
- API docs moved to %{_javadocdir} in a javadoc subpackage
- sanitize CLASSPATH and JAVA_HOME
- versioned jar

---- Files affected:
SPECS:
   jakarta-oro.spec (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: SPECS/jakarta-oro.spec
diff -u SPECS/jakarta-oro.spec:1.6 SPECS/jakarta-oro.spec:1.7
--- SPECS/jakarta-oro.spec:1.6	Fri May 19 13:28:19 2006
+++ SPECS/jakarta-oro.spec	Thu May 25 14:30:11 2006
@@ -10,12 +10,14 @@
 # Source0-md5:	af58ac4811ee023b6211446eb7b7fff2
 URL:		http://jakarta.apache.org/oro/
 BuildRequires:	ant >= 1.5
+BuildRequires:	jdk
+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)
 
-%define		_javalibdir	%{_datadir}/java
-
 %description
 The Jakarta-ORO Java classes are a set of text-processing Java classes
 that provide Perl5 compatible regular expressions, AWK-like regular
@@ -39,6 +41,17 @@
 praw autorskich do bibliotek ORO. Daniel będzie nadal udzielał się
 przy rozwoju tych bibliotek w projekcie Jakarta.
 
+%package javadoc
+Summary:	Jakarta-ORO API documentation
+Summary(pl):	Dokumentacja API biblioteki Jakarta-ORO
+Group:		Documentation
+
+%description javadoc
+Jakarta-ORO API documentation.
+
+%description javadoc -l pl
+Dokumentacja API biblioteki Jakarta-ORO.
+
 %prep
 %setup -q
 find . -name "*.jar" -exec rm -f {} \;
@@ -46,29 +59,44 @@
 for file in `find . -type f -name .cvsignore`; do rm -rf $file; done
 
 %build
+unset CLASSPATH || :
+export JAVA_HOME="%{java_home}"
 ant -Dfinal.name=oro jar javadocs
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT{%{_javadir},%{_javadocdir}/%{name}-%{version}}
 
-install -d -m 755 $RPM_BUILD_ROOT%{_javalibdir}
-cp oro.jar $RPM_BUILD_ROOT%{_javalibdir}
-ln -sf oro.jar $RPM_BUILD_ROOT%{_javalibdir}/oro-%{version}.jar
+cp oro.jar $RPM_BUILD_ROOT%{_javadir}/oro-%{version}.jar
+ln -sf oro-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/oro.jar
+
+cp -R docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc COMPILE ISSUES README TODO CHANGES CONTRIBUTORS LICENSE STYLE docs/api
+%doc COMPILE ISSUES README TODO CHANGES CONTRIBUTORS LICENSE STYLE
 %{_javadir}/*.jar
 
+%files javadoc
+%defattr(644,root,root,755)
+%doc %{_javadocdir}/%{name}-%{version}
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2006/05/25 12:30:11  jajcus
+- BR: jdk, jpackage-utils, rpmbuild(macros) >= 1.300
+- ExclusiveArch
+- API docs moved to %{_javadocdir} in a javadoc subpackage
+- sanitize CLASSPATH and JAVA_HOME
+- versioned jar
+
 Revision 1.6  2006/05/19 11:28:19  jajcus
 - s/jakarta-ant/ant/ in BR
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/jakarta-oro.spec?r1=1.6&r2=1.7&f=u