SPECS: java-classpathx_servlet.spec - cleanup after rename - jdk bconds - j...

[pawelz]

Author: pawelz                       Date: Sat Apr 11 13:03:24 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- cleanup after rename
- jdk bconds
- javadoc bcond

---- Files affected:
SPECS:
   java-classpathx_servlet.spec (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: SPECS/java-classpathx_servlet.spec
diff -u SPECS/java-classpathx_servlet.spec:1.9 SPECS/java-classpathx_servlet.spec:1.10
--- SPECS/java-classpathx_servlet.spec:1.9	Sat Apr 11 14:33:26 2009
+++ SPECS/java-classpathx_servlet.spec	Sat Apr 11 15:03:19 2009
@@ -1,5 +1,14 @@
 # $Revision$, $Date$
+%bcond_without	javadoc		# don't build javadoc
+%if "%{pld_release}" == "ti"
+%bcond_without	java_sun	# build with gcj
+%else
+%bcond_with	java_sun	# build with java-sun
+%endif
+
 %include	/usr/lib/rpm/macros.java
+
+%define		srcname		classpathx_servlet
 Summary:	Alternative Servlet implementation
 Summary(pl.UTF-8):	Alternatywna implementacja Java Servlet API
 Name:		java-classpathx_servlet
@@ -10,7 +19,10 @@
 Source0:	http://www.euronet.nl/~pauls/java/servlet/download/classpathx_servlet-%{version}.tar.gz
 # Source0-md5:	a81feddb91b1358f9aaed94e83eddb54
 URL:		http://www.euronet.nl/~pauls/java/servlet/
+%{!?with_java_sun:BuildRequires:	java-gcj-compat-devel}
+%{?with_java_sun:BuildRequires:	java-sun}
 BuildRequires:	jpackage-utils
+BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
 Provides:	classpathx_servlet
@@ -35,6 +47,7 @@
 Summary(pl.UTF-8):	Dokumentacja online do classpathx servlet
 Group:		Documentation
 Requires:	jpackage-utils
+Obsoletes:	classpathx_servlet-javadoc
 
 %description javadoc
 Documentation for classpathx servlet.
@@ -67,16 +80,18 @@
 cp -a servlet_intl-2.2.jar $RPM_BUILD_ROOT%{_javadir}
 
 # javadoc
-install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -a apidoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-rm -rf $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/{Makefile,CVS}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
+%if %{with javadoc}
+install -d $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
+cp -a apidoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
+rm -rf $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}/{Makefile,CVS}
+ln -s %{srcname}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{srcname} # ghost symlink
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post javadoc
-ln -nfs %{name}-%{version} %{_javadocdir}/%{name}
+ln -nfs %{srcname}-%{version} %{_javadocdir}/%{srcname}
 
 %files
 %defattr(644,root,root,755)
@@ -88,10 +103,12 @@
 %{_javadir}/servlet_intl-2.1.jar
 %{_javadir}/servlet_intl-2.2.jar
 
+%if %{with javadoc}
 %files javadoc
 %defattr(644,root,root,755)
-%{_javadocdir}/%{name}-%{version}
-%ghost %{_javadocdir}/%{name}
+%{_javadocdir}/%{srcname}-%{version}
+%ghost %{_javadocdir}/%{srcname}
+%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -99,6 +116,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2009/04/11 13:03:19  pawelz
+- cleanup after rename
+- jdk bconds
+- javadoc bcond
+
 Revision 1.9  2009/04/11 12:33:26  glen
 - release 5
 
================================================================

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