SPECS: java-commons-el.spec, jakarta-commons-el.spec (REMOVED) - rename to ...

[glen]

Author: glen                         Date: Sun Nov 23 23:40:34 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rename to java-commons-el.spec

---- Files affected:
SPECS:
   java-commons-el.spec (1.7 -> 1.8) , jakarta-commons-el.spec (1.7 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: SPECS/java-commons-el.spec
diff -u SPECS/java-commons-el.spec:1.7 SPECS/java-commons-el.spec:1.8
--- SPECS/java-commons-el.spec:1.7	Fri Dec 14 00:50:22 2007
+++ SPECS/java-commons-el.spec	Mon Nov 24 00:40:29 2008
@@ -1,12 +1,16 @@
 # $Revision$, $Date$
+#
+# Conditional build:
+%bcond_without	javadoc		# don't build javadoc
+
 %include	/usr/lib/rpm/macros.java
 Summary:	The Jakarta Commons Extension Language
 Summary(pl.UTF-8):	Jakarta Commons Extension Language - język rozszerzeń Jakarta Commons
 Name:		jakarta-commons-el
 Version:	1.0
 Release:	2
-License:	Apache Software License
-Group:		Development/Languages/Java
+License:	Apache
+Group:		Libraries/Java
 Source0:	http://www.apache.org/dist/jakarta/commons/el/source/commons-el-%{version}-src.tar.gz
 # Source0-md5:	25038283a0b5f638db5e891295d20020
 Patch0:		commons-el-license.patch
@@ -19,8 +23,10 @@
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
 BuildRequires:	servlet
-Obsoletes:	commons-el
 Requires:	jpackage-utils
+Provides:	jakarta-commons-el
+Obsoletes:	commons-el
+Obsoletes:	jakarta-commons-el
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -76,9 +82,11 @@
 ln -s commons-el-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/commons-el.jar
 
 # javadoc
+%if %{with javadoc}
 install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -a dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -91,10 +99,12 @@
 %doc LICENSE.txt STATUS.html
 %{_javadir}/*.jar
 
+%if %{with javadoc}
 %files javadoc
 %defattr(644,root,root,755)
 %{_javadocdir}/%{name}-%{version}
 %ghost %{_javadocdir}/%{name}
+%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -102,7 +112,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.7  2007/12/13 23:50:22  glen
+Revision 1.8  2008/11/23 23:40:29  glen
+- rename to java-commons-el.spec
+
+Revision 1.7  2007-12-13 23:50:22  glen
 - unify java package; rel 2
 
 Revision 1.6  2007-11-20 18:03:40  glen
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-commons-el.spec?r1=1.7&r2=1.8&f=u