From 6b335deeb19c68e9f6de8e30d023e961e967c744e30c7783fdf41b82ebf33503 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Tue, 12 Sep 2023 12:32:48 +0000
Subject: [PATCH 1/2] 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 "<groupId>cglib</groupId><version>%{version}</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

From bbb400f8923f8428fdcd5a82b03d0b2a9c7d96ce80149dc0992f018da104491b Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Tue, 12 Sep 2023 12:35:06 +0000
Subject: [PATCH 2/2] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/cglib?expand=0&rev=35

---
 cglib.changes |  5 +++++
 cglib.spec    | 10 +---------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/cglib.changes b/cglib.changes
index 0fa34f3..2d771a6 100644
--- a/cglib.changes
+++ b/cglib.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Sep 12 12:35:00 UTC 2023 - Fridrich Strba <fstrba@suse.com>
+
+- Simplify and clean-up the spec file
+
 -------------------------------------------------------------------
 Wed Apr 27 07:43:03 UTC 2022 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/cglib.spec b/cglib.spec
index 804f3b4..26ebe42 100644
--- a/cglib.spec
+++ b/cglib.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cglib
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,7 +16,6 @@
 #
 
 
-%bcond_with tests
 %global tarball_name RELEASE_3_3_0
 Name:           cglib
 Version:        3.3.0
@@ -32,14 +31,9 @@ BuildRequires:  fdupes
 BuildRequires:  java-devel >= 1.8
 BuildRequires:  javapackages-local >= 6
 BuildRequires:  objectweb-asm >= 5
-Requires:       mvn(org.ow2.asm:asm)
 Provides:       %{name}-nohook = %{version}-%{release}
 Obsoletes:      %{name}-nohook < %{version}-%{release}
 BuildArch:      noarch
-%if %{with tests}
-BuildRequires:  ant-junit
-BuildConflicts: java-devel >= 9
-%endif
 
 %description
 cglib is a powerful, high performance and quality Code Generation
@@ -85,9 +79,7 @@ runtime.
 mkdir -p lib
 build-jar-repository -s -p lib objectweb-asm/asm ant/ant ant/ant-launcher
 %{ant} \
-%if %{without tests}
     -Dtest.skip=true \
-%endif
     -Dcompiler.target=1.8 -Dcompiler.source=1.8 \
     package javadoc