diff --git a/.gitignore b/.gitignore
index 99abbd3..a56a7c9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/osgi.core-6.0.0-sources.jar
+/osgi.core-7.0.0.jar
diff --git a/osgi-core.spec b/osgi-core.spec
index a0f8b05..f06ba2d 100644
--- a/osgi-core.spec
+++ b/osgi-core.spec
@@ -1,20 +1,19 @@
Name: osgi-core
-Version: 6.0.0
-Release: 8%{?dist}
-License: ASL 2.0
+Version: 7.0.0
+Release: 1%{?dist}
Summary: OSGi Core API
+License: ASL 2.0
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:org.osgi.annotation)
-
+BuildRequires: mvn(org.osgi:osgi.annotation)
%description
-OSGi Core Release 6, Interfaces and Classes for use in compiling bundles.
+OSGi Core, Interfaces and Classes for use in compiling bundles.
%package javadoc
Summary: API documentation for %{name}
@@ -22,13 +21,17 @@ Summary: API documentation for %{name}
%description javadoc
This package provides %{summary}.
-
%prep
%setup -q -c
-cp -p %SOURCE1 pom.xml
-mkdir -p src/main/java
-mv org src/main/java/
+# 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 .
%pom_xpath_inject pom:project '
bundle
@@ -68,6 +71,9 @@ mv org src/main/java/
%license LICENSE
%changelog
+* Wed Mar 06 2019 Mat Booth - 7.0.0-1
+- Update to OSGi R7
+
* Fri Feb 01 2019 Fedora Release Engineering - 6.0.0-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
diff --git a/sources b/sources
index 3e179ea..21cb30f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1d6cda750e77e31fac814f5b7a5aa851 osgi.core-6.0.0-sources.jar
+SHA512 (osgi.core-7.0.0.jar) = 60c5e59fc1d33bcb63a0be1151af04321bf9c6c08faa910cf1a29f74b9b58d43edc2d528182edd0884d2bd44403840d8d50b6c012411892391fe28c0a2102ffb