Accepting request 1202038 from Java:packages

Bit-reproducible build

OBS-URL: https://build.opensuse.org/request/show/1202038
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xml-commons-apis?expand=0&rev=6

xml-commons-apis.changes

@@ -1,3 +1,35 @@
+-------------------------------------------------------------------
+Thu Sep 19 15:03:31 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Use SOURCE_DATE_EPOCH for reproducible builds
+
+-------------------------------------------------------------------
+Wed Feb 21 22:22:21 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Clean the spec file and simplify it a bit
+
+-------------------------------------------------------------------
+Fri Mar 18 16:27:31 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Build with source/target levels 8
+
+-------------------------------------------------------------------
+Mon Apr  8 11:37:06 UTC 2019 - Fridrich Strba <fstrba@suse.com>
+
+- Do not depend on the apache-parent, since we are not building
+  using Maven.
+
+-------------------------------------------------------------------
+Fri Feb  1 16:34:45 UTC 2019 - Fridrich Strba <fstrba@suse.com>
+
+- BuildIgnore xml-apis and xml-resolver, since this does not
+  strictly require them for build
+
+-------------------------------------------------------------------
+Fri Feb  1 12:54:51 UTC 2019 - Fridrich Strba <fstrba@suse.com>
+
+- BuildIgnore xerces-j2 to break cycle of OSGi requires
+
 -------------------------------------------------------------------
 Thu Dec 13 10:47:17 UTC 2018 - Fridrich Strba <fstrba@suse.com>
 

xml-commons-apis.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package xml-commons-apis
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -22,34 +22,35 @@ Release:        0
 Summary:        APIs for DOM, SAX, and JAXP
 License:        Apache-2.0 AND W3C AND SUSE-Public-Domain
 Group:          Development/Libraries/Java
-URL:            http://xml.apache.org/commons/
+URL:            https://xml.apache.org/commons/
 # From source control because the published tarball doesn't include some docs:
 #   svn export http://svn.apache.org/repos/asf/xerces/xml-commons/tags/xml-commons-external-1_4_01/java/external
 #   tar cJf xml-commons-external-1.4.01-src.tar.xz external
 Source0:        xml-commons-external-1.4.01-src.tar.xz
 Source1:        %{name}-MANIFEST.MF
 Source2:        %{name}-ext-MANIFEST.MF
-Source3:        http://repo1.maven.org/maven2/xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.pom
-Source4:        http://repo1.maven.org/maven2/xml-apis/xml-apis-ext/1.3.04/xml-apis-ext-1.3.04.pom
+Source3:        https://repo1.maven.org/maven2/xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.pom
+Source4:        https://repo1.maven.org/maven2/xml-apis/xml-apis-ext/1.3.04/xml-apis-ext-1.3.04.pom
 BuildRequires:  ant
-BuildRequires:  apache-parent
 BuildRequires:  fdupes
-BuildRequires:  java-devel
-BuildRequires:  javapackages-local
+BuildRequires:  java-devel >= 1.8
+BuildRequires:  javapackages-local >= 6
 BuildRequires:  xz
-Requires:       apache-parent
+#!BuildIgnore:  xerces-j2
+#!BuildIgnore:  xml-apis
+#!BuildIgnore:  xml-resolver
 Conflicts:      xml-commons-apis-bootstrap
-Provides:       xml-commons-jaxp-1.4-apis
-Provides:       xml-commons-jaxp-1.3-apis
-Provides:       xml-commons-jaxp-1.2-apis
-Provides:       xml-commons-jaxp-1.1-apis
 Provides:       xerces-j2-xml-apis
-Provides:       xml-apis = %{name}-%{release}
-Obsoletes:      xml-commons-jaxp-1.4-apis
-Obsoletes:      xml-commons-jaxp-1.3-apis
-Obsoletes:      xml-commons-jaxp-1.2-apis
-Obsoletes:      xml-commons-jaxp-1.1-apis
+Provides:       xml-apis = %{version}-%{release}
+Provides:       xml-commons-jaxp-1.1-apis
+Provides:       xml-commons-jaxp-1.2-apis
+Provides:       xml-commons-jaxp-1.3-apis
+Provides:       xml-commons-jaxp-1.4-apis
 Obsoletes:      xerces-j2-xml-apis
+Obsoletes:      xml-commons-jaxp-1.1-apis
+Obsoletes:      xml-commons-jaxp-1.2-apis
+Obsoletes:      xml-commons-jaxp-1.3-apis
+Obsoletes:      xml-commons-jaxp-1.4-apis
 BuildArch:      noarch
 
 %description
@@ -82,16 +83,20 @@ iconv -f iso8859-1 -t utf-8 LICENSE.dom-documentation.txt > \
 iconv -f iso8859-1 -t utf-8 LICENSE.dom-software.txt > \
   LICENSE.dom-sof.temp && mv -f LICENSE.dom-sof.temp LICENSE.dom-software.txt
 
-# remove bogus section from poms
-cp %{SOURCE3} %{SOURCE4} .
-sed -i '/distributionManagement/,/\/distributionManagement/ {d}' *.pom
-
 %build
-ant -Dant.build.javac.source=6 -Dant.build.javac.target=6 jar javadoc
+ant -Dant.build.javac.source=8 -Dant.build.javac.target=8 jar javadoc
 
 # inject OSGi manifests
-jar ufm build/xml-apis.jar %{SOURCE1}
-jar ufm build/xml-apis-ext.jar %{SOURCE2}
+jar \
+%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 17}%{!?pkg_vcmp:0}
+    --date="$(date -u -d @${SOURCE_DATE_EPOCH:-$(date +%%s)} +%%Y-%%m-%%dT%%H:%%M:%%SZ)" \
+%endif
+    --update --file=build/xml-apis.jar --manifest=%{SOURCE1}
+jar \
+%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 17}%{!?pkg_vcmp:0}
+    --date="$(date -u -d @${SOURCE_DATE_EPOCH:-$(date +%%s)} +%%Y-%%m-%%dT%%H:%%M:%%SZ)" \
+%endif
+    --update --file=build/xml-apis-ext.jar --manifest=%{SOURCE2}
 
 %install
 # jar
@@ -115,9 +120,9 @@ popd
 
 # pom
 install -d -m 0755 %{buildroot}%{_mavenpomdir}
-install -pm 644 xml-apis-[0-9]*.pom %{buildroot}%{_mavenpomdir}/xml-commons-apis.pom
+%{mvn_install_pom} %{SOURCE3} %{buildroot}%{_mavenpomdir}/xml-commons-apis.pom
 %add_maven_depmap xml-commons-apis.pom xml-commons-apis.jar
-install -pm 644 xml-apis-ext*.pom %{buildroot}%{_mavenpomdir}/xml-commons-apis-ext.pom
+%{mvn_install_pom} %{SOURCE4} %{buildroot}%{_mavenpomdir}/xml-commons-apis-ext.pom
 %add_maven_depmap xml-commons-apis-ext.pom xml-commons-apis-ext.jar -a xerces:dom3-xml-apis
 
 # javadoc
@@ -129,16 +134,10 @@ cp -a build/docs/javadoc/* %{buildroot}%{_javadocdir}/%{name}
 rm -rf build/docs/javadoc
 %fdupes -s build/docs/
 
-%files
+%files -f .mfiles
 %license LICENSE LICENSE.dom-documentation.txt LICENSE.dom-software.txt LICENSE.sac.html LICENSE.sax.txt
 %doc NOTICE README.dom.txt README-sax README.sax.txt
 %{_javadir}/*
-%{_mavenpomdir}/*
-%if %{defined _maven_repository}
-%{_mavendepmapfragdir}/%{name}
-%else
-%{_datadir}/maven-metadata/%{name}.xml*
-%endif
 
 %files manual
 %doc build/docs/*