From 813e714f429e6cd0e07ef7aef79bcef8565ddaf46cac4d1721d26afeff436e42 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 27 Apr 2022 07:46:01 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/cglib?expand=0&rev=30 --- cglib.changes | 6 ++++++ cglib.spec | 18 +++++++++++------- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/cglib.changes b/cglib.changes index 4668afc..e58ca8a 100644 --- a/cglib.changes +++ b/cglib.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Apr 27 07:43:03 UTC 2022 - Fridrich Strba + +- Remove links between artifacts and their parent since we are + not building with maven + ------------------------------------------------------------------- Wed Dec 29 14:35:14 UTC 2021 - David Anes diff --git a/cglib.spec b/cglib.spec index 2cb5ea9..8d1ec86 100644 --- a/cglib.spec +++ b/cglib.spec @@ -1,7 +1,7 @@ # # spec file for package cglib # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -32,13 +32,13 @@ BuildRequires: fdupes BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local BuildRequires: objectweb-asm >= 5 +Requires: mvn(org.ow2.asm:asm) Provides: %{name}-nohook = %{version}-%{release} Obsoletes: %{name}-nohook < %{version}-%{release} -Requires: mvn(org.ow2.asm:asm) BuildArch: noarch %if %{with tests} -BuildConflicts: java-devel >= 9 BuildRequires: ant-junit +BuildConflicts: java-devel >= 9 %endif %description @@ -79,12 +79,18 @@ runtime. %pom_remove_plugin org.apache.maven.plugins:maven-jarsigner-plugin cglib-sample %pom_remove_plugin -r :maven-javadoc-plugin -%pom_remove_parent +%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 build-jar-repository -s -p lib objectweb-asm/asm ant/ant ant/ant-launcher -%ant \ +%{ant} \ %if %{without tests} -Dtest.skip=true \ %endif @@ -100,8 +106,6 @@ install -pm 0644 %{name}-sample/target/%{name}-sample-%{version}.jar %{buildroot # poms install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} -install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}-parent.pom -%add_maven_depmap %{name}/%{name}-parent.pom install -pm 0644 %{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