From 6b335deeb19c68e9f6de8e30d023e961e967c744e30c7783fdf41b82ebf33503 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 12 Sep 2023 12:32:48 +0000 Subject: [PATCH] Accepting request 1110603 from Java:packages:test jp-l >= 6 OBS-URL: https://build.opensuse.org/request/show/1110603 OBS-URL: https://build.opensuse.org/package/show/Java:packages/cglib?expand=0&rev=34 --- cglib.spec | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/cglib.spec b/cglib.spec index 8d1ec86..804f3b4 100644 --- a/cglib.spec +++ b/cglib.spec @@ -30,7 +30,7 @@ Source1: %{name}-%{version}-build.tar.xz BuildRequires: ant >= 1.6 BuildRequires: fdupes BuildRequires: java-devel >= 1.8 -BuildRequires: javapackages-local +BuildRequires: javapackages-local >= 6 BuildRequires: objectweb-asm >= 5 Requires: mvn(org.ow2.asm:asm) Provides: %{name}-nohook = %{version}-%{release} @@ -80,12 +80,6 @@ runtime. %pom_remove_plugin -r :maven-javadoc-plugin %pom_remove_dep -r junit:junit -%pom_change_dep ::::: ::::: cglib cglib-sample - -for i in %{name} %{name}-sample; do - %pom_remove_parent ${i} - %pom_xpath_inject pom:project "cglib%{version}" ${i} -done %build mkdir -p lib @@ -106,9 +100,9 @@ install -pm 0644 %{name}-sample/target/%{name}-sample-%{version}.jar %{buildroot # poms install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} -install -pm 0644 %{name}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom +%mvn_install_pom %{name}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom %add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar -a "net.sf.cglib:cglib,cglib:cglib-full,cglib:cglib-nodep,org.sonatype.sisu.inject:cglib" -install -pm 0644 %{name}-sample/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}-sample.pom +%mvn_install_pom %{name}-sample/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}-sample.pom %add_maven_depmap %{name}/%{name}-sample.pom %{name}/%{name}-sample.jar # javadoc