SPECS: java_cup.spec - BR: jpackage-utils, rpmbuild(macros) >= 1.3...

[jajcus]

Author: jajcus                       Date: Wed May 24 11:08:58 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- BR: jpackage-utils, rpmbuild(macros) >= 1.300
- ExclusiveArch
- s/_javalibdir/_javadir/
- javadoc subpackage

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

---- Diffs:

================================================================
Index: SPECS/java_cup.spec
diff -u SPECS/java_cup.spec:1.7 SPECS/java_cup.spec:1.8
--- SPECS/java_cup.spec:1.7	Fri May 19 13:28:19 2006
+++ SPECS/java_cup.spec	Wed May 24 13:08:53 2006
@@ -14,12 +14,13 @@
 Source1:	%{name}-build.xml
 URL:		http://www.cs.princeton.edu/~appel/modern/java/CUP/
 BuildRequires:	ant >= 1.5
+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
 Java CUP is a the Java(TM)-based Constructor of Useful Parsers (CUP
 for short). CUP is a system for generating LALR parsers from simple
@@ -37,29 +38,46 @@
 dołączającej osadzony kod w Javie i tworzy analizatory
 zaimplementowane w Javie.
 
+%package javadoc
+Summary:	Java CUP API documentation
+Summary(pl):	Dokumentacja API Java CUP
+Group:		Documentation
+
+%description javadoc
+Java CUP API documentation.
+
+%description javadoc -l pl
+Dokumentacja API Java CUP.
+
 %prep
 %setup -q -c
 cp %{SOURCE1} build.xml
 
 %build
-ant
-ant javadoc
+unset CLASSPATH || :
+export JAVA_HOME="%{java_home}"
+ant dist javadoc
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_javalibdir}
-cp dist/lib/%{name}.jar $RPM_BUILD_ROOT%{_javalibdir}
-cp dist/lib/%{name}-runtime.jar $RPM_BUILD_ROOT%{_javalibdir}
-ln -sf %{name}.jar $RPM_BUILD_ROOT%{_javalibdir}/%{name}-%{version}.jar
-ln -sf %{name}-runtime.jar $RPM_BUILD_ROOT%{_javalibdir}/%{name}-runtime-%{version}.jar
+install -d $RPM_BUILD_ROOT{%{_javadir},%{_javadocdir}/%{name}-%{version}}
+cp dist/lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+cp dist/lib/%{name}-runtime.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-runtime-%{version}.jar
+ln -sf %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+ln -sf %{name}-runtime-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-runtime.jar
+
+cp -R dist/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc README LICENSE CHANGELOG cup_logo.gif manual.html dist/javadoc/*
-%{_javalibdir}/*.jar
+%doc README LICENSE CHANGELOG cup_logo.gif manual.html 
+%{_javadir}/*.jar
+
+%files javadoc
+%doc %{_javadocdir}/%{name}-%{version}
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -67,6 +85,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2006/05/24 11:08:53  jajcus
+- BR: jpackage-utils, rpmbuild(macros) >= 1.300
+- ExclusiveArch
+- s/_javalibdir/_javadir/
+- 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/java_cup.spec?r1=1.7&r2=1.8&f=u