From 0be31ce43585cf0ab885387e224d7dfb7973d83d Mon Sep 17 00:00:00 2001 From: fstrba <> Date: Feb 22 2024 20:11:14 +0000 Subject: Update objenesis to version 3.3 / rev 7 via SR 1148880 https://build.opensuse.org/request/show/1148880 by user fstrba + anag+factory rpm 4.20 compat --- diff --git a/.files b/.files index 2211bfa..1458a41 100644 Binary files a/.files and b/.files differ diff --git a/.rev b/.rev index cd31504..757ab6e 100644 --- a/.rev +++ b/.rev @@ -47,4 +47,12 @@ <comment>3.3</comment> <requestid>1130966</requestid> </revision> + <revision rev="7" vrev="2"> + <srcmd5>9a22ff57c179f66b717248dedfcf92f6</srcmd5> + <version>3.3</version> + <time>1708631872</time> + <user>anag+factory</user> + <comment>rpm 4.20 compat</comment> + <requestid>1148880</requestid> + </revision> </revisionlist> diff --git a/objenesis.changes b/objenesis.changes index 30e34d0..cfda6ce 100644 --- a/objenesis.changes +++ b/objenesis.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Feb 21 21:12:38 UTC 2024 - Fridrich Strba <fstrba@suse.com> + +- Use %patch -P N instead of deprecated %patchN. + +------------------------------------------------------------------- Tue Dec 5 09:54:15 UTC 2023 - Andrea Manzini <andrea.manzini@suse.com> - update to upstream version 3.3 diff --git a/objenesis.spec b/objenesis.spec index 5e488ac..be667ae 100644 --- a/objenesis.spec +++ b/objenesis.spec @@ -1,7 +1,7 @@ # # spec file for package objenesis # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # Copyright (c) 2000-2009, JPackage Project # # All modifications and additions to the file contributed by third parties @@ -33,12 +33,12 @@ Release: 0 Summary: A library for instantiating Java objects License: Apache-2.0 Group: Development/Libraries/Java -URL: http://objenesis.org/ -Source0: https://github.com/easymock/%{name}/archive/%{version}.tar.gz +URL: https://objenesis.org/ +Source0: https://github.com/easymock/%{name}/archive/refs/tags/%{version}.tar.gz Patch0: objenesis-javadoc.patch BuildRequires: fdupes BuildRequires: java-devel >= 1.8 -BuildRequires: javapackages-local +BuildRequires: javapackages-local >= 6 BuildArch: noarch %description @@ -71,21 +71,11 @@ This package contains the API documentation for %{name}. %prep %setup -q -%patch0 -p1 +%patch -P 0 -p1 # Enable generation of pom.properties (rhbz#1017850) %pom_xpath_remove pom:addMavenDescriptor -%pom_remove_plugin :maven-timestamp-plugin -%pom_xpath_remove "pom:dependency[pom:scope='test']" tck - -%pom_xpath_remove pom:build/pom:extensions - -for i in main tck; do - %pom_remove_parent ${i} - %pom_xpath_inject "pom:project" "<groupId>org.objenesis</groupId><version>%{version}</version>" ${i} -done - %build mkdir -p main/build/classes javac -d main/build/classes -source 8 -target 8 -encoding utf-8 \ @@ -136,8 +126,8 @@ install -m 0644 %{name}-tck-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{nam # poms install -dm 755 %{buildroot}%{_mavenpomdir}/%{name} -install -m 0644 main/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom -install -m 0644 tck/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}-tck.pom +%{mvn_install_pom} main/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom +%{mvn_install_pom} tck/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}-tck.pom %add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar %add_maven_depmap %{name}/%{name}-tck.pom %{name}/%{name}-tck.jar