From 71d103f89f5953aab422126d06b09b1adc209c7081575905a8a87b52a18b1f1d Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Tue, 16 May 2023 20:35:14 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/aopalliance?expand=0&rev=9

---
 aopalliance-1.0.pom        | 15 ---------------
 aopalliance-MANIFEST.MF    | 14 --------------
 aopalliance-manifest.patch | 18 ++++++++++++++++++
 aopalliance.changes        |  9 +++++++++
 aopalliance.spec           | 21 ++++++++++-----------
 5 files changed, 37 insertions(+), 40 deletions(-)
 delete mode 100644 aopalliance-1.0.pom
 delete mode 100644 aopalliance-MANIFEST.MF
 create mode 100644 aopalliance-manifest.patch

diff --git a/aopalliance-1.0.pom b/aopalliance-1.0.pom
deleted file mode 100644
index c7fb571..0000000
--- a/aopalliance-1.0.pom
+++ /dev/null
@@ -1,15 +0,0 @@
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>aopalliance</groupId>
-  <artifactId>aopalliance</artifactId>
-  <name>AOP alliance</name>
-  <version>1.0</version>
-  <description>AOP Alliance</description>
-  <url>http://aopalliance.sourceforge.net</url> 
-
-  <licenses>
-    <license>
-      <name>Public Domain</name>
-    </license>
-  </licenses>
-</project>
\ No newline at end of file
diff --git a/aopalliance-MANIFEST.MF b/aopalliance-MANIFEST.MF
deleted file mode 100644
index 31e4147..0000000
--- a/aopalliance-MANIFEST.MF
+++ /dev/null
@@ -1,14 +0,0 @@
-Manifest-Version: 1.0
-Ant-Version: Apache Ant 1.8.4
-Created-By: 1.7.0_05-icedtea-mockbuild_2012_07_09_18_45-b00 (Oracle Co
- rporation)
-Bundle-ManifestVersion: 2
-Bundle-Name: AOP Alliance
-Bundle-SymbolicName: aopalliance
-Bundle-Version: 1.0
-Bundle-Vendor: AOP Alliance
-Export-Package: org.aopalliance.aop,
- org.aopalliance.intercept,
- org.aopalliance.reflect,
- org.aopalliance.instrument
-Eclipse-BuddyPolicy: registered
diff --git a/aopalliance-manifest.patch b/aopalliance-manifest.patch
new file mode 100644
index 0000000..4c42921
--- /dev/null
+++ b/aopalliance-manifest.patch
@@ -0,0 +1,18 @@
+--- aopalliance/build.xml	2023-05-16 22:26:45.498861470 +0200
++++ aopalliance/build.xml	2023-05-16 22:29:50.811283305 +0200
+@@ -27,6 +27,15 @@
+ 		<jar jarfile="build/aopalliance.jar">
+ 			<fileset dir="build/classes">
+ 			</fileset>
++            <manifest>
++                <attribute name="Bundle-ManifestVersion" value="2"/>
++                <attribute name="Bundle-Name" value="AOP Alliance"/>
++                <attribute name="Bundle-SymbolicName" value="aopalliance"/>
++                <attribute name="Bundle-Vendor" value="AOP Alliance"/>
++                <attribute name="Bundle-Version" value="1.0"/>
++                <attribute name="Eclipse-BuddyPolicy" value="registered"/>
++                <attribute name="Export-Package" value="org.aopalliance.aop,org.aopalliance.instrument,org.aopalliance.intercept,org.aopalliance.reflect"/>
++            </manifest>
+ 		</jar>
+ 	</target>
+ 
diff --git a/aopalliance.changes b/aopalliance.changes
index 7ce5bb9..cfaacf0 100644
--- a/aopalliance.changes
+++ b/aopalliance.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue May 16 20:33:41 UTC 2023 - Fridrich Strba <fstrba@suse.com>
+
+- Register artifact by coordinates, since an artifact without
+  dependencies does not need a pom
+- Added patch:
+  * aopalliance-manifest.patch
+    + add OSGi manifest during the jar packaging
+
 -------------------------------------------------------------------
 Mon May 15 12:26:14 UTC 2023 - Frederic Crozat <fcrozat@suse.com>
 
diff --git a/aopalliance.spec b/aopalliance.spec
index 60821ce..9badadb 100644
--- a/aopalliance.spec
+++ b/aopalliance.spec
@@ -27,8 +27,7 @@ URL:            https://aopalliance.sourceforge.net/
 # password empty
 # cvs -z3 -d:pserver:anonymous@aopalliance.cvs.sourceforge.net:/cvsroot/aopalliance export -r HEAD aopalliance
 Source0:        aopalliance-src.tar.gz
-Source1:        https://repo1.maven.org/maven2/aopalliance/aopalliance/1.0/aopalliance-1.0.pom
-Source2:        %{name}-MANIFEST.MF
+Patch0:         aopalliance-manifest.patch
 BuildRequires:  ant
 BuildRequires:  fdupes
 BuildRequires:  javapackages-local
@@ -52,25 +51,25 @@ This package contains the API documentation for %{name}.
 
 %prep
 %setup -q -n %{name}
+# Inject OSGi manifest required by Eclipse.
+%patch0 -p1
 
 %build
 export CLASSPATH=
 export OPT_JAR_LIST=:
 %{ant} \
-  -Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8 \
-  -Dbuild.sysclasspath=only jar javadoc
-
-# Inject OSGi manifest required by Eclipse.
-jar umf %{SOURCE2} build/%{name}.jar
+  -Dant.build.javac.source=1.8 \
+  -Dant.build.javac.target=1.8 \
+  jar javadoc
 
 %install
 # jar
 install -dm 0755 %{buildroot}%{_javadir}
 install -pm 0644 build/%{name}.jar %{buildroot}%{_javadir}/%{name}.jar
-# pom
-install -dm 0755 %{buildroot}%{_mavenpomdir}
-install -pm 0644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/%{name}.pom
-%add_maven_depmap %{name}.pom %{name}.jar
+
+# maven metadata
+%add_maven_depmap aopalliance:aopalliance:%{version} %{name}.jar
+
 # javadoc
 install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
 cp -pr build/javadoc/* %{buildroot}%{_javadocdir}/%{name}/