Hello community,

here is the log from the commit of package log4j12 for openSUSE:Leap:15.2 
checked in at 2020-03-31 07:21:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/log4j12 (Old)
 and      /work/SRC/openSUSE:Leap:15.2/.log4j12.new.3160 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "log4j12"

Tue Mar 31 07:21:59 2020 rev:2 rq:788620 version:1.2.17

Changes:
--------
--- /work/SRC/openSUSE:Leap:15.2/log4j12/log4j12.changes        2020-02-05 
07:27:39.210702093 +0100
+++ /work/SRC/openSUSE:Leap:15.2/.log4j12.new.3160/log4j12.changes      
2020-03-31 07:21:59.294388087 +0200
@@ -1,0 +2,8 @@
+Fri Mar 20 12:58:03 UTC 2020 - Fridrich Strba <fst...@suse.com>
+
+- Added patch:
+  * log4j12-bundle_manifest.patch
+    + Add a bundle manifest to the log4j12 package so that it can
+      be used by eclipse
+
+-------------------------------------------------------------------

New:
----
  log4j12-bundle_manifest.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ log4j12.spec ++++++
--- /var/tmp/diff_new_pack.r8uKIf/_old  2020-03-31 07:21:59.902388351 +0200
+++ /var/tmp/diff_new_pack.r8uKIf/_new  2020-03-31 07:21:59.906388352 +0200
@@ -45,6 +45,8 @@
 Patch3:         log4j-reproducible.patch
 # PATCH-FIX-UPSTREAM bsc#1159646 CVE-2019-17571 deserialization of untrusted 
data in SocketServer
 Patch4:         log4j-CVE-2019-17571.patch
+# PATCH-FIX-OPENSUSE -- add bundle manifest
+Patch5:         log4j12-bundle_manifest.patch
 BuildRequires:  ant
 BuildRequires:  fdupes
 BuildRequires:  java-devel >= 1.8
@@ -83,6 +85,8 @@
 %if %{without bootstrap}
 %package        manual
 Summary:        Java logging tool (Manual)
+# Manual's api directory is a symlink to javadoc
+Requires:       %{name}-javadoc
 
 %description    manual
 Documentation manual for Java logging tool log4j.
@@ -101,6 +105,9 @@
 %patch2
 %patch3 -p1
 %patch4 -p1
+%if %{without bootstrap}
+%patch5 -p1
+%endif
 
 sed -i 's/\r//g' LICENSE NOTICE src/site/resources/css/*.css
 



++++++ log4j12-bundle_manifest.patch ++++++
diff -urEbwB apache-log4j-1.2.17/build.xml apache-log4j-1.2.17.new/build.xml
--- apache-log4j-1.2.17/build.xml       2012-05-06 13:00:28.000000000 +0200
+++ apache-log4j-1.2.17.new/build.xml   2020-03-20 13:54:30.581916159 +0100
@@ -433,6 +433,17 @@
                    ${stem}/config/*.class"
          excludes="**/UnitTest**">
                <manifest>
+                       <attribute name="Bundle-Description" value="Apache 
Log4j 1.2"/>
+                       <attribute name="Bundle-DocURL" 
value="http://logging.apache.org/log4j/1.2"/>
+                       <attribute name="Bundle-License" 
value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+                       <attribute name="Bundle-ManifestVersion" value="2"/>
+                       <attribute name="Bundle-Name" value="Apache Log4j"/>
+                       <attribute name="Bundle-SymbolicName" 
value="org.apache.log4j"/>
+                       <attribute name="Bundle-Vendor" value="Apache Software 
Foundation"/>
+                       <attribute name="Bundle-Version" value="${version}"/>
+                       <attribute name="Export-Package" 
value="org.apache.log4j;version=&quot;${version}&quot;,org.apache.log4j.config;version=&quot;${version}&quot;,org.apache.log4j.helpers;version=&quot;${version}&quot;,org.apache.log4j.jdbc;version=&quot;${version}&quot;,org.apache.log4j.jmx;version=&quot;${version}&quot;,org.apache.log4j.net;version=&quot;${version}&quot;,org.apache.log4j.or;version=&quot;${version}&quot;,org.apache.log4j.or.jms;version=&quot;${version}&quot;,org.apache.log4j.or.sax;version=&quot;${version}&quot;,org.apache.log4j.pattern;version=&quot;${version}&quot;,org.apache.log4j.rewrite;version=&quot;${version}&quot;,org.apache.log4j.spi;version=&quot;${version}&quot;,org.apache.log4j.varia;version=&quot;${version}&quot;,org.apache.log4j.xml;version=&quot;${version}&quot;"/>
+                       <attribute name="Import-Package" 
value="javax.jms;resolution:=optional,javax.mail;resolution:=optional,javax.mail.internet;resolution:=optional,javax.management,javax.naming,javax.xml.parsers,org.w3c.dom,org.xml.sax,org.xml.sax.helpers"/>
+                       <attribute name="Require-Capability" 
value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=1.6))&quot;"/>
                        <section name="org/apache/log4j">
                                <attribute name="Implementation-Title" 
value="log4j"/>
                                <attribute name="Implementation-Version" 
value="${version}"/> 

Reply via email to