SPECS: logging-log4j.spec - fixup javadoc %post - drop EA and try ...

glen glen at pld-linux.org
Sat Dec 8 14:59:53 CET 2007


Author: glen                         Date: Sat Dec  8 13:59:53 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fixup javadoc %post
- drop EA and try coope this time
- javamail should not be required (changed to suggests)
- specific license
- rel 2

---- Files affected:
SPECS:
   logging-log4j.spec (1.37 -> 1.38) 

---- Diffs:

================================================================
Index: SPECS/logging-log4j.spec
diff -u SPECS/logging-log4j.spec:1.37 SPECS/logging-log4j.spec:1.38
--- SPECS/logging-log4j.spec:1.37	Mon Dec  3 17:51:51 2007
+++ SPECS/logging-log4j.spec	Sat Dec  8 14:59:48 2007
@@ -1,20 +1,21 @@
 # $Revision$, $Date$
 # TODO:
+# - rename to apache-log4j?
 # - do something with jms / jmx requirements;
 #   http://lists.pld-linux.org/mailman/pipermail/pld-devel-en/2006-May/017648.html
 # - jndi (whatever it is) is required for jmx interface
 #
 # NOTE:
 # - javamail is provided by java-gnu-mail
-# - jmx by java-sun-jre
+# - jmx,jndi 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.15
-Release:	1
-License:	Apache
+Release:	2
+License:	Apache License 2.0
 Group:		Development/Languages/Java
 Source0:	http://www.apache.org/dist/logging/log4j/%{version}/apache-log4j-%{version}.tar.gz
 # Source0-md5:	10f04abe4d68d5a89e8eb167e4e45e1a
@@ -28,14 +29,12 @@
 BuildRequires:	jpackage-utils
 BuildRequires:	junit >= 3.8
 BuildRequires:	rpmbuild(macros) >= 1.300
-Requires:	javamail >= 1.2
 Requires:	jdk >= 1.2
 #Requires:	jms
-#Requires:	junit
+Suggests:	javamail >= 1.2
 Provides:	log4j = %{version}
 Obsoletes:	jakarta-log4j
 BuildArch:	noarch
-ExclusiveArch:	i586 i686 pentium3 pentium4 athlon %{x8664} noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -91,6 +90,9 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post javadoc
+ln -nfs %{name}-%{version} %{_javadocdir}/%{name}
+
 %files
 %defattr(644,root,root,755)
 %doc LICENSE
@@ -111,6 +113,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.38  2007-12-08 13:59:48  glen
+- fixup javadoc %post
+- drop EA and try coope this time
+- javamail should not be required (changed to suggests)
+- specific license
+- rel 2
+
 Revision 1.37  2007-12-03 16:51:51  hawk
 - updated to 1.2.15 (note: source tarball name was changed from
   logging-log4j to apache-log4j - cvs move + obsoletes?)
================================================================

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



More information about the pld-cvs-commit mailing list