Hello community,

here is the log from the commit of package xmlgraphics-fop for openSUSE:Factory 
checked in at 2017-03-03 17:55:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xmlgraphics-fop (Old)
 and      /work/SRC/openSUSE:Factory/.xmlgraphics-fop.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "xmlgraphics-fop"

Fri Mar  3 17:55:27 2017 rev:29 rq:461919 version:2.1

Changes:
--------
--- /work/SRC/openSUSE:Factory/xmlgraphics-fop/xmlgraphics-fop.changes  
2016-03-26 15:22:38.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.xmlgraphics-fop.new/xmlgraphics-fop.changes     
2017-03-03 17:55:28.324432940 +0100
@@ -1,0 +2,7 @@
+Thu Mar  2 08:45:45 UTC 2017 - [email protected]
+
+- Add patch to fix build with stricter javadoc in version 8:
+  * fix-javadoc-java8.patch (boo#1027467)
+- Fix file list on SLE
+
+-------------------------------------------------------------------

New:
----
  fix-javadoc-java8.patch

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

Other differences:
------------------
++++++ xmlgraphics-fop.spec ++++++
--- /var/tmp/diff_new_pack.ZpPlVq/_old  2017-03-03 17:55:30.640105854 +0100
+++ /var/tmp/diff_new_pack.ZpPlVq/_new  2017-03-03 17:55:30.640105854 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package xmlgraphics-fop
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2000-2008, JPackage Project
 #
 # All modifications and additions to the file contributed by third parties
@@ -38,6 +38,7 @@
 Source12:       %{name}-fontlist.xml
 Patch1:         xmlgraphics-fop-cli.patch
 Patch2:         hyphenation-more-stack.patch
+Patch3:         fix-javadoc-java8.patch
 BuildRequires:  ant >= 1.6.5
 BuildRequires:  apache-commons-io >= 2.4
 BuildRequires:  apache-commons-logging
@@ -85,6 +86,7 @@
 find -name "*.jar" | xargs -t rm
 %patch1 -p1 -b .cli
 %patch2 -p1
+%patch3 -p1
 
 cp %{SOURCE2} %{SOURCE3} %{SOURCE4} .
 # Replace keyword "VERSION" in XML files with the real one:
@@ -185,7 +187,11 @@
 %{_javadir}/%{name}.jar
 %{_datadir}/%{name}
 %{_mavenpomdir}/*
+%if 0%{is_opensuse}
 %{_datadir}/maven-metadata/%{name}.xml*
+%else
+%{_mavendepmapfragdir}/%{name}
+%endif
 %{_mandir}/man1/*
 %config(noreplace) %{_sysconfdir}/fop.xconf
 

++++++ fix-javadoc-java8.patch ++++++
Index: fop-2.1/build.xml
===================================================================
--- fop-2.1.orig/build.xml
+++ fop-2.1/build.xml
@@ -963,6 +963,7 @@ NOTE:
       doctitle="Apache Formatting Objects Processor (FOP)"
       bottom="Copyright ${year} The Apache Software Foundation. All Rights 
Reserved."
       overview="${src.dir}/java/org/apache/fop/overview.html"
+      additionalparam="--allow-script-in-comments"
       maxmemory="256M">
       <header><![CDATA[${name} ${version}]]></header>
       <footer><![CDATA[${name} ${version}]]></footer>


Reply via email to