[avalon-logkit] * Tue Nov 9 2010 Alexander Kurtakov <akurtako at redhat.com> 0:2.1-1 - Update to 2.1 (rhbz#599622).
Alexander Kurtakov
akurtakov at fedoraproject.org
Tue Nov 9 19:26:44 UTC 2010
commit 111b01f89371dfbc68c258db940823b99c4a2f37
Author: Alexander Kurtakov <akurtako at redhat.com>
Date: Tue Nov 9 21:24:38 2010 +0200
* Tue Nov 9 2010 Alexander Kurtakov <akurtako at redhat.com> 0:2.1-1
- Update to 2.1 (rhbz#599622).
* Tue Nov 9 2010 Stanislav Ochotnicky <sochotnicky at redhat.com> - 0:1.2-9
- Fix build to use tomcat6
- Cleanups, various packaging problems fixed
.gitignore | 1 +
avalon-logkit-build.patch | 13 -------------
avalon-logkit-javadoc.patch | 18 ------------------
avalon-logkit.spec | 34 ++++++++++++++++------------------
fix-java6-compile.patch | 13 +++++++++++++
sources | 3 +--
6 files changed, 31 insertions(+), 51 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b2afcb5..feb0a86 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ avalon-site
noarch
*.src.rpm
avalon-logkit-notarget.patch
+avalon-logkit-2.1-src.zip
diff --git a/avalon-logkit.spec b/avalon-logkit.spec
index c538fd1..db43150 100644
--- a/avalon-logkit.spec
+++ b/avalon-logkit.spec
@@ -32,17 +32,15 @@
%global camelcase_short_name LogKit
Name: avalon-%{short_name}
-Version: 1.2
-Release: 9%{?dist}
+Version: 2.1
+Release: 1%{?dist}
Epoch: 0
Summary: Java logging toolkit
License: ASL 1.1
-Group: Development/Libraries/Java
-Url: http://avalon.apache.org/%{short_name}/
-Source0: http://www.apache.org/dist/avalon/logkit/LogKit-1.2-src.tar.gz
-Patch0: %{name}-build.patch
-Patch1: %{name}-javadoc.patch
-Patch2: %{name}-notarget.patch
+Group: Development/Libraries
+URL: http://avalon.apache.org/%{short_name}/
+Source0: http://www.apache.org/dist/excalibur/%{name}/source/%{name}-%{version}-src.zip
+Patch0: fix-java6-compile.patch
Requires: avalon-framework >= 0:4.1.4
Requires: servlet25
Requires: jms
@@ -67,36 +65,33 @@ that you read the whitepaper and browse the API docs.
%package javadoc
Summary: Javadoc for %{name}
-Group: Development/Documentation
+Group: Documentation
Requires: jpackage-utils
%description javadoc
Javadoc for %{name}.
%prep
-%setup -q -n %{camelcase_short_name}-%{version}
-
+%setup -q
%patch0
-%patch1 -p1
-%patch2 -p1
# remove all binary libs
find . -name "*.jar" -exec rm -f {} \;
%build
export CLASSPATH=%(build-classpath log4j javamail/mailapi jms tomcat6-servlet-2.5-api jdbc-stdext avalon-framework junit):$PWD/build/classes
-ant clean jar javadocs
+ant -Dnoget=true clean jar javadoc
%install
rm -rf $RPM_BUILD_ROOT
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -m 644 build/lib/%{short_name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+install -m 644 target/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} ${jar/-%{version}/}; done)
# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%clean
@@ -104,16 +99,19 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
-%doc KEYS LICENSE
+%doc LICENSE.txt NOTICE.txt
%{_javadir}/*
%files javadoc
%defattr(-,root,root,-)
-%doc LICENSE
+%doc LICENSE.txt
%{_javadocdir}/%{name}
%{_javadocdir}/%{name}-%{version}
%changelog
+* Tue Nov 9 2010 Alexander Kurtakov <akurtako at redhat.com> 0:2.1-1
+- Update to 2.1 (rhbz#599622).
+
* Tue Nov 9 2010 Stanislav Ochotnicky <sochotnicky at redhat.com> - 0:1.2-9
- Fix build to use tomcat6
- Cleanups, various packaging problems fixed
diff --git a/fix-java6-compile.patch b/fix-java6-compile.patch
new file mode 100644
index 0000000..87bd582
--- /dev/null
+++ b/fix-java6-compile.patch
@@ -0,0 +1,13 @@
+--- src/java/org/apache/log/output/db/DefaultDataSource.java.sav 2005-08-29 21:03:50.000000000 +0300
++++ src/java/org/apache/log/output/db/DefaultDataSource.java 2010-11-09 21:05:58.775055594 +0200
+@@ -111,4 +111,10 @@ public class DefaultDataSource
+ {
+ m_logWriter = logWriter;
+ }
++
++ public boolean isWrapperFor(Class<?> iface) {
++ return false;
++ }
++
++ public <T> T unwrap(java.lang.Class<T> iface) {return null;}
+ }
diff --git a/sources b/sources
index ff2942b..dc31b2b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-17ede0a7d297ad610b47c476757c2b96 LogKit-1.2-src.tar.gz
-38fad6c89dbc762ebe3c148f5965792e avalon-logkit-notarget.patch
+b30646d4c5bb7fabeda1efb01f4167b9 avalon-logkit-2.1-src.zip
More information about the scm-commits
mailing list