SPECS: jakarta-bcel.spec - BR: jpackage-utils, rpmbuild(macros) >=...

[jajcus]

Author: jajcus                       Date: Wed May 24 10:36:57 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- BR: jpackage-utils, rpmbuild(macros) >= 1.300
- P: bcel
- ExclusiveArch for builders with JDK
- API docs installed in %{_javadocdir} and packaged into -javadoc subpackage

---- Files affected:
SPECS:
   jakarta-bcel.spec (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: SPECS/jakarta-bcel.spec
diff -u SPECS/jakarta-bcel.spec:1.7 SPECS/jakarta-bcel.spec:1.8
--- SPECS/jakarta-bcel.spec:1.7	Fri May 19 13:28:19 2006
+++ SPECS/jakarta-bcel.spec	Wed May 24 12:36:50 2006
@@ -15,9 +15,13 @@
 URL:		http://jakarta.apache.org/bcel/
 BuildRequires:	ant
 BuildRequires:	jakarta-regexp
+BuildRequires:	jpackage-utils
+BuildRequires:	rpmbuild(macros) >= 1.300
 BuildRequires:	unzip
 Requires:	jakarta-regexp
+Provides:	bcel
 BuildArch:	noarch
+ExclusiveArch:	i586 i686 pentium3 pentium4 athlon %{x8664} noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -53,15 +57,15 @@
 narzędzia utrudniające analizę oraz narzędzia do analizy, z których
 najpopularniejszym jest procesor XSLT Xalan.
 
-%package doc
+%package javadoc
 Summary:	Byte Code Engineering Library documentation
 Summary(pl):	Dokumentacja do biblioteki do obróbki bajtkodu Javy
 Group:		Documentation
 
-%description doc
+%description javadoc
 Byte Code Engineering Library documentation.
 
-%description doc -l pl
+%description javadoc -l pl
 Dokumentacja do biblioteki do obróbki bajtkodu Javy.
 
 %prep
@@ -72,15 +76,20 @@
 find . -name "*.jar" -exec rm -f {} \;
 
 %build
-CLASSPATH=%{_javadir}/regexp.jar
-export CLASSPATH
+
+export CLASSPATH="`build-classpath regexp`"
+export JAVA_HOME="%{java_home}"
+
 ant jar apidocs
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_javadir}
-cp -p bin/bcel.jar $RPM_BUILD_ROOT%{_javadir}
-ln -sf bcel.jar $RPM_BUILD_ROOT%{_javadir}/bcel-%{version}.jar
+install -d $RPM_BUILD_ROOT{%{_javadir},%{_javadocdir}/%{name}-%{version}}
+
+cp -p bin/bcel.jar $RPM_BUILD_ROOT%{_javadir}/bcel-%{version}.jar
+ln -sf bcel-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/bcel.jar
+
+cp -R docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -90,9 +99,9 @@
 %doc LICENSE.txt
 %{_javadir}/*.jar
 
-%files doc
+%files javadoc
 %defattr(644,root,root,755)
-%doc docs/*
+%doc %{_javadocdir}/%{name}-%{version}
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -100,6 +109,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2006/05/24 10:36:50  jajcus
+- BR: jpackage-utils, rpmbuild(macros) >= 1.300
+- P: bcel
+- ExclusiveArch for builders with JDK
+- API docs installed in %{_javadocdir} and packaged into -javadoc subpackage
+
 Revision 1.7  2006/05/19 11:28:19  jajcus
 - s/jakarta-ant/ant/ in BR
 
================================================================

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