diff --git a/avalon-logkit-2.1.pom b/avalon-logkit-2.1.pom
new file mode 100644
index 0000000..5bc8b08
--- /dev/null
+++ b/avalon-logkit-2.1.pom
@@ -0,0 +1,31 @@
+
+ 4.0.0
+ avalon-logkit
+ avalon-logkit
+ Avalon Logkit
+ 2.1
+ Log4j-like logging toolkit.
+ 1997
+
+
+ log4j
+ log4j
+ 1.2.11
+
+
+ servletapi
+ servletapi
+ 2.3
+
+
+ geronimo-spec
+ geronimo-spec-javamail
+ 1.3.1-rc3
+
+
+ geronimo-spec
+ geronimo-spec-jms
+ 1.1-rc4
+
+
+
\ No newline at end of file
diff --git a/avalon-logkit-encoding.patch b/avalon-logkit-encoding.patch
new file mode 100644
index 0000000..0ce84e5
--- /dev/null
+++ b/avalon-logkit-encoding.patch
@@ -0,0 +1,28 @@
+diff --git a/src/java/org/apache/log/ContextMap.java b/src/java/org/apache/log/ContextMap.java
+index 046106b..2305955 100644
+--- a/src/java/org/apache/log/ContextMap.java
++++ b/src/java/org/apache/log/ContextMap.java
+@@ -29,8 +29,8 @@ import java.util.Hashtable;
+ *
hostname ->helm.realityforge.org
+ * ipaddress ->1.2.3.4
+ * interface ->127.0.0.1
+- * caller � �->com.biz.MyCaller.method(MyCaller.java:18)
+- * source � �->1.6.3.2:33
++ * caller ->com.biz.MyCaller.method(MyCaller.java:18)
++ * source ->1.6.3.2:33
+ *
+ * The context is bound to a thread (and inherited by sub-threads) but
+ * it can also be added to by LogTargets.
+diff --git a/src/java/org/apache/log/Logger.java b/src/java/org/apache/log/Logger.java
+index 43ce1b7..d1f7efd 100644
+--- a/src/java/org/apache/log/Logger.java
++++ b/src/java/org/apache/log/Logger.java
+@@ -295,7 +295,7 @@ public class Logger
+ }
+
+ /**
+- * Determine if messages of priority �will be logged.
++ * Determine if messages of priority will be logged.
+ * @param priority the priority
+ * @return true if messages will be logged
+ */
diff --git a/avalon-logkit-pom-deps.patch b/avalon-logkit-pom-deps.patch
new file mode 100644
index 0000000..428da80
--- /dev/null
+++ b/avalon-logkit-pom-deps.patch
@@ -0,0 +1,33 @@
+--- pom.xml 2011-04-21 14:24:29.000000000 +0200
++++ pom.xml.new 2011-05-05 14:37:27.016877493 +0200
+@@ -13,19 +13,19 @@
+ 1.2.11
+
+
+- servletapi
+- servletapi
+- 2.3
++ javax.servlet
++ servlet-api
++ 2.5
+
+
+- geronimo-spec
+- geronimo-spec-javamail
+- 1.3.1-rc3
++ javax.mail
++ mail
++ 1.4.3
+
+
+- geronimo-spec
+- geronimo-spec-jms
+- 1.1-rc4
++ javax.jms
++ jms
++ 1.1.1
+
+
+-
+\ No newline at end of file
++
diff --git a/avalon-logkit.changes b/avalon-logkit.changes
index 75be225..d8d5ff9 100644
--- a/avalon-logkit.changes
+++ b/avalon-logkit.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri May 18 08:18:05 UTC 2012 - mvyskocil@suse.cz
+
+- add pom file
+- fix a build with openjdk7
+- change the jms to jms_api in classpath
+
-------------------------------------------------------------------
Thu Feb 16 15:21:41 UTC 2012 - cfarrell@suse.com
diff --git a/avalon-logkit.spec b/avalon-logkit.spec
index b3ded23..1f04b24 100644
--- a/avalon-logkit.spec
+++ b/avalon-logkit.spec
@@ -15,6 +15,9 @@
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
+
#
%define short_name logkit
%define camelcase_short_name LogKit
@@ -26,13 +29,20 @@ Summary: Java logging toolkit
License: Apache-2.0
Group: Development/Libraries/Java
Url: http://avalon.apache.org/%{short_name}/
-#Source0: http://www.apache.org/dist/excalibur/%{name}/source/%{name}-%{version}-src.zip
+#Source0: http://www.apache.org/dist/excalibur/%{name}/source/%{name}-%{version}-src.zip
+#Source1: http://repo1.maven.org/maven2/avalon-logkit/avalon-logkit/%{version}/%{name}-%{version}.pom
Source0: %{name}-%{version}-src.zip
+Source1: %{name}-%{version}.pom
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: servlet25
+#Requires: jdbc-stdext
Requires: jms
-Requires: jdbc-stdext
+Requires: servlet25
+
BuildRequires: ant
BuildRequires: ant-junit
BuildRequires: avalon-framework >= 4.1.4
@@ -43,6 +53,7 @@ BuildRequires: jpackage-utils >= 1.5
BuildRequires: log4j
BuildRequires: servlet25
BuildRequires: unzip
+
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -62,6 +73,10 @@ API documentation for %{name}.
%prep
%setup -q
%patch0
+cp %{SOURCE1} pom.xml
+%patch1
+%patch2 -p1
+%patch3
# remove all binary libs
find . -name "*.jar" -exec rm -f {} \;
@@ -70,31 +85,37 @@ find . -name "*.jar" -exec rm -f {} \;
export CLASSPATH=%(build-classpath \
log4j \
javamail/mailapi \
- jms \
+ jms_api \
tomcat6-servlet-2.5-api \
jdbc-stdext \
avalon-framework \
junit \
):$PWD/build/classes
-ant -Dnoget=true clean jar javadoc \
+ant -Dencoding=ISO-8859-1 -Dnoget=true clean jar javadoc \
-lib /usr/share/java
+# Convert to OSGi bundle
+#java -jar $(build-classpath aqute-bnd) wrap target/%{name}-%{version}.jar
%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)
+install -m 644 target/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+
+#pom
+install -d -m 755 $RPM_BUILD_ROOT/%{_mavenpomdir}
+install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_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}-%{version}
-cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%files
%defattr(0644,root,root,0755)
%doc LICENSE.txt NOTICE.txt
%{_javadir}/*
+%{_mavendepmapfragdir}/%{name}
+%{_mavenpomdir}/JPP-%{name}.pom
%files javadoc
%defattr(0644,root,root,0755)
diff --git a/fix-java7-compile.patch b/fix-java7-compile.patch
new file mode 100644
index 0000000..87bdb27
--- /dev/null
+++ b/fix-java7-compile.patch
@@ -0,0 +1,9 @@
+--- src/java/org/apache/log/output/db/DefaultDataSource.java.sav 2012-04-18 00:41:59.000000000 +0300
++++ src/java/org/apache/log/output/db/DefaultDataSource.java 2012-04-18 00:46:17.454272754 +0300
+@@ -117,4 +117,6 @@ public class DefaultDataSource
+ }
+
+ public T unwrap(java.lang.Class iface) {return null;}
++
++ public java.util.logging.Logger getParentLogger() {return null;}
+ }