From f812c85ce2f4598aa364a032347e590bb26f090d Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
Date: Mon, 4 Jun 2012 10:52:03 +0200
Subject: [PATCH] Update to latest version

- Change OSGI bundle symbolic name to org.apache.log4j
- Resolves #826776
---
 0011-Remove-openejb.patch                 | 18 +++++++++++++
 0012-Add-proper-bundle-symbolicname.patch | 31 +++++++++++++++++++++++
 fix_junit_dep.patch                       | 10 --------
 log4j.spec                                | 27 ++++++++++++--------
 remove_duplicate_manifest_entry.patch     | 10 --------
 5 files changed, 66 insertions(+), 30 deletions(-)
 create mode 100644 0011-Remove-openejb.patch
 create mode 100644 0012-Add-proper-bundle-symbolicname.patch
 delete mode 100644 fix_junit_dep.patch
 delete mode 100644 remove_duplicate_manifest_entry.patch

diff --git a/0011-Remove-openejb.patch b/0011-Remove-openejb.patch
new file mode 100644
index 0000000..e7c0ad1
--- /dev/null
+++ b/0011-Remove-openejb.patch
@@ -0,0 +1,18 @@
+diff --git a/pom.xml b/pom.xml
+index 2e6acaa..0c330cc 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -513,13 +513,6 @@ target platform and specify -Dntdll_target=msbuild on the mvn command line.
+       <version>1.4.3</version>
+       <optional>true</optional>
+     </dependency>
+-    <dependency>
+-      <groupId>org.apache.openejb</groupId>
+-      <artifactId>javaee-api</artifactId>
+-      <version>5.0-2</version>
+-      <type>jar</type>
+-      <scope>provided</scope>
+-    </dependency>
+     <!--  the following dependency is not needed on JDK 1.5 and higher 
+     <dependency>
+       <groupId>com.sun.jmx</groupId>
diff --git a/0012-Add-proper-bundle-symbolicname.patch b/0012-Add-proper-bundle-symbolicname.patch
new file mode 100644
index 0000000..6acfccb
--- /dev/null
+++ b/0012-Add-proper-bundle-symbolicname.patch
@@ -0,0 +1,31 @@
+From 65653d73ec206041ace3892a969ac5298ec32d73 Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky@redhat.com>
+Date: Mon, 4 Jun 2012 10:41:13 +0200
+Subject: [PATCH] Add proper bundle-symbolicname
+
+Also remove dependency on yet unpackages jmdns
+---
+ pom.xml |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/pom.xml b/pom.xml
+index 0c330cc..4b8eb8f 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -405,11 +405,12 @@ target platform and specify -Dntdll_target=msbuild on the mvn command line.
+ 		<Import-Package>!javax.swing.*,
+ 				!com.ibm.uvm.tools.*,
+ 				!com.sun.jdmk.comm.*,
+-				javax.jmdns.*;resolution:=optional,
++				!javax.jmdns.*,
+ 				javax.jms.*;resolution:=optional,
+ 				javax.mail.*;resolution:=optional,
+                                 *</Import-Package>
+                 <Bundle-DocURL>http://logging.apache.org/log4j/1.2</Bundle-DocURL>
++                <Bundle-SymbolicName>org.apache.log4j</Bundle-SymbolicName>
+             </instructions>
+         </configuration>
+       </plugin>
+-- 
+1.7.10.2
+
diff --git a/fix_junit_dep.patch b/fix_junit_dep.patch
deleted file mode 100644
index 225a959..0000000
--- a/fix_junit_dep.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- pom.xml.sav	2011-10-28 18:43:07.000000000 +0300
-+++ pom.xml	2011-10-28 18:46:08.752757484 +0300
-@@ -277,7 +277,6 @@ target platform and specify -Dntdll_targ
-             <groupId>junit</groupId>
-             <artifactId>junit</artifactId>
-             <version>3.8.1</version>
--            <scope>test</scope>
-           </dependency>
-           <dependency>
-             <groupId>sun.jdk</groupId>
diff --git a/log4j.spec b/log4j.spec
index 6a06d8f..734a746 100644
--- a/log4j.spec
+++ b/log4j.spec
@@ -2,15 +2,15 @@
 %global bootstrap %{?_with_bootstrap:1}%{!?_with_bootstrap:%{?_without_bootstrap:0}%{!?_without_bootstrap:%{?_bootstrap:%{_bootstrap}}%{!?_bootstrap:0}}}
 
 Name:           log4j
-Version:        1.2.16
-Release:        11%{?dist}
+Version:        1.2.17
+Release:        1%{?dist}
 Epoch:          0
 Summary:        Java logging package
 BuildArch:      noarch
 License:        ASL 2.0
 Group:          Development/Libraries
 URL:            http://logging.apache.org/%{name}
-Source0:        http://www.apache.org/dist/logging/%{name}/%{version}/apache-%{name}-%{version}.tar.gz
+Source0:        http://www.apache.org/dist/logging/%{name}/%{version}/%{name}-%{version}.tar.gz
 # Converted from src/java/org/apache/log4j/lf5/viewer/images/lf5_small_icon.gif
 Source1:        %{name}-logfactor5.png
 Source2:        %{name}-logfactor5.sh
@@ -24,8 +24,8 @@ Patch0:         0001-logfactor5-changed-userdir.patch
 Patch1:         0006-Remove-mvn-clirr-plugin.patch
 Patch2:         0009-Remove-ant-run-of-tests.patch
 Patch3:         0010-Fix-javadoc-link.patch
-Patch4:        fix_junit_dep.patch
-Patch5:        remove_duplicate_manifest_entry.patch
+Patch4:         0011-Remove-openejb.patch
+Patch5:         0012-Add-proper-bundle-symbolicname.patch
 
 BuildRequires:  %{__perl}
 BuildRequires:  java >= 1:1.6.0
@@ -41,6 +41,7 @@ BuildRequires:  maven-surefire-provider-junit
 BuildRequires:  maven-ant-plugin
 BuildRequires:  maven-antrun-plugin
 BuildRequires:  maven-assembly-plugin
+BuildRequires:  maven-changes-plugin
 BuildRequires:  maven-compiler-plugin
 BuildRequires:  maven-idea-plugin
 BuildRequires:  maven-install-plugin
@@ -48,6 +49,7 @@ BuildRequires:  maven-jar-plugin
 BuildRequires:  maven-javadoc-plugin
 BuildRequires:  maven-resources-plugin
 BuildRequires:  maven-site-plugin
+BuildRequires:  maven-skins
 BuildRequires:  ant-junit
 BuildRequires:  ant-contrib
 
@@ -81,9 +83,8 @@ Requires:       jpackage-utils
 %patch1 -p1 -b .remove-mvn-clirr
 %patch2 -p1 -b .remove-tests
 %patch3 -p1 -b .xlink-javadoc
-
-%patch4
-%patch5
+%patch4 -p1 -b .openejb
+%patch5 -p1 -b .bundlename
 
 sed -i "s|groupId>ant<|groupId>org.apache.ant<|g" pom.xml
 
@@ -107,7 +108,7 @@ find . \( -name "*.jar" -o -name "*.class" \) -exec %__rm -f {} \;
 # builds javadoc when install-ing
 # also note that maven.test.skip doesn't really work and we had to
 # patch ant run of tests out of pom
-mvn-rpmbuild package
+mvn-rpmbuild verify
 
 %install
 # jars
@@ -117,7 +118,8 @@ install -pD -T -m 644 target/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%
 # pom
 install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
 install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
-%add_to_maven_depmap %{name} %{name} %{version} JPP %{name}
+
+%add_maven_depmap
 
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
@@ -203,6 +205,11 @@ fi
 
 
 %changelog
+* Mon Jun 04 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.2.17-1
+- Update to latest version
+- Change OSGI bundle symbolic name to org.apache.log4j
+- Resolves #826776
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.2.16-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/remove_duplicate_manifest_entry.patch b/remove_duplicate_manifest_entry.patch
deleted file mode 100644
index 7c19b63..0000000
--- a/remove_duplicate_manifest_entry.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- pom.xml.sav	2011-10-28 19:25:17.000000000 +0300
-+++ pom.xml	2011-10-28 19:33:50.528628110 +0300
-@@ -382,7 +382,6 @@ target platform and specify -Dntdll_targ
-                                 javax.mail.*;resolution:=optional,
-                                 javax.management;resolution:=optional,
-                                 javax.naming;resolution:=optional,
--                                com.sun.jdmk.comm;resolution:=optional,
-                                 com.ibm.uvm.tools;resolution:=optional,
-                                 javax.swing.*;resolution:=optional,
-                                 *</Import-Package>