SPECS: logging-log4j.spec - java deps - remove junit dep on runtime

[glen]

Author: glen                         Date: Sun Dec  2 19:30:22 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- java deps
- remove junit dep on runtime

---- Files affected:
SPECS:
   logging-log4j.spec (1.35 -> 1.36) 

---- Diffs:

================================================================
Index: SPECS/logging-log4j.spec
diff -u SPECS/logging-log4j.spec:1.35 SPECS/logging-log4j.spec:1.36
--- SPECS/logging-log4j.spec:1.35	Wed Sep 19 17:30:34 2007
+++ SPECS/logging-log4j.spec	Sun Dec  2 20:30:17 2007
@@ -7,12 +7,13 @@
 # NOTE:
 # - javamail is provided by java-gnu-mail
 # - jmx by java-sun-jre
-#
+
+%include	/usr/lib/rpm/macros.java
 Summary:	log4j - logging for Java
 Summary(pl.UTF-8):	log4j - zapis logów dla Javy
 Name:		logging-log4j
 Version:	1.2.14
-Release:	3
+Release:	4
 License:	Apache
 Group:		Development/Languages/Java
 Source0:	http://www.apache.org/dist/logging/log4j/%{version}/%{name}-%{version}.tar.gz
@@ -30,7 +31,7 @@
 Requires:	javamail >= 1.2
 Requires:	jdk >= 1.2
 #Requires:	jms
-Requires:	junit
+#Requires:	junit
 Provides:	log4j = %{version}
 Obsoletes:	jakarta-log4j
 BuildArch:	noarch
@@ -48,7 +49,7 @@
 %package doc
 Summary:	Online manual for log4j
 Summary(pl.UTF-8):	Dokumentacja online do log4j
-Group:		Development/Languages/Java
+Group:		Documentation
 Obsoletes:	jakarta-log4j-doc
 
 %description doc
@@ -60,7 +61,7 @@
 %package javadoc
 Summary:	API documentation for log4j
 Summary(pl.UTF-8):	Dokumentacja API log4j
-Group:		Development/Languages/Java
+Group:		Documentation
 Requires:	jpackage-utils
 Obsoletes:	jakarta-log4j-doc
 
@@ -74,17 +75,18 @@
 %setup -q
 
 %build
-export JAVA_HOME="%{java_home}"
-export CLASSPATH="`%{_bindir}/build-classpath mailapi activation junit`"
+required_jars="mailapi activation junit"
+export CLASSPATH=$(build-classpath $required_jars)
 %ant jar javadoc
-ln -s %{_javadocdir}/%{name}-%{version} api
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_javadir},%{_javadocdir}/%{name}-%{version}}
-install dist/lib/log4j-%{version}.jar $RPM_BUILD_ROOT%{_javadir}
+cp -a dist/lib/log4j-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/log4j-%{version}.jar
 ln -s log4j-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/log4j.jar
-cp -R docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+
+cp -a 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
@@ -96,19 +98,23 @@
 
 %files doc
 %defattr(644,root,root,755)
-%doc docs/{css,images,lf5,*.html,*.txt,TODO} api
+%doc docs/{css,images,lf5,*.html,*.txt,TODO}
 
 %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.36  2007-12-02 19:30:17  glen
+- java deps
+- remove junit dep on runtime
+
 Revision 1.35  2007-09-19 15:30:34  baggins
 - revert last change
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/logging-log4j.spec?r1=1.35&r2=1.36&f=u