Accepting request 1148297 from Java:packages

rpm 4.20 compat

OBS-URL: https://build.opensuse.org/request/show/1148297
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/werken-xpath?expand=0&rev=19

werken-xpath.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+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>
+
+- Specify java source and target level 1.8
+
+-------------------------------------------------------------------
+Wed Sep 20 09:39:48 UTC 2017 - fstrba@suse.com
+
+- Fix build with jdk9: specify java source and target level 1.6
+- Clean spec file and fix rpmlint errors and warnings
+
 -------------------------------------------------------------------
 Fri May 19 11:55:54 UTC 2017 - dziolkowski@suse.com
 

werken-xpath.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package werken-xpath
 #
-# Copyright (c) 2017 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
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -23,7 +23,7 @@ Release:        0
 Summary:        XPath implementation using JDOM
 License:        Apache-1.1
 Group:          Development/Libraries/Java
-Url:            http://sourceforge.net/projects/werken-xpath/
+URL:            https://sourceforge.net/projects/werken-xpath/
 Source0:        %{dotname}-%{version}-beta-src.tar.bz2
 Source1:        %{name}-%{version}.pom
 Patch0:         %{name}-ElementNamespaceContext.patch
@@ -37,15 +37,15 @@ Patch7:         %{name}-Driver.patch
 Patch8:         %{name}-runtests_sh.patch
 BuildRequires:  ant >= 1.6
 BuildRequires:  antlr
-BuildRequires:  javapackages-local
-BuildRequires:  javapackages-tools
+BuildRequires:  fdupes
+BuildRequires:  java-devel >= 1.8
+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
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+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,28 +72,23 @@ 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
 done
-#pushd lib
-#ln -sf $(build-classpath antlr) antlr-runtime.jar
-#ln -sf $(build-classpath jdom) jdom.jar
-#ln -sf $(build-classpath xerces-j2) xerces.jar
-#popd
 
 %build
 export CLASSPATH=$(build-classpath jdom antlr xerces-j2 xml-commons-apis)
-ant -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 -Dbuild.compiler=modern 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
@@ -102,26 +97,24 @@ sh runtests.sh
 %install
 # jars
 mkdir -p %{buildroot}%{_javadir}
-cp -p build/%{dotname}.jar %{buildroot}%{_javadir}/%{dotname}.jar
-(cd %{buildroot}%{_javadir}; ln -sf %{dotname}.jar %{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}
 cp -pr build/apidocs/* %{buildroot}%{_javadocdir}/%{name}
+%fdupes -s %{buildroot}%{_javadocdir}/%{name}
 
-%files
-%defattr(0644,root,root,0755)
-%doc INSTALL LICENSE LIMITATIONS README TODO
-%{_javadir}/*
-%{_mavenpomdir}/*
-%{_datadir}/maven-metadata/%{name}.xml*
+%files -f .mfiles
+%{_javadir}/%{dotname}.jar
+%license LICENSE
+%doc LIMITATIONS README TODO
 
 %files javadoc
-%defattr(0644,root,root,0755)
 %{_javadocdir}/%{name}
 
 %changelog