Accepting request 645613 from Java:packages

OBS-URL: https://build.opensuse.org/request/show/645613
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xmlgraphics-fop?expand=0&rev=36

reproducible-build-manifest.patch

@@ -0,0 +1,87 @@
+Remove custom "Build-Id" field from manifest. It contains:
+* Timestamp: Makes the build unreproducible.
+* Architecture: Makes the build arch-dependent whereas we want it as
+  noarch.:
+* OS and Java version: Too detailed information, triggers too many
+  publication for no real advantage.
+
+--
+diff -up fop-2.1/build.xml.orig fop-2.1/build.xml
+--- fop-2.1/build.xml.orig	2018-10-29 07:26:58.205413821 +0100
++++ fop-2.1/build.xml	2018-10-29 07:55:33.117484917 +0100
+@@ -460,7 +460,6 @@ list of possible build targets.
+         <attribute name="Implementation-Title" value="${Name}"/>
+         <attribute name="Implementation-Version" value="${version}"/>
+         <attribute name="Implementation-Vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/fop/)"/>
+-        <attribute name="Build-Id" value="${ts} (${user.name} [${os.name} ${os.version} ${os.arch}, Java ${java.runtime.version}, Target Java ${javac.target}])"/>
+       </manifest>
+     </jar>
+   </target>
+@@ -482,7 +481,6 @@ list of possible build targets.
+     <jar jarfile="${build.dir}/fop.jar" basedir="${build.classes.dir}">
+       <manifest>
+         <attribute name="Main-Class" value="org.apache.fop.cli.Main"/>
+-        <attribute name="Build-Id" value="${ts} (${user.name} [${os.name} ${os.version} ${os.arch}, Java ${java.runtime.version}, Target Java ${javac.target}])"/>
+         <section name="org/apache/fop/">
+           <attribute name="Specification-Title" value="XSL-FO - Extensible Stylesheet Language"/>
+           <attribute name="Specification-Version" value="1.1"/>
+@@ -506,9 +504,7 @@ list of possible build targets.
+       <format property="ts" pattern="yyyyMMdd-HHmmss-z"/>
+     </tstamp>
+     <jar jarfile="${build.dir}/fop-sandbox.jar" basedir="${build.sandbox-classes.dir}">
+-      <manifest>
+-        <attribute name="Build-Id" value="${ts} (${user.name} [${os.name} ${os.version} ${os.arch}, Java ${java.runtime.version}, Target Java ${javac.target}])"/>
+-      </manifest>
++      <manifest/>
+       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
+     </jar>
+   </target>
+@@ -637,7 +633,6 @@ list of possible build targets.
+         <attribute name="Implementation-Title" value="${fop-transcoder.name}"/>
+         <attribute name="Implementation-Version" value="${fop-transcoder.version}"/>
+         <attribute name="Implementation-Vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/fop/)"/>
+-        <attribute name="Build-Id" value="${ts} (${user.name} [${os.name} ${os.version} ${os.arch}, Java ${java.runtime.version}, Target Java ${javac.target}])"/>
+       </manifest>
+       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
+     </jar>
+@@ -672,7 +667,6 @@ list of possible build targets.
+         <attribute name="Implementation-Title" value="${fop-transcoder.name}"/>
+         <attribute name="Implementation-Version" value="${fop-transcoder.version}"/>
+         <attribute name="Implementation-Vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/fop/)"/>
+-        <attribute name="Build-Id" value="${ts} (${user.name} [${os.name} ${os.version} ${os.arch}, Java ${java.runtime.version}, Target Java ${javac.target}])"/>
+       </manifest>
+       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
+     </jar>
+@@ -1042,9 +1036,7 @@ NOTE:
+   </target>
+   <target name="jar-javadocs" depends="javadocs" description="Generates a jar file containing the Javadocs">
+     <jar jarfile="${build.dir}/${name}-${version}-javadoc.jar">
+-      <manifest>
+-        <attribute name="Build-Id" value="${ts} (${user.name} [${os.name} ${os.version} ${os.arch}, Java ${java.runtime.version}, Target Java ${javac.target}])"/>
+-      </manifest>
++      <manifest/>
+       <fileset dir="${build.javadocs.dir}"/>
+       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
+     </jar>
+@@ -1346,9 +1338,7 @@ NOTE:
+       <param name="pwd" value="${pwd}"/>
+     </antcall>
+     <jar jarfile="${build.dir}/${name}-${version}-bundle.jar">
+-      <manifest>
+-        <attribute name="Build-Id" value="${ts} (${user.name} [${os.name} ${os.version} ${os.arch}, Java ${java.runtime.version}])"/>
+-      </manifest>
++      <manifest/>
+       <fileset dir="${build.dir}">
+         <patternset>
+           <include name="${name}-${version}.jar*"/>
+diff -up fop-2.1/examples/plan/build.xml.orig fop-2.1/examples/plan/build.xml
+--- fop-2.1/examples/plan/build.xml.orig	2018-10-29 07:48:15.749466784 +0100
++++ fop-2.1/examples/plan/build.xml	2018-10-29 07:48:22.709467073 +0100
+@@ -133,7 +133,6 @@
+         <attribute name="Implementation-Title" value="${Name}"/>
+         <attribute name="Implementation-Version" value="${version}"/>
+         <attribute name="Implementation-Vendor" value="Apache Software Foundation (http://xmlgraphics.apache.org/fop/)"/>
+-        <attribute name="Build-Id" value="${ts} (${user.name} [${os.name} ${os.version} ${os.arch}])"/>
+     </manifest>
+     </jar>
+   </target>

xmlgraphics-fop.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Oct 29 06:31:21 UTC 2018 - antoine.belvire@opensuse.org
+
+- Add reproducible-build-manifest.patch: Remove custom "Build-Id"
+  from manifests. It contains date and other information making the
+  build unreproducible (boo#1110024).
+
 -------------------------------------------------------------------
 Tue Aug 28 13:51:49 UTC 2018 - tchvatal@suse.com
 

xmlgraphics-fop.spec

@@ -40,6 +40,8 @@ Patch1:         xmlgraphics-fop-cli.patch
 Patch2:         hyphenation-more-stack.patch
 Patch3:         fix-javadoc-java8.patch
 Patch4:         java8-compatibility.patch
+# PATCH-FEATURE-OPENSUSE reproducible-build-manifest.patch -- boo#1110024
+Patch5:         reproducible-build-manifest.patch
 BuildRequires:  ant >= 1.6.5
 BuildRequires:  apache-commons-io >= 2.4
 BuildRequires:  apache-commons-logging
@@ -89,6 +91,7 @@ rm src/java/org/apache/fop/util/bitmap/JAIMonochromeBitmapConverter.java
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 cp %{SOURCE2} %{SOURCE3} %{SOURCE4} .
 # Replace keyword "VERSION" in XML files with the real one: