packages: java-avalon-logkit/java-avalon-logkit.spec, java-avalon-logkit/ja...

[qboosh]

Author: qboosh                       Date: Sat Feb 12 19:44:05 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- changed URLs once again: avalon-logkit is continued as part of Excalibur project
- updated to 2.1
- removed obsolete build,javadoc patches

---- Files affected:
packages/java-avalon-logkit:
   java-avalon-logkit.spec (1.14 -> 1.15) , java-avalon-logkit-build.patch (1.2 -> NONE)  (REMOVED), java-avalon-logkit-javadoc.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/java-avalon-logkit/java-avalon-logkit.spec
diff -u packages/java-avalon-logkit/java-avalon-logkit.spec:1.14 packages/java-avalon-logkit/java-avalon-logkit.spec:1.15
--- packages/java-avalon-logkit/java-avalon-logkit.spec:1.14	Sat Feb 12 14:45:44 2011
+++ packages/java-avalon-logkit/java-avalon-logkit.spec	Sat Feb 12 20:43:59 2011
@@ -8,16 +8,14 @@
 Summary:	Java logging toolkit
 Summary(pl.UTF-8):	Biblioteka do logowania w Javie
 Name:		java-avalon-logkit
-Version:	1.2
-Release:	2
-License:	Apache v1.1
+Version:	2.1
+Release:	1
+License:	Apache v2.0
 Group:		Libraries/Java
-Source0:	http://archive.apache.org/dist/avalon/logkit/LogKit-%{version}-src.tar.gz
-# Source0-md5:	17ede0a7d297ad610b47c476757c2b96
-Patch0:		%{name}-build.patch
-Patch1:		%{name}-javadoc.patch
-Patch2:		%{name}-java16.patch
-URL:		http://avalon.apache.org/logkit/
+Source0:	http://www.apache.org/dist/excalibur/avalon-logkit/source/%{srcname}-%{version}-src.tar.gz
+# Source0-md5:	fee6f5f2db70c320aafbfb4cc32c1c43
+Patch0:		%{name}-java16.patch
+URL:		http://excalibur.apache.org/logger.html
 BuildRequires:	ant
 %if %(locale -a | grep -q ^en_US$ ; echo $?)
 BuildRequires:	glibc-localedb-all
@@ -64,10 +62,8 @@
 Dokumentacja Javadoc do pakietu Avalon LogKit.
 
 %prep
-%setup -q -n LogKit-%{version}
+%setup -q -n %{srcname}-%{version}
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 required_jars="log4j mail %{?with_jms:jms} servlet-api jdbc-stdext junit"
@@ -76,18 +72,19 @@
 
 export LC_ALL=en_US # source code not US-ASCII
 
-%ant clean jar javadocs
+%ant clean jar javadoc \
+	-Dnoget=1
 
 %install
 rm -rf $RPM_BUILD_ROOT
 # jars
 install -d $RPM_BUILD_ROOT%{_javadir}
-cp -a build/lib/logkit.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-%{version}.jar
+cp -a target/avalon-logkit-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-%{version}.jar
 ln -s %{srcname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}.jar
 
 # javadoc
 install -d $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
-cp -a build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
+cp -a dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
 ln -s %{srcname}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{srcname} # ghost symlink
 
 %clean
@@ -98,9 +95,9 @@
 
 %files
 %defattr(644,root,root,755)
-%doc KEYS LICENSE
-%{_javadir}/%{srcname}.jar
-%{_javadir}/%{srcname}-%{version}.jar
+%doc LICENSE.txt NOTICE.txt
+%{_javadir}/avalon-logkit-%{version}.jar
+%{_javadir}/avalon-logkit.jar
 
 %files javadoc
 %defattr(644,root,root,755)
@@ -113,6 +110,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2011/02/12 19:43:59  qboosh
+- changed URLs once again: avalon-logkit is continued as part of Excalibur project
+- updated to 2.1
+- removed obsolete build,javadoc patches
+
 Revision 1.14  2011/02/12 13:45:44  qboosh
 - updated Source0 URL (avalon project has been closed and archived)
 - don't BR glibc-localedb-all if en_US locale is already provided
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-avalon-logkit/java-avalon-logkit.spec?r1=1.14&r2=1.15&f=u