[avalon-logkit] Fix build to use tomcat6 and cleanups, various packaging problems fixed

[Alexander Kurtakov]

commit e92433623de074e00cfc663823b555ce04b3aa57
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Tue Nov 9 18:40:29 2010 +0100

    Fix build to use tomcat6 and cleanups, various packaging problems fixed

 avalon-logkit.spec |   71 ++++++++++++---------------------------------------
 1 files changed, 17 insertions(+), 54 deletions(-)
---
diff --git a/avalon-logkit.spec b/avalon-logkit.spec
index ee08dd9..c538fd1 100644
--- a/avalon-logkit.spec
+++ b/avalon-logkit.spec
@@ -28,16 +28,12 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define _with_gcj_support 1
-
-%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
-
-%define     short_name      logkit
-%define     camelcase_short_name      LogKit
+%global     short_name      logkit
+%global     camelcase_short_name      LogKit
 
 Name:        avalon-%{short_name}
 Version:     1.2
-Release:     8%{?dist}
+Release:     9%{?dist}
 Epoch:       0
 Summary:     Java logging toolkit
 License:     ASL 1.1
@@ -48,7 +44,7 @@ Patch0:      %{name}-build.patch
 Patch1:      %{name}-javadoc.patch
 Patch2:      %{name}-notarget.patch
 Requires:    avalon-framework >= 0:4.1.4
-Requires:    servlet
+Requires:    servlet25
 Requires:    jms
 Requires:    jdbc-stdext
 BuildRequires:    jpackage-utils >= 0:1.5
@@ -57,19 +53,12 @@ BuildRequires:    javamail
 BuildRequires:    junit
 BuildRequires:    log4j
 BuildRequires:    avalon-framework >= 0:4.1.4
-BuildRequires:    servlet
+BuildRequires:    servlet25
 BuildRequires:    jms
 BuildRequires:    jdbc-stdext
-%if ! %{gcj_support}
 BuildArch:    noarch
-%endif
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
 
 %description
 LogKit is a logging toolkit designed for secure performance orientated
@@ -79,8 +68,7 @@ that you read the whitepaper and browse the API docs.
 %package javadoc
 Summary:    Javadoc for %{name}
 Group:        Development/Documentation
-Requires(post):   /bin/rm,/bin/ln
-Requires(postun): /bin/rm
+Requires:     jpackage-utils
 
 %description javadoc
 Javadoc for %{name}.
@@ -96,7 +84,7 @@ Javadoc for %{name}.
 find . -name "*.jar" -exec rm -f {} \;
 
 %build
-export CLASSPATH=%(build-classpath log4j javamail/mailapi jms servlet jdbc-stdext avalon-framework junit):$PWD/build/classes
+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
 
 %install
@@ -105,56 +93,31 @@ rm -rf $RPM_BUILD_ROOT
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
 install -m 644 build/lib/%{short_name}.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}
-
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post javadoc
-rm -f %{_javadocdir}/%{name}
-ln -s %{name}-%{version} %{_javadocdir}/%{name}
-
-%postun javadoc
-if [ "$1" = "0" ]; then
-    rm -f %{_javadocdir}/%{name}
-fi
-
-%if %{gcj_support}
-%post
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
 %files
-%defattr(0644,root,root,0755)
+%defattr(-,root,root,-)
 %doc KEYS LICENSE
 %{_javadir}/*
 
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}
-%endif
-
 %files javadoc
-%defattr(0644,root,root,0755)
+%defattr(-,root,root,-)
+%doc LICENSE
+%{_javadocdir}/%{name}
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Tue Nov  9 2010 Stanislav Ochotnicky <sochotnicky at redhat.com> - 0:1.2-9
+- Fix build to use tomcat6
+- Cleanups, various packaging problems fixed
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.2-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild