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

[glen]

Author: glen                         Date: Sun Nov 23 23:34:48 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- renamed to java-commons-dbcp.spec

---- Files affected:
SPECS:
   java-commons-dbcp.spec (1.25 -> 1.26) , jakarta-commons-dbcp.spec (1.25 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: SPECS/java-commons-dbcp.spec
diff -u SPECS/java-commons-dbcp.spec:1.25 SPECS/java-commons-dbcp.spec:1.26
--- SPECS/java-commons-dbcp.spec:1.25	Mon Jan 14 21:01:53 2008
+++ SPECS/java-commons-dbcp.spec	Mon Nov 24 00:34:43 2008
@@ -1,19 +1,23 @@
 # $Revision$, $Date$
 # TODO
 # - use ant conditions (replace JDBC_4_ANT_KEY_BEGIN) instead of the code in prep
+#
+# Conditional build:
+%bcond_without	javadoc		# don't build javadoc
+
 %include	/usr/lib/rpm/macros.java
 Summary:	Commons DBCP - database connection pooling
 Summary(pl.UTF-8):	Commons DBCP - zarządzanie połączeniem z bazą danych
-Name:		jakarta-commons-dbcp
+Name:		java-commons-dbcp
 Version:	1.2.2
 Release:	0.2
 License:	Apache
-Group:		Development/Languages/Java
+Group:		Libraries/Java
 Source0:	http://www.apache.org/dist/commons/dbcp/source/commons-dbcp-%{version}-src.tar.gz
 # Source0-md5:	57bad7d2abfaa175c743521caccdbd8f
-Source1:	%{name}-tomcat5-build.xml
-Patch0:		%{name}-bug-191.patch
-Patch1:		%{name}-javadoc.patch
+Source1:	jakarta-commons-dbcp-tomcat5-build.xml
+Patch0:		jakarta-commons-dbcp-bug-191.patch
+Patch1:		jakarta-commons-dbcp-javadoc.patch
 URL:		http://commons.apache.org/dbcp/
 BuildRequires:	ant
 BuildRequires:	jakarta-commons-collections
@@ -26,7 +30,10 @@
 BuildRequires:	rpmbuild(macros) >= 1.300
 Requires:	jakarta-commons-collections
 Requires:	jakarta-commons-pool >= 1.2
+Requires:	jpackage-utils
 Requires:	jre >= 1.2
+Provides:	jakarta-commons-dbcp
+Obsoletes:	jakarta-commons-dbcp
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -107,13 +114,15 @@
 
 install dist/commons-dbcp.jar $RPM_BUILD_ROOT%{_javadir}/commons-dbcp-%{version}.jar
 
-install dbcp-tomcat5/commons-dbcp-tomcat5.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-tomcat5-%{version}.jar
-ln -sf %{name}-tomcat5-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-tomcat5.jar
+install dbcp-tomcat5/commons-dbcp-tomcat5.jar $RPM_BUILD_ROOT%{_javadir}/commons-dbcp-tomcat5-%{version}.jar
+ln -sf commons-dbcp-tomcat5-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/commons-dbcp-tomcat5.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
@@ -129,13 +138,15 @@
 
 %files tomcat5
 %defattr(644,root,root,755)
-%{_javadir}/%{name}-tomcat5.jar
-%{_javadir}/%{name}-tomcat5-%{version}.jar
+%{_javadir}/commons-dbcp-tomcat5.jar
+%{_javadir}/commons-dbcp-tomcat5-%{version}.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
@@ -143,6 +154,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.26  2008/11/23 23:34:43  glen
+- renamed to java-commons-dbcp.spec
+
 Revision 1.25  2008/01/14 20:01:53  qboosh
 - pl for -tomcat5
 - no more Jakarta in descs
================================================================

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