commit c33a25e0312c5ea48439b3f1522ba2c172cbbde33d511b537d2129642d9721c1 Author: Michal Vyskocil Date: Tue Jan 3 11:19:03 2012 +0000 Accepting request 96948 from home:Ignotusp:eclipse OBS-URL: https://build.opensuse.org/request/show/96948 OBS-URL: https://build.opensuse.org/package/show/Java:packages/avalon-logkit?expand=0&rev=1 diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/avalon-logkit-2.1-src.zip b/avalon-logkit-2.1-src.zip new file mode 100644 index 0000000..19eaffe --- /dev/null +++ b/avalon-logkit-2.1-src.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ff926e98a3b02280bc4eff4d1215b58dc0132a7ce3f0bc0861df275e06eba5bf +size 128740 diff --git a/avalon-logkit.spec b/avalon-logkit.spec new file mode 100644 index 0000000..4ee50f2 --- /dev/null +++ b/avalon-logkit.spec @@ -0,0 +1,212 @@ +# Copyright (c) 2000-2005, JPackage Project +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the +# distribution. +# 3. Neither the name of the JPackage Project nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +%define short_name logkit +%define camelcase_short_name LogKit + +Name: avalon-logkit +Version: 2.1 +Release: 3 +Summary: Java logging toolkit +License: Apache-1.1 +Group: Development/Libraries/Java +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 >= 4.1.4 +Requires: servlet25 +Requires: jms +Requires: jdbc-stdext +BuildRequires: unzip +BuildRequires: jpackage-utils >= 1.5 +BuildRequires: ant +BuildRequires: javamail +BuildRequires: ant-junit +BuildRequires: log4j +BuildRequires: avalon-framework >= 4.1.4 +BuildRequires: servlet25 +BuildRequires: jms +BuildRequires: jdbc-stdext +BuildArch: noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-build + + +%description +LogKit is a logging toolkit designed for secure performance orientated +logging in applications. To get started using LogKit, it is recomended +that you read the whitepaper and browse the API docs. + +%package javadoc +Summary: Javadoc for %{name} +Group: Development/Libraries/Java +Requires: jpackage-utils + +%description javadoc +API documentation for %{name}. + +%prep +%setup -q +%patch0 + +# 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 -Dnoget=true clean jar javadoc \ + -lib /usr/share/java + +%install +export NO_BRP_CHECK_BYTECODE_VERSION=true +# jars +install -d -m 755 $RPM_BUILD_ROOT%{_javadir} +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 dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} +ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} + +%files +%defattr(0644,root,root,0755) +%doc LICENSE.txt NOTICE.txt +%{_javadir}/* + +%files javadoc +%defattr(0644,root,root,0755) +%doc LICENSE.txt +%{_javadocdir}/* + +%changelog +* Sun Dec 18 2011 Minh Ngo 0:2.1-3 +- Fixing the license for openSUSE packages + +* Tue Nov 9 2010 Alexander Kurtakov 0:2.1-2 +- Add missing ant-junit BR. + +* Tue Nov 9 2010 Alexander Kurtakov 0:2.1-1 +- Update to 2.1 (rhbz#599622). + +* Tue Nov 9 2010 Stanislav Ochotnicky - 0:1.2-9 +- Fix build to use tomcat6 +- Cleanups, various packaging problems fixed + +* Fri Jul 24 2009 Fedora Release Engineering - 0:1.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Mon Feb 23 2009 Fedora Release Engineering - 0:1.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Wed Jul 9 2008 Tom "spot" Callaway - 0:1.2-6 +- drop repotag +- fix license tag + +* Tue Feb 19 2008 Fedora Release Engineering - 0:1.2-5jpp.5 +- Autorebuild for GCC 4.3 + +* Fri Feb 09 2007 Permaine Cheung 0:1.2-4jpp.5%{?dist} +- Fix source URL, BuildRoot + +* Thu Feb 08 2007 Permaine Cheung 0:1.2-4jpp.4%{?dist} +- rpmlint cleanup. + +* Thu Aug 03 2006 Deepak Bhole 0:1.2-4jpp.3 +- Added missing requirements. + +* Sat Jul 22 2006 Jakub Jelinek - 0:1.2-4jpp_2fc +- Rebuilt + +* Wed Jul 19 2006 Deepak Bhole 0:1.2-4jpp_1fc +- Added conditional native compilation. +- Removed name/release/version defines as applicable. + +* Fri Aug 20 2004 Ralph Apel 0:1.2-3jpp +- Build with ant-1.6.2 + +* Fri May 09 2003 David Walluck 0:1.2-2jpp +- update for JPackage 1.5 + +* Fri Mar 21 2003 Nicolas Mailhot 1.2-1jpp +- For jpackage-utils 1.5 + +* Tue May 07 2002 Guillaume Rousse 1.0.1-4jpp +- hardcoded distribution and vendor tag +- group tag again + +* Thu May 2 2002 Guillaume Rousse 1.0.1-3jpp +- distribution tag +- group tag + +* Mon Mar 18 2002 Guillaume Rousse 1.0.1-2jpp +- generic servlet support + +* Sun Feb 03 2002 Guillaume Rousse 1.0.1-1jpp +- 1.0.1 +- versioned dir for javadoc +- no dependencies for and javadoc package +- adaptation for new servlet3 package +- drop j2ee package +- regenerated the patch +- section package + +* Wed Dec 5 2001 Guillaume Rousse 1.0-4jpp +- javadoc into javadoc package +- Requires and BuildRequires servletapi3 >= 3.2.3-2 +- regenerated the patch + +* Wed Nov 21 2001 Christian Zoffoli 1.0-3jpp +- changed extension --> jpp + +* Tue Nov 20 2001 Guillaume Rousse 1.0-2jpp +- non-free extension classes back in original archive +- removed packager tag + +* Sun Oct 28 2001 Guillaume Rousse 1.0-1jpp +- 1.0 + +* Tue Oct 9 2001 Guillaume Rousse 1.0-0.b5.2jpp +- non-free extension as additional package + +* Sat Oct 6 2001 Guillaume Rousse 1.0-0.b5.1jpp +- 1.0b5 +- first unified release +- used original tarball + +* Mon Sep 10 2001 Guillaume Rousse 1.0-0.b4.1mdk +- first Mandrake release diff --git a/fix-java6-compile.patch b/fix-java6-compile.patch new file mode 100644 index 0000000..08cc7db --- /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 unwrap(java.lang.Class iface) {return null;} + }