From 6a948c7b4c2c8b3294c3a9ff3fb75c42e3fab050 Mon Sep 17 00:00:00 2001
From: Permaine Cheung <pcheung@fedoraproject.org>
Date: Feb 08 2007 19:00:12 +0000
Subject: rpmlint cleanup


---

diff --git a/avalon-logkit.spec b/avalon-logkit.spec
index ea026e9..ca8fe6b 100644
--- a/avalon-logkit.spec
+++ b/avalon-logkit.spec
@@ -32,45 +32,45 @@
 
 %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
-%define	section		free
-
-Name:		avalon-%{short_name}
-Version:	1.2
-Release:	4jpp.3
-Epoch:		0
-Summary:	Java logging toolkit
-License:	Apache Software License
-Group:		Development/Libraries/Java
-Url:		http://avalon.apache.org/%{short_name}/
+%define     short_name      logkit
+%define     camelcase_short_name      LogKit
+%define     section        free
+
+Name:        avalon-%{short_name}
+Version:     1.2
+Release:     4jpp.4%{?dist}
+Epoch:       0
+Summary:     Java logging toolkit
+License:     Apache Software License
+Group:       Development/Libraries/Java
+Url:         http://avalon.apache.org/%{short_name}/
 #http://jakarta.apache.org/builds/jakarta-avalon/release/logkit/latest/LogKit-1.2-src.tar.gz
-Source0:	LogKit-1.2-src.tar.gz
-Patch0:		%{name}-build.patch
-Patch1:		%{name}-javadoc.patch
-Patch2:		%{name}-notarget.patch
-Requires:	avalon-framework >= 0:4.1.4
-Requires:	servlet
-Requires:	jms
-Requires:	jdbc-stdext
-BuildRequires:  jpackage-utils >= 0:1.5
-BuildRequires:	ant
-BuildRequires:  javamail
-BuildRequires:  junit
-BuildRequires:  log4j
-BuildRequires:	avalon-framework >= 0:4.1.4
-BuildRequires:	servlet
-BuildRequires:	jms
-BuildRequires:	jdbc-stdext
+Source0:     LogKit-1.2-src.tar.gz
+Patch0:      %{name}-build.patch
+Patch1:      %{name}-javadoc.patch
+Patch2:      %{name}-notarget.patch
+Requires:    avalon-framework >= 0:4.1.4
+Requires:    servlet
+Requires:    jms
+Requires:    jdbc-stdext
+BuildRequires:    jpackage-utils >= 0:1.5
+BuildRequires:    ant
+BuildRequires:    javamail
+BuildRequires:    junit
+BuildRequires:    log4j
+BuildRequires:    avalon-framework >= 0:4.1.4
+BuildRequires:    servlet
+BuildRequires:    jms
+BuildRequires:    jdbc-stdext
 %if ! %{gcj_support}
-BuildArch:	noarch
+BuildArch:    noarch
 %endif
-BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
+BuildRoot:    %{_tmppath}/%{name}-%{version}-buildroot
 
 %if %{gcj_support}
-BuildRequires:		java-gcj-compat-devel
-Requires(post):		java-gcj-compat
-Requires(postun):	java-gcj-compat
+BuildRequires:       java-gcj-compat-devel
+Requires(post):      java-gcj-compat
+Requires(postun):    java-gcj-compat
 %endif
 
 %description
@@ -79,8 +79,8 @@ 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/Documentation
+Summary:    Javadoc for %{name}
+Group:        Development/Documentation
 Requires(post):   /bin/rm,/bin/ln
 Requires(postun): /bin/rm
 
@@ -88,7 +88,6 @@ Requires(postun): /bin/rm
 Javadoc for %{name}.
 
 %prep
-rm -rf $RPM_BUILD_ROOT
 %setup -q -n %{camelcase_short_name}-%{version}
 
 %patch0
@@ -103,6 +102,7 @@ export CLASSPATH=%(build-classpath log4j javamail/mailapi jms servlet jdbc-stdex
 ant clean jar javadocs
 
 %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
@@ -127,16 +127,16 @@ if [ "$1" = "0" ]; then
     rm -f %{_javadocdir}/%{name}
 fi
 
-%post
 %if %{gcj_support}
+%post
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
 fi
 %endif
 
-%postun
 %if %{gcj_support}
+%postun
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
@@ -157,7 +157,10 @@ fi
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
-* Thu Aug 03 2006 Deepak Bhole <dbhole@redhat.com> 0:0.9.13-4jpp.3
+* Thu Feb 08 2007 Permaine Cheung <pcheung@redhat.com> 0:1.2-4jpp.4%{?dist}
+- rpmlint cleanup.
+
+* Thu Aug 03 2006 Deepak Bhole <dbhole@redhat.com> 0:1.2-4jpp.3
 - Added missing requirements.
 
 * Sat Jul 22 2006 Jakub Jelinek <jakub@redhat.com> - 0:1.2-4jpp_2fc