Accepting request 1148915 from Java:packages

rpm 4.20 compat

OBS-URL: https://build.opensuse.org/request/show/1148915
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/netbeans-resolver?expand=0&rev=16

netbeans-resolver.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Feb 21 21:27:58 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Use %patch -P N instead of deprecated %patchN.
+
 -------------------------------------------------------------------
 Tue Sep 19 15:16:33 UTC 2017 - fstrba@suse.com
 

netbeans-resolver.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package netbeans-resolver
 #
-# 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,51 +12,43 @@
 # 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/
 #
 
 
 %define patched_resolver_ver 1.2
 %define patched_resolver xml-commons-resolver-%{patched_resolver_ver}
-
 Name:           netbeans-resolver
 Version:        6.7.1
 Release:        0
 Summary:        Resolver subproject of xml-commons patched for NetBeans
 License:        Apache-1.1
 Group:          Development/Libraries/Java
-
+URL:            https://xml.apache.org/commons/
-Url:            http://xml.apache.org/commons/
+Source0:        http://www.apache.org/dist/xerces/xml-commons/%{patched_resolver}.tar.gz
-
-Source0:        http://www.apache.org/dist/xml/commons/%{patched_resolver}.tar.bz2
-
 # see http://hg.netbeans._org/main/file/721f72486327/o.apache.xml.resolver/external/readme.txt
 Patch0:         %{name}-%{version}-nb.patch
 Patch1:         %{name}-%{version}-resolver.patch
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildArch:      noarch
-
 BuildRequires:  ant
 BuildRequires:  dos2unix
-BuildRequires:  java-devel >= 1.6.0
+BuildRequires:  java-devel >= 1.8
 BuildRequires:  javapackages-tools
-
+Requires:       java >= 1.8
-Requires:       java >= 1.6.0
 Requires:       javapackages-tools
+BuildArch:      noarch
 
 %description
-Resolver subproject of xml-commons, version %{patched_resolver_ver} with 
+Resolver subproject of xml-commons, version %{patched_resolver_ver} with
 a patch for NetBeans.
 
 %prep
 %setup -q -n %{patched_resolver}
 # remove all binary libs and prebuilt javadocs
 find . -name "*.jar" -exec rm -f {} \;
-%{__rm} -rf docs
+rm -rf docs
 
-%patch0 -p1 -b .sav
+%patch -P 0 -p1 -b .sav
-%patch1 -p1 -b .sav
+%patch -P 1 -p1 -b .sav
 
 dos2unix -k KEYS
 dos2unix -k LICENSE.resolver.txt
@@ -64,21 +56,18 @@ dos2unix -k LICENSE.resolver.txt
 %build
 %{ant} \
     -f resolver.xml \
-    -Djavac.target=1.6 -Djavac.source=1.6 \
+    -Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8 \
     jar
 
 %install
 
 # JARs
-%{__mkdir_p} %{buildroot}%{_javadir}
+mkdir -p %{buildroot}%{_javadir}
-%{__cp} -p build/resolver.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
+cp -p build/resolver.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
-
-%clean
-%{__rm} -rf %{buildroot}
 
 %files
-%defattr(-,root,root,-)
 %{_javadir}/*
-%doc LICENSE.resolver.txt KEYS
+%license LICENSE.resolver.txt
+%doc KEYS
 
 %changelog

xml-commons-resolver-1.2.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d5aa6d6e686f868c5da5846b2286ffc8e96e25a393afdb203d7bfa2a8060994a
-size 211723