From 8317947bae9c181d97f2167e99c84bcf640bc9100a3eec440cca3eccc2a26fe3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= <adrian@suse.de>
Date: Fri, 31 May 2024 15:04:06 +0200
Subject: [PATCH] Sync from SUSE:SLFO:Main xerces-j2 revision
 b4b21189ed264873596d70d169dd6ca5

---
 xerces-j2.changes | 10 ++++++++++
 xerces-j2.spec    | 27 ++++++++++-----------------
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/xerces-j2.changes b/xerces-j2.changes
index 4ca7fe1..8d25235 100644
--- a/xerces-j2.changes
+++ b/xerces-j2.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue Apr 30 12:23:31 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Simplify the spec file: remove old macros
+
+-------------------------------------------------------------------
+Tue Feb 20 14:48:04 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Use %patch -P N instead of deprecated %patchN.
+
 -------------------------------------------------------------------
 Fri Mar 18 16:34:22 UTC 2022 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/xerces-j2.spec b/xerces-j2.spec
index 3ac2ee0..089daa5 100644
--- a/xerces-j2.spec
+++ b/xerces-j2.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package xerces-j2
 #
-# 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
@@ -39,17 +39,16 @@ BuildRequires:  ant
 BuildRequires:  dos2unix
 BuildRequires:  fdupes
 BuildRequires:  java-devel >= 1.8
-BuildRequires:  javapackages-local
+BuildRequires:  javapackages-local >= 6
 BuildRequires:  xalan-j2 >= 2.7.1
 BuildRequires:  xml-commons-apis >= 1.4.01
 BuildRequires:  xml-commons-resolver >= 1.2
-#!BuildIgnore:  xerces-j2 osgi(org.apache.xerces) jaxp_parser_impl
+#!BuildIgnore:  jaxp_parser_impl
+#!BuildIgnore:  osgi(org.apache.xerces)
+#!BuildIgnore:  xerces-j2
 # Explicit javapackages-tools requires since scripts use
 # /usr/share/java-utils/java-functions
 Requires:       javapackages-tools
-Requires:       xalan-j2 >= 2.7.1
-Requires:       xml-commons-apis >= 1.4.01
-Requires:       xml-commons-resolver >= 1.2
 Provides:       %{name}-scripts = %{version}-%{release}
 Provides:       jaxp_parser_impl = 1.4
 Obsoletes:      %{name}-scripts < %{version}-%{release}
@@ -88,8 +87,8 @@ Requires:       %{name} = %{version}-%{release}
 find "(" -name "*.class" -o -name "*.jar" ")" -delete
 find -type f -exec dos2unix {} \;
 
-%patch0 -p1
-%patch1
+%patch -P 0 -p1
+%patch -P 1
 
 %build
 mkdir -p tools
@@ -113,7 +112,7 @@ install -pm 644 build/xercesImpl.jar %{buildroot}%{_javadir}/%{name}.jar
 
 # pom
 install -dm 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 %{SOURCE5} %{buildroot}%{_mavenpomdir}/%{name}.pom
+%{mvn_install_pom} %{SOURCE5} %{buildroot}%{_mavenpomdir}/%{name}.pom
 %add_maven_depmap %{name}.pom %{name}.jar -a xerces:xerces,xerces:xmlParserAPIs,apache:xerces-j2
 
 # javadoc
@@ -148,18 +147,12 @@ update-alternatives --remove jaxp_parser_impl %{_javadir}/%{name}.jar >/dev/null
 # it deletes the link, set it up again
 ln -sf %{name}.jar %{_javadir}/jaxp_parser_impl.jar
 
-%files
+%files -f .mfiles
 %license LICENSE
 %doc NOTICE README
 %{_bindir}/*
-%{_javadir}/*
 %{_mandir}/*/*
-%{_mavenpomdir}/*
-%if %{defined _maven_repository}
-%{_mavendepmapfragdir}/%{name}
-%else
-%{_datadir}/maven-metadata/%{name}.xml*
-%endif
+%{_javadir}/jaxp_parser_impl.jar
 
 %files javadoc
 %{_javadocdir}/%{name}