Accepting request 1087482 from Java:packages

Cleanup

OBS-URL: https://build.opensuse.org/request/show/1087482
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/aopalliance?expand=0&rev=3
This commit is contained in:
Dominique Leuenberger 2023-05-17 08:53:26 +00:00 committed by Git OBS Bridge
commit 376eb3f7e7
5 changed files with 44 additions and 42 deletions

View File

@ -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>

View File

@ -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

View File

@ -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>

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
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>
- Update url to use https
-------------------------------------------------------------------
Sat Mar 19 13:03:25 UTC 2022 - Fridrich Strba <fstrba@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file for package aopalliance
#
# 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
@ -22,13 +22,12 @@ Release: 0
Summary: Java/J2EE AOP standards
License: SUSE-Public-Domain
Group: Development/Libraries/Java
URL: http://aopalliance.sourceforge.net/
URL: https://aopalliance.sourceforge.net/
# cvs -d:pserver:anonymous@aopalliance.cvs.sourceforge.net:/cvsroot/aopalliance login
# password empty
# cvs -z3 -d:pserver:anonymous@aopalliance.cvs.sourceforge.net:/cvsroot/aopalliance export -r HEAD aopalliance
Source0: aopalliance-src.tar.gz
Source1: http://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}/