SPECS: jakarta-commons-logging.spec - java deps, jdk target 1.3

[glen]

Author: glen                         Date: Sun Dec  2 22:07:02 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- java deps, jdk target 1.3

---- Files affected:
SPECS:
   jakarta-commons-logging.spec (1.20 -> 1.21) 

---- Diffs:

================================================================
Index: SPECS/jakarta-commons-logging.spec
diff -u SPECS/jakarta-commons-logging.spec:1.20 SPECS/jakarta-commons-logging.spec:1.21
--- SPECS/jakarta-commons-logging.spec:1.20	Wed Sep 19 18:21:39 2007
+++ SPECS/jakarta-commons-logging.spec	Sun Dec  2 23:06:57 2007
@@ -1,4 +1,5 @@
 # $Revision$, $Date$
+%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
@@ -8,8 +9,10 @@
 Group:		Development/Languages/Java
 Source0:	http://www.apache.org/dist/jakarta/commons/logging/source/commons-logging-%{version}-src.tar.gz
 # Source0-md5:	db5dc75c89e794f794be92d10df6be1b
+Patch0:		%{name}-target.patch
 URL:		http://jakarta.apache.org/commons/logging/
 BuildRequires:	ant
+BuildRequires:	rpm-javaprov
 BuildRequires:	jdk >= 1.4
 BuildRequires:	jpackage-utils
 BuildRequires:	logging-log4j
@@ -37,7 +40,7 @@
 %package javadoc
 Summary:	Jakarta Commons Logging documentation
 Summary(pl.UTF-8):	Dokumentacja do Jakarta Commons Logging
-Group:		Development/Languages/Java
+Group:		Documentation
 Requires:	jpackage-utils
 Obsoletes:	jakarta-commons-logging-doc
 
@@ -49,10 +52,18 @@
 
 %prep
 %setup -q -n commons-logging-%{version}-src
+%patch0 -p1
 
 %build
-export CLASSPATH="`build-classpath log4j`"
-export JAVA_HOME="%{java_home}"
+required_jars="log4j junit logkit avalon-framework"
+
+# TODO for tests:
+#  <property name="junit.jar"               value="${junit.home}/junit.jar"/>
+#  <property name="log4j.jar"               value="${jakarta.home}/jakarta-log4j/dist/lib/log4j.jar"/>
+#  <property name="logkit.jar"              value="${jakarta.home}/jakarta-avalon-logkit/build/log/logkit"/>
+#  <property name="avalon-framework.jar"    value="../../Avalon-4.1.4/avalon-framework-4.1.4.jar"/>
+
+export CLASSPATH=$(build-classpath $required_jars)
 %ant dist javadoc
 
 %install
@@ -64,11 +75,15 @@
 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
 
-cp -R dist/docs/api/* $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
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post javadoc
+ln -nfs %{name}-%{version} %{_javadocdir}/%{name}
+
 %files
 %defattr(644,root,root,755)
 %doc dist/*.txt
@@ -76,15 +91,18 @@
 
 %files javadoc
 %defattr(644,root,root,755)
-%doc %{_javadocdir}/%{name}-%{version}
+%{_javadocdir}/%{name}-%{version}
+%ghost %{_javadocdir}/%{name}
 
 %define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
-
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.21  2007-12-02 22:06:57  glen
+- java deps, jdk target 1.3
+
 Revision 1.20  2007-09-19 16:21:39  baggins
 - back to 1.0.4, I'm too old for this shit
 
================================================================

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