.gitignore

@@ -1 +1 @@
-SOURCES/osgi.core-7.0.0.jar
+SOURCES/osgi.core-6.0.0-sources.jar

.osgi-core.metadata

@@ -1 +1 @@
-7545eab9bd1f85e9f1162865a7281c8becb417f2 SOURCES/osgi.core-7.0.0.jar
+921a11d64e9a5e6fb04f99a006a3b4b9773f44b8 SOURCES/osgi.core-6.0.0-sources.jar

SOURCES/osgi.core-6.0.0.pom

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.osgi</groupId>
+  <artifactId>osgi.core</artifactId>
+  <version>6.0.0</version>
+  <description>OSGi Core Release 6, Interfaces and Classes for use in compiling bundles.</description>
+  <name>org.osgi:osgi.core</name>
+  <url>http://www.osgi.org/</url>
+  <organization>
+    <name>OSGi Alliance</name>
+    <url>http://www.osgi.org/</url>
+  </organization>
+  <licenses>
+    <license>
+      <name>Apache License, Version 2.0</name>
+      <url>http://opensource.org/licenses/apache2.0.php</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+  <scm>
+    <url>https://www.osgi.org/members/git/build.git</url>
+    <connection>scm:git:https://www.osgi.org/members/git/build.git</connection>
+    <developerConnection>scm:git:https://www.osgi.org/members/git/build.git</developerConnection>
+  </scm>
+  <developers>
+    <developer>
+      <id>osgi</id>
+      <email>info@osgi.org</email>
+      <name>OSGi Alliance</name>
+      <organization>OSGi Alliance</organization>
+    </developer>
+  </developers>
+</project>

SPECS/osgi-core.spec

@@ -1,19 +1,20 @@
 Name:           osgi-core
-Version:        7.0.0
-Release:        4%{?dist}
-Summary:        OSGi Core API
+Version:        6.0.0
+Release:        6%{?dist}
 License:        ASL 2.0
+Summary:        OSGi Core API
 URL:            https://www.osgi.org
+Source0:        https://repo1.maven.org/maven2/org/osgi/osgi.core/%{version}/osgi.core-%{version}-sources.jar
+Source1:        https://repo1.maven.org/maven2/org/osgi/osgi.core/%{version}/osgi.core-%{version}.pom
 BuildArch:      noarch
 
-Source0:        https://osgi.org/download/r7/osgi.core-%{version}.jar
-
 BuildRequires:  maven-local
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
-BuildRequires:  mvn(org.osgi:osgi.annotation)
+BuildRequires:  mvn(org.osgi:org.osgi.annotation)
+
 
 %description
-OSGi Core, Interfaces and Classes for use in compiling bundles.
+OSGi Core Release 6, Interfaces and Classes for use in compiling bundles.
 
 %package javadoc
 Summary:        API documentation for %{name}
@@ -21,17 +22,13 @@ Summary:        API documentation for %{name}
 %description javadoc
 This package provides %{summary}.
 
+
 %prep
 %setup -q -c
 
-# Delete pre-built binaries
-rm -r org
-find -name '*.class' -delete
-
-mkdir -p src/main/{java,resources}
-mv OSGI-OPT/src/org src/main/java/
-
-mv META-INF/maven/org.osgi/osgi.core/pom.xml .
+cp -p %SOURCE1 pom.xml
+mkdir -p src/main/java
+mv org src/main/java/
 
 %pom_xpath_inject pom:project '
 <packaging>bundle</packaging>
@@ -56,8 +53,6 @@ mv META-INF/maven/org.osgi/osgi.core/pom.xml .
 
 %pom_add_dep org.osgi:osgi.annotation::provided
 
-%mvn_alias : org.osgi:org.osgi.core
-
 %build
 %mvn_build
 
@@ -73,24 +68,6 @@ mv META-INF/maven/org.osgi/osgi.core/pom.xml .
 %license LICENSE
 
 %changelog
-* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 7.0.0-4
-- Mass rebuild for javapackages-tools 201902
-
-* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 7.0.0-3
-- Mass rebuild for javapackages-tools 201901
-
-* Wed Apr 17 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 7.0.0-2
-- Add alias for org.osgi:org.osgi.core
-
-* Wed Mar 06 2019 Mat Booth <mat.booth@redhat.com> - 7.0.0-1
-- Update to OSGi R7
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.0-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.0-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
 * Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild