Sync from SUSE:SLFO:Main osgi-compendium revision 604f88530224ffe47086cdf1ea20d773

osgi-compendium.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Oct  7 22:53:25 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to upstream version 8.0.0
+  * no upstream changelog
+
+-------------------------------------------------------------------
+Wed Oct  2 15:57:05 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Spec file cleanup
+
 -------------------------------------------------------------------
 Sat Sep  2 21:52:09 UTC 2023 - Fridrich Strba <fstrba@suse.com>
 

osgi-compendium.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package osgi-compendium
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,19 +17,21 @@
 
 
 Name:           osgi-compendium
-Version:        7.0.0
+Version:        8.0.0
 Release:        0
 Summary:        Interfaces and Classes for use in compiling OSGi bundles
 License:        Apache-2.0
 Group:          Development/Libraries/Java
-URL:            http://www.osgi.org
-Source0:        https://osgi.org/download/r7/osgi.cmpn-%{version}.jar
+URL:            https://www.osgi.org
+Source0:        https://osgi.org/download/r8/osgi.cmpn-%{version}.jar
 Source1:        %{name}-build.xml
 BuildRequires:  ant
+BuildRequires:  atinject
+BuildRequires:  cdi-api
 BuildRequires:  fdupes
 BuildRequires:  geronimo-jpa-3_0-api
 BuildRequires:  glassfish-servlet-api
-BuildRequires:  javapackages-local
+BuildRequires:  javapackages-local >= 6
 BuildRequires:  osgi-annotation
 BuildRequires:  osgi-core
 BuildRequires:  unzip
@@ -56,10 +58,9 @@ mkdir -p src/main/{java,resources}
 mv OSGI-OPT/src/org src/main/java/
 mv xmlns src/main/resources
 
-# J2ME stuff
-rm -r src/main/java/org/osgi/service/io
-
 mv META-INF/maven/org.osgi/osgi.cmpn/pom.xml .
+mv META-INF/LICENSE .
+mv META-INF/NOTICE .
 
 %pom_xpath_inject pom:project '
 <packaging>bundle</packaging>
@@ -82,15 +83,18 @@ mv META-INF/maven/org.osgi/osgi.cmpn/pom.xml .
   </plugins>
 </build>'
 
+%pom_remove_dep :
 %pom_add_dep org.osgi:osgi.annotation::provided
 %pom_add_dep org.osgi:osgi.core::provided
 %pom_add_dep javax.servlet:javax.servlet-api::provided
 %pom_add_dep javax.persistence:persistence-api::provided
+%pom_add_dep javax.enterprise:cdi-api::provided
+%pom_add_dep javax.inject:javax.inject::provided
 
 rm -r src/main/java/org/osgi/service/jaxrs
 
 mkdir -p lib
-build-jar-repository -s lib geronimo-jpa-3.0-api glassfish-servlet-api osgi-annotation osgi-core
+build-jar-repository -s lib geronimo-jpa-3.0-api glassfish-servlet-api osgi-annotation osgi-core javax.enterprise.inject atinject
 
 %build
 ant jar javadoc
@@ -101,7 +105,7 @@ install -dm 0755 %{buildroot}%{_javadir}/%{name}
 install -pm 0644 target/osgi.cmpn-%{version}.jar %{buildroot}%{_javadir}/%{name}/osgi.cmpn.jar
 # pom
 install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
-install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}/osgi.cmpn.pom
+%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{name}/osgi.cmpn.pom
 %add_maven_depmap %{name}/osgi.cmpn.pom %{name}/osgi.cmpn.jar
 # javadoc
 install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
@@ -109,11 +113,10 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
 %fdupes -s %{buildroot}%{_javadocdir}
 
 %files -f .mfiles
-%license LICENSE
-%doc about.html
+%license LICENSE NOTICE
 
 %files javadoc
-%license LICENSE
+%license LICENSE NOTICE
 %{_javadocdir}/%{name}
 
 %changelog