SPECS: java_cup.spec - javadoc was removed from build.xml, so generate it m...

[pawelz]

Author: pawelz                       Date: Thu Feb 19 15:13:52 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- javadoc was removed from build.xml, so generate it manually...
- ...and unify javadoc %%instal and %%files
- drop O: -javadoc
- use java-gcj-compat-devel
- drop EA
- aotoreq: %%include macros.java, BR: java-prov, drop R: jre

---- Files affected:
SPECS:
   java_cup.spec (1.16 -> 1.17) 

---- Diffs:

================================================================
Index: SPECS/java_cup.spec
diff -u SPECS/java_cup.spec:1.16 SPECS/java_cup.spec:1.17
--- SPECS/java_cup.spec:1.16	Tue Feb 13 09:06:36 2007
+++ SPECS/java_cup.spec	Thu Feb 19 16:13:46 2009
@@ -1,7 +1,12 @@
 # $Revision$, $Date$
+#
+# Conditional build:
+%bcond_without	javadoc		# don't build javadoc
+#
+%include	/usr/lib/rpm/macros.java
+#
 %define		ver		0.11a
 %define		pkgver		0.11a-20060912
-
 Summary:	Java-based Constructor of Useful Parsers
 Summary(pl.UTF-8):	Javowy konstruktor przydatnych analizatorów
 Name:		java_cup
@@ -13,13 +18,11 @@
 # Source0-md5:	c9b26e0e6c1c02f2b37148c54b28cd8d
 URL:		http://www2.cs.tum.edu/projects/cup/
 BuildRequires:	ant >= 1.5
+BuildRequires:	java-gcj-compat-devel
 BuildRequires:	jpackage-utils
+BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
-Requires:	jre
-# javadocs disappeared
-Obsoletes:	java_cup-javadoc
 BuildArch:	noarch
-ExclusiveArch:	i586 i686 pentium3 pentium4 athlon %{x8664} noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -57,7 +60,12 @@
 unset CLASSPATH || :
 export JAVA_HOME="%{java_home}"
 
-%ant dist
+%ant -Dbuild.compiler=extJavac dist
+
+%if %{with javadoc}
+export SHELL=/bin/sh
+%javadoc -d dist/javadoc src/java_cup/*.java
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -68,7 +76,12 @@
 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}
+# javadoc
+%if %{with javadoc}
+install -d $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
+cp -a dist/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
+ln -s %{srcname}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{srcname} # ghost symlink
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -78,9 +91,13 @@
 %doc changelog.txt manual.html 
 %{_javadir}/*.jar
 
-#%files javadoc
-#%defattr(644,root,root,755)
-#%doc %{_javadocdir}/%{name}-%{version}
+# javadoc
+%if %{with javadoc}
+%files javadoc
+%defattr(644,root,root,755)
+%{_javadocdir}/%{srcname}-%{version}
+%ghost %{_javadocdir}/%{srcname}
+%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -88,6 +105,14 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.17  2009/02/19 15:13:46  pawelz
+- javadoc was removed from build.xml, so generate it manually...
+- ...and unify javadoc %%instal and %%files
+- drop O: -javadoc
+- use java-gcj-compat-devel
+- drop EA
+- aotoreq: %%include macros.java, BR: java-prov, drop R: jre
+
 Revision 1.16  2007/02/13 08:06:36  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java_cup.spec?r1=1.16&r2=1.17&f=u