From 3a3b4a60eb6678d63e856f73d696e78ffc9698ee674130101b39eb0abdb0a2f3 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 30 Mar 2020 20:28:43 +0000 Subject: [PATCH 1/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/osgi-compendium?expand=0&rev=7 --- osgi-compendium-build.xml | 10 +++++----- osgi-compendium.spec | 8 +++++--- osgi.cmpn-6.0.0.jar | 3 --- osgi.cmpn-7.0.0.jar | 3 +++ 4 files changed, 13 insertions(+), 11 deletions(-) delete mode 100644 osgi.cmpn-6.0.0.jar create mode 100644 osgi.cmpn-7.0.0.jar diff --git a/osgi-compendium-build.xml b/osgi-compendium-build.xml index 3af3073..579fa8b 100644 --- a/osgi-compendium-build.xml +++ b/osgi-compendium-build.xml @@ -9,13 +9,13 @@ - + - - + + @@ -116,8 +116,8 @@ - - + + diff --git a/osgi-compendium.spec b/osgi-compendium.spec index daca43a..a179d86 100644 --- a/osgi-compendium.spec +++ b/osgi-compendium.spec @@ -1,7 +1,7 @@ # # spec file for package osgi-compendium # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,13 +17,13 @@ Name: osgi-compendium -Version: 6.0.0 +Version: 7.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/r6/osgi.cmpn-%{version}.jar +Source0: https://osgi.org/download/r7/osgi.cmpn-%{version}.jar Source1: %{name}-build.xml BuildRequires: ant BuildRequires: fdupes @@ -87,6 +87,8 @@ mv META-INF/maven/org.osgi/osgi.cmpn/pom.xml . %pom_add_dep javax.servlet:javax.servlet-api::provided %pom_add_dep javax.persistence:persistence-api::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 diff --git a/osgi.cmpn-6.0.0.jar b/osgi.cmpn-6.0.0.jar deleted file mode 100644 index 77cea15..0000000 --- a/osgi.cmpn-6.0.0.jar +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dbe06105a0e3e46bc88425b3d7c682a2d8b6bd055341913b6c37e998c00c9176 -size 958829 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 From 5f3c88e91839b3a73c0acd1b972ff818520fe431aec811b62ec2095ec50b1c54 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 31 Mar 2020 10:59:17 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/osgi-compendium?expand=0&rev=8 --- osgi-compendium-build.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/osgi-compendium-build.xml b/osgi-compendium-build.xml index 579fa8b..092a857 100644 --- a/osgi-compendium-build.xml +++ b/osgi-compendium-build.xml @@ -116,8 +116,8 @@ - - + + From 768df951f9426cc84d09c0cdfe0ffce50f8118b68e962438428ad93e7aa668dd Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 1 Apr 2020 08:52:39 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/osgi-compendium?expand=0&rev=9 --- osgi-compendium.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/osgi-compendium.changes b/osgi-compendium.changes index 4513ea2..82d9c70 100644 --- a/osgi-compendium.changes +++ b/osgi-compendium.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 1 08:52:15 UTC 2020 - Fridrich Strba + +- Update to upstream version 7.0.0 + ------------------------------------------------------------------- Mon Apr 15 13:48:07 UTC 2019 - Fridrich Strba