From f8b7ac144cd1ddb20b573c52e50310e481f8345a4de641d8e56f2306ea85ce5d Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sun, 6 Oct 2024 15:34:36 +0000 Subject: [PATCH 1/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/osgi-compendium?expand=0&rev=21 --- .gitattributes | 23 +++++++ .gitignore | 1 + osgi-compendium-build.xml | 137 ++++++++++++++++++++++++++++++++++++++ osgi-compendium.changes | 27 ++++++++ osgi-compendium.spec | 122 +++++++++++++++++++++++++++++++++ osgi.cmpn-7.0.0.jar | 3 + osgi.cmpn-8.0.0.jar | 3 + 7 files changed, 316 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 osgi-compendium-build.xml create mode 100644 osgi-compendium.changes create mode 100644 osgi-compendium.spec create mode 100644 osgi.cmpn-7.0.0.jar create mode 100644 osgi.cmpn-8.0.0.jar diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/osgi-compendium-build.xml b/osgi-compendium-build.xml new file mode 100644 index 0000000..d6ab820 --- /dev/null +++ b/osgi-compendium-build.xml @@ -0,0 +1,137 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/osgi-compendium.changes b/osgi-compendium.changes new file mode 100644 index 0000000..ae460d5 --- /dev/null +++ b/osgi-compendium.changes @@ -0,0 +1,27 @@ +------------------------------------------------------------------- +Wed Oct 2 15:57:05 UTC 2024 - Fridrich Strba + +- Spec file cleanup + +------------------------------------------------------------------- +Sat Sep 2 21:52:09 UTC 2023 - Fridrich Strba + +- Regenerate the bundle manifest to correspond to what + maven-bundle-plugin generates during the maven build + +------------------------------------------------------------------- +Wed Apr 1 08:52:15 UTC 2020 - Fridrich Strba + +- Update to upstream version 7.0.0 + * no upstream changes + +------------------------------------------------------------------- +Mon Apr 15 13:48:07 UTC 2019 - Fridrich Strba + +- Build classpath using directly the geronimo-jpa-3.0-ap instead of + the jta_api symlink + +------------------------------------------------------------------- +Mon Feb 11 11:40:55 UTC 2019 - Fridrich Strba + +- Initial packaging of osgi-compendium 6.0.0 diff --git a/osgi-compendium.spec b/osgi-compendium.spec new file mode 100644 index 0000000..84a3dd6 --- /dev/null +++ b/osgi-compendium.spec @@ -0,0 +1,122 @@ +# +# spec file for package osgi-compendium +# +# 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 +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +Name: osgi-compendium +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: 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 >= 6 +BuildRequires: osgi-annotation +BuildRequires: osgi-core +BuildRequires: unzip +BuildArch: noarch + +%description +OSGi Compendium, Interfaces and Classes for use in compiling bundles. + +%package javadoc +Summary: API documentation for %{name} +Group: Documentation/HTML + +%description javadoc +This package provides %{summary}. + +%prep +%setup -q -c +cp %{SOURCE1} build.xml + +rm -r org +find -name '*.class' -delete + +mkdir -p src/main/{java,resources} +mv OSGI-OPT/src/org src/main/java/ +mv xmlns src/main/resources + +mv META-INF/maven/org.osgi/osgi.cmpn/pom.xml . +mv META-INF/LICENSE . +mv META-INF/NOTICE . + +%pom_xpath_inject pom:project ' +bundle + + UTF-8 + + + + + org.apache.felix + maven-bundle-plugin + true + + + ${project.artifactId} + ${project.artifactId} + + + + +' + +%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 javax.enterprise.inject atinject + +%build +ant jar javadoc + +%install +# jar +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} +%{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} +cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/ +%fdupes -s %{buildroot}%{_javadocdir} + +%files -f .mfiles +%license LICENSE NOTICE + +%files javadoc +%license LICENSE NOTICE +%{_javadocdir}/%{name} + +%changelog diff --git a/osgi.cmpn-7.0.0.jar b/osgi.cmpn-7.0.0.jar new file mode 100644 index 0000000..f1c3958 --- /dev/null +++ b/osgi.cmpn-7.0.0.jar @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8e6445afe1abb3dcd43c60c8cd6c0f15b052a8f4228812559ba521c5ce91db34 +size 1478661 diff --git a/osgi.cmpn-8.0.0.jar b/osgi.cmpn-8.0.0.jar new file mode 100644 index 0000000..343f53d --- /dev/null +++ b/osgi.cmpn-8.0.0.jar @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4f2dd5348f0c97e78588252d7730c05c065cc7b712e1892cc963ab9bf58a0c47 +size 1897102 From 501ebf46ffdb5689e190bd436387883826cc57a9384e6735d4642ffe06e4b29a Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sun, 6 Oct 2024 16:31:16 +0000 Subject: [PATCH 2/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/osgi-compendium?expand=0&rev=22 --- osgi-compendium-build.xml | 4 ++-- osgi-compendium.spec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/osgi-compendium-build.xml b/osgi-compendium-build.xml index d6ab820..4b7b783 100644 --- a/osgi-compendium-build.xml +++ b/osgi-compendium-build.xml @@ -118,8 +118,8 @@ - - + + diff --git a/osgi-compendium.spec b/osgi-compendium.spec index 84a3dd6..38b3df7 100644 --- a/osgi-compendium.spec +++ b/osgi-compendium.spec @@ -116,7 +116,7 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/ %license LICENSE NOTICE %files javadoc -%license LICENSE NOTICE +%license LICENSE NOTICE what %{_javadocdir}/%{name} %changelog From 8ae6463865ee7ae606ac54f78e8d25c7c1de9184a2e46cddcec2d48fb359616f Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sun, 6 Oct 2024 17:09:00 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/osgi-compendium?expand=0&rev=23 --- osgi-compendium.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osgi-compendium.spec b/osgi-compendium.spec index 38b3df7..84a3dd6 100644 --- a/osgi-compendium.spec +++ b/osgi-compendium.spec @@ -116,7 +116,7 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/ %license LICENSE NOTICE %files javadoc -%license LICENSE NOTICE what +%license LICENSE NOTICE %{_javadocdir}/%{name} %changelog From b6120159c73735d0d1b1935568f87767d38babf2136daf4ec0f6496761756c46 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 7 Oct 2024 22:54:03 +0000 Subject: [PATCH 4/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/osgi-compendium?expand=0&rev=24 --- osgi-compendium.changes | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/osgi-compendium.changes b/osgi-compendium.changes index ae460d5..4bd9b80 100644 --- a/osgi-compendium.changes +++ b/osgi-compendium.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Oct 7 22:53:25 UTC 2024 - Fridrich Strba + +- Upgrade to upstream version 8.0.0 + * no upstream changelog + ------------------------------------------------------------------- Wed Oct 2 15:57:05 UTC 2024 - Fridrich Strba