From 21668813325bdd6d347e5b3e7d4a9bb8f131023f851fe8d82a4d96f0dbac689b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Fri, 27 Jun 2014 13:02:13 +0000
Subject: [PATCH] - Cleanup with spec-cleaner - Build on SLE11

OBS-URL: https://build.opensuse.org/package/show/Java:packages/avalon-logkit?expand=0&rev=13
---
 avalon-logkit.changes |  6 ++++++
 avalon-logkit.spec    | 36 ++++++++++++++++--------------------
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/avalon-logkit.changes b/avalon-logkit.changes
index a2dc976..c338f77 100644
--- a/avalon-logkit.changes
+++ b/avalon-logkit.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jun 27 13:01:59 UTC 2014 - tchvatal@suse.com
+
+- Cleanup with spec-cleaner
+- Build on SLE11
+
 -------------------------------------------------------------------
 Mon Sep  9 11:05:31 UTC 2013 - tchvatal@suse.com
 
diff --git a/avalon-logkit.spec b/avalon-logkit.spec
index c4d3d8a..8a7d0d1 100644
--- a/avalon-logkit.spec
+++ b/avalon-logkit.spec
@@ -1,9 +1,8 @@
 #
 # spec file for package avalon-logkit
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # Copyright (c) 2000-2005, JPackage Project
-# All rights reserved.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -21,7 +20,6 @@
 #
 %define     short_name      logkit
 %define     camelcase_short_name      LogKit
-
 Name:           avalon-logkit
 Version:        2.1
 Release:        0
@@ -37,12 +35,6 @@ Patch0:         fix-java6-compile.patch
 Patch1:         avalon-logkit-pom-deps.patch
 Patch2:         avalon-logkit-encoding.patch
 Patch3:         fix-java7-compile.patch
-
-Requires:       avalon-framework >= 4.1.4
-#Requires:      jdbc-stdext
-Requires:       jms
-Requires:       servlet30
-
 BuildRequires:  ant
 BuildRequires:  ant-junit
 BuildRequires:  avalon-framework >= 4.1.4
@@ -53,9 +45,12 @@ BuildRequires:  jms
 BuildRequires:  log4j
 BuildRequires:  servlet30
 BuildRequires:  unzip
-
-BuildArch:      noarch
+Requires:       avalon-framework >= 4.1.4
+#Requires:      jdbc-stdext
+Requires:       jms
+Requires:       servlet30
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildArch:      noarch
 
 %description
 LogKit is a logging toolkit designed for secure performance orientated
@@ -71,7 +66,7 @@ Requires:       javapackages-tools
 API documentation for %{name}.
 
 %prep
-%setup -q 
+%setup -q
 %patch0
 cp %{SOURCE1} pom.xml
 %patch1
@@ -92,24 +87,25 @@ export CLASSPATH=%(build-classpath \
                    junit \
                   ):$PWD/build/classes
 
-ant -Dencoding=ISO-8859-1 -Dnoget=true clean jar javadoc \
-    -lib /usr/share/java
+ant -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 \
+    -Dencoding=ISO-8859-1 -Dnoget=true clean jar javadoc \
+    -lib %{_datadir}/java
 # Convert to OSGi bundle
 #java -jar $(build-classpath aqute-bnd) wrap target/%{name}-%{version}.jar
 
 %install
 # jars
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -m 644 target/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+install -d -m 755 %{buildroot}%{_javadir}
+install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
 
 #pom
-install -d -m 755 $RPM_BUILD_ROOT/%{_mavenpomdir}
-install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
+install -d -m 755 %{buildroot}/%{_mavenpomdir}
+install -pm 644 pom.xml %{buildroot}/%{_mavenpomdir}/JPP-%{name}.pom
 %add_maven_depmap JPP-%{name}.pom %{name}.jar -a "%{short_name}:%{short_name},org.apache.avalon.logkit:%{name}"
 
 # javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name}
 
 %files
 %defattr(0644,root,root,0755)