SPECS: java-bcel.spec - javadoc bcond - unify java package - added two line...

[pawelz]

Author: pawelz                       Date: Mon Apr 13 15:21:28 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- javadoc bcond
- unify java package
- added two lines to last commit log

---- Files affected:
SPECS:
   java-bcel.spec (1.13 -> 1.14) 

---- Diffs:

================================================================
Index: SPECS/java-bcel.spec
diff -u SPECS/java-bcel.spec:1.13 SPECS/java-bcel.spec:1.14
--- SPECS/java-bcel.spec:1.13	Mon Apr 13 17:15:32 2009
+++ SPECS/java-bcel.spec	Mon Apr 13 17:21:22 2009
@@ -1,4 +1,5 @@
 # $Revision$, $Date$
+%bcond_without	javadoc		# don't build javadoc
 %if "%{pld_release}" == "ti"
 %bcond_without	java_sun	# build with gcj
 %else
@@ -88,35 +89,45 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-find . -name "*.jar" -exec rm -f {} \;
+find -name "*.jar" -exec rm -f {} \;
 
 %build
 
 CLASSPATH="$(build-classpath regexp)"
 export JAVA_HOME="%{java_home}"
 
-%ant jar apidocs
+%ant jar %{?with_javadoc:apidocs}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_javadir},%{_javadocdir}/%{srcname}-%{version}}
+install -d $RPM_BUILD_ROOT%{_javadir}
 
-cp -p bin/bcel.jar $RPM_BUILD_ROOT%{_javadir}/bcel-%{version}.jar
-ln -sf bcel-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/bcel.jar
+cp -p bin/%{srcname}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-%{version}.jar
+ln -sf %{srcname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}.jar
 
+%if %{with javadoc}
+install -d $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
 cp -R docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
+ln -s %{srcname}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{srcname} # ghost symlink
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post javadoc
+ln -nfs %{srcname}-%{version} %{_javadocdir}/%{srcname}
+
 %files
 %defattr(644,root,root,755)
 %doc LICENSE.txt
 %{_javadir}/*.jar
 
+%if %{with javadoc}
 %files javadoc
 %defattr(644,root,root,755)
-%doc %{_javadocdir}/%{srcname}-%{version}
+%{_javadocdir}/%{srcname}-%{version}
+%ghost %{_javadocdir}/%{srcname}
+%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 
@@ -125,9 +136,16 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2009/04/13 15:21:22  pawelz
+- javadoc bcond
+- unify java package
+- added two lines to last commit log
+
 Revision 1.13  2009/04/13 15:15:32  pawelz
 - renamed to java-bcel
 - jdk bconds
+- include java rpm macros
+- allow build-classpath to die and break build process
 
 Revision 1.12  2007/02/13 08:06:35  glen
 - tabs in preamble
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-bcel.spec?r1=1.13&r2=1.14&f=u