Sync from SUSE:SLFO:Main xml-commons-apis revision 03d26102c361925b1de614547190524b

xml-commons-apis.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+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>
 

xml-commons-apis.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package xml-commons-apis
 #
-# Copyright (c) 2022 SUSE LLC
+# 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,21 +22,23 @@ 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
+Source3:        https://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
+Source4:        https://repo1.maven.org/maven2/xml-apis/xml-apis-ext/1.3.04/xml-apis-ext-1.3.04.pom
 BuildRequires:  ant
 BuildRequires:  fdupes
 BuildRequires:  java-devel >= 1.8
-BuildRequires:  javapackages-local
+BuildRequires:  javapackages-local >= 6
 BuildRequires:  xz
-#!BuildIgnore:  xerces-j2 xml-apis xml-resolver
+#!BuildIgnore:  xerces-j2
+#!BuildIgnore:  xml-apis
+#!BuildIgnore:  xml-resolver
 Conflicts:      xml-commons-apis-bootstrap
 Provides:       xerces-j2-xml-apis
 Provides:       xml-apis = %{version}-%{release}
@@ -81,12 +83,6 @@ 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
-
-%pom_remove_parent xml-apis-ext*.pom
-
 %build
 ant -Dant.build.javac.source=8 -Dant.build.javac.target=8 jar javadoc
 
@@ -116,9 +112,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