From 5e4a66fa9eeb6af6b23a0853fcaacc75b4552e6340fc6b227213ab34b9cde77d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= <adrian@suse.de>
Date: Fri, 31 May 2024 15:02:55 +0200
Subject: [PATCH] Sync from SUSE:SLFO:Main werken-xpath revision
 8ff9df7e9b6304247c97b780d3f2bc18

---
 werken-xpath.changes |  5 +++++
 werken-xpath.spec    | 40 ++++++++++++++++++++--------------------
 2 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/werken-xpath.changes b/werken-xpath.changes
index 902a84f..9b54cdc 100644
--- a/werken-xpath.changes
+++ b/werken-xpath.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Feb 20 15:18:28 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Use %patch -P N instead of deprecated %patchN.
+
 -------------------------------------------------------------------
 Wed Mar 23 11:43:03 UTC 2022 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/werken-xpath.spec b/werken-xpath.spec
index 3b01478..5cf35c8 100644
--- a/werken-xpath.spec
+++ b/werken-xpath.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package werken-xpath
 #
-# 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,13 +39,13 @@ BuildRequires:  ant >= 1.6
 BuildRequires:  antlr
 BuildRequires:  fdupes
 BuildRequires:  java-devel >= 1.8
-BuildRequires:  javapackages-local
+BuildRequires:  javapackages-local >= 6
 BuildRequires:  jdom
 BuildRequires:  xerces-j2
 BuildRequires:  xml-commons-apis
 Requires:       jdom
-Provides:       werken.xpath = %{version}-%{release}
-Obsoletes:      werken.xpath < 0.9.4
+Provides:       %{dotname} = %{version}-%{release}
+Obsoletes:      %{dotname} < %{version}
 BuildArch:      noarch
 
 %description
@@ -59,8 +59,8 @@ werken.canonical (XML canonicalization) packages.
 %package        javadoc
 Summary:        Javadoc for %{name}
 Group:          Documentation/HTML
-Provides:       werken.xpath-javadoc = %{version}-%{release}
-Obsoletes:      werken.xpath-javadoc < 0.9.4
+Provides:       %{dotname}-javadoc = %{version}-%{release}
+Obsoletes:      %{dotname}-javadoc < %{version}
 
 %description    javadoc
 werken.xpath is an implementation of the W3C XPath Recommendation, on
@@ -72,15 +72,15 @@ werken.canonical (XML canonicalization) packages.
 
 %prep
 %setup -q -n %{dotname}
-%patch0 -b .sav
-%patch1 -b .sav
-%patch2 -b .sav
-%patch3 -b .sav
-%patch4 -b .sav
-%patch5 -b .sav
-%patch6 -b .sav
-%patch7 -b .sav
-%patch8 -b .sav
+%patch -P 0 -b .sav
+%patch -P 1 -b .sav
+%patch -P 2 -b .sav
+%patch -P 3 -b .sav
+%patch -P 4 -b .sav
+%patch -P 5 -b .sav
+%patch -P 6 -b .sav
+%patch -P 7 -b .sav
+%patch -P 8 -b .sav
 # remove all binary libs
 for j in $(find . -name "*.jar"); do
 	mv $j $j.no
@@ -88,7 +88,7 @@ done
 
 %build
 export CLASSPATH=$(build-classpath jdom antlr xerces-j2 xml-commons-apis)
-ant -Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8 package javadoc compile-test
+%{ant} -Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8 package javadoc compile-test
 # Note that you'll have to java in PATH for this to work, it is by default
 # when using a JPackage JVM.
 CLASSPATH=$CLASSPATH:build/werken.xpath.jar:build/test/classes
@@ -97,12 +97,12 @@ sh runtests.sh
 %install
 # jars
 mkdir -p %{buildroot}%{_javadir}
-cp -p build/%{dotname}.jar %{buildroot}%{_javadir}/%{dotname}.jar
-ln -sf %{dotname}.jar %{buildroot}%{_javadir}/%{name}.jar
+cp -p build/%{dotname}.jar %{buildroot}%{_javadir}/%{name}.jar
+ln -sf %{name}.jar %{buildroot}%{_javadir}/%{dotname}.jar
 # pom
 mkdir -p %{buildroot}%{_mavenpomdir}
-cp %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-werken-xpath.pom
-%add_maven_depmap
+%{mvn_install_pom} %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
 
 # javadoc
 mkdir -p %{buildroot}%{_javadocdir}/%{name}