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

[glen]

Author: glen                         Date: Sun Nov 23 23:43:48 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rename to java-commons-logging.spec

---- Files affected:
SPECS:
   java-commons-logging.spec (1.23 -> 1.24) , jakarta-commons-logging.spec (1.23 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: SPECS/java-commons-logging.spec
diff -u SPECS/java-commons-logging.spec:1.23 SPECS/java-commons-logging.spec:1.24
--- SPECS/java-commons-logging.spec:1.23	Sat Dec  8 15:04:49 2007
+++ SPECS/java-commons-logging.spec	Mon Nov 24 00:43:43 2008
@@ -1,18 +1,21 @@
 # $Revision$, $Date$
 # TODO
-# - rename to apache-commons-logging?
 # - update to 1.1 from DEVEL
+#
+# Conditional build:
+%bcond_without	javadoc		# don't build javadoc
+
 %include	/usr/lib/rpm/macros.java
 Summary:	Jakarta Commons Logging - interface for logging systems
 Summary(pl.UTF-8):	Jakarta Commons Logging - interfejs do systemów logujących
-Name:		jakarta-commons-logging
+Name:		java-commons-logging
 Version:	1.0.4
 Release:	4
 License:	Apache
-Group:		Development/Languages/Java
+Group:		Libraries/Java
 Source0:	http://archive.apache.org/dist/commons/logging/source/commons-logging-%{version}-src.tar.gz
 # Source0-md5:	db5dc75c89e794f794be92d10df6be1b
-Patch0:		%{name}-target.patch
+Patch0:		jakarta-commons-logging-target.patch
 URL:		http://commons.apache.org/logging/
 BuildRequires:	ant
 BuildRequires:	jdk >= 1.4
@@ -20,7 +23,10 @@
 BuildRequires:	logging-log4j
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
+Requires:	jpackage-utils
 Requires:	jre >= 1.4
+Provides:	jakarta-commons-logging
+Obsoletes:	jakarta-commons-logging
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -58,20 +64,24 @@
 
 %build
 required_jars="log4j junit logkit avalon-framework"
-export CLASSPATH=$(build-classpath $required_jars)
+CLASSPATH=$(build-classpath $required_jars)
+export CLASSPATH
 %ant dist javadoc
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_javadir},%{_javadocdir}/%{name}-%{version}}
-
-install dist/commons-logging-api.jar $RPM_BUILD_ROOT%{_javadir}/commons-logging-%{version}-api.jar
-install dist/commons-logging.jar $RPM_BUILD_ROOT%{_javadir}/commons-logging-%{version}.jar
+install -d $RPM_BUILD_ROOT%{_javadir}
+cp -a dist/commons-logging-api.jar $RPM_BUILD_ROOT%{_javadir}/commons-logging-%{version}-api.jar
+cp -a dist/commons-logging.jar $RPM_BUILD_ROOT%{_javadir}/commons-logging-%{version}.jar
 ln -s commons-logging-%{version}-api.jar $RPM_BUILD_ROOT%{_javadir}/commons-logging-api.jar
 ln -s commons-logging-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/commons-logging.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
@@ -84,10 +94,12 @@
 %doc dist/*.txt
 %{_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
@@ -95,7 +107,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.23  2007/12/08 14:04:49  glen
+Revision 1.24  2008/11/23 23:43:43  glen
+- rename to java-commons-logging.spec
+
+Revision 1.23  2007-12-08 14:04:49  glen
 - add todo; EA drop; rel 4
 
 Revision 1.22  2007-12-07 23:41:09  glen
================================================================

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