.gitignore

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

.osgi-annotation.metadata

@@ -1 +1 @@
-c8c21fdf695aa93d8df0547c15fb6b52f3395787 SOURCES/osgi.annotation-7.0.0.jar
+09b256fd1357d5f8cb85e35f6c9ef460ce42cb16 SOURCES/osgi.annotation-6.0.0-sources.jar

SOURCES/osgi.annotation-6.0.0.pom

@@ -3,27 +3,25 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.osgi</groupId>
   <artifactId>osgi.annotation</artifactId>
-  <version>7.0.0</version>
-  <description>OSGi Annotation Release 7, Annotations for use in compiling bundles</description>
+  <version>6.0.0</version>
+  <description>OSGi Annotation Release 6, Annotations for use in compiling bundles.</description>
   <name>org.osgi:osgi.annotation</name>
-  <url>https://www.osgi.org/</url>
+  <url>http://www.osgi.org/</url>
   <organization>
     <name>OSGi Alliance</name>
-    <url>https://www.osgi.org/</url>
+    <url>http://www.osgi.org/</url>
   </organization>
   <licenses>
     <license>
-      <name>Apache-2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+      <name>Apache License, Version 2.0</name>
+      <url>http://opensource.org/licenses/apache2.0.php</url>
       <distribution>repo</distribution>
-      <comments>Apache License, Version 2.0</comments>
     </license>
   </licenses>
   <scm>
-    <url>https://osgi.org/gitweb/build.git</url>
-    <connection>scm:git:https://osgi.org/git/build.git</connection>
-    <developerConnection>scm:git:https://osgi.org/git/build.git</developerConnection>
-    <tag>hudson-build.core-1432</tag>
+    <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>
@@ -31,7 +29,6 @@
       <email>info@osgi.org</email>
       <name>OSGi Alliance</name>
       <organization>OSGi Alliance</organization>
-      <organizationUrl>https://www.osgi.org/</organizationUrl>
     </developer>
   </developers>
 </project>

SPECS/osgi-annotation.spec

@@ -1,13 +1,13 @@
 Name:    osgi-annotation
-Version: 7.0.0
-Release: 3%{?dist}
+Version: 6.0.0
+Release: 7%{?dist}
 Summary: Annotations for use in compiling OSGi bundles
 
 License: ASL 2.0
 URL:     http://www.osgi.org/
 # Upstream project is behind an account registration system with no anonymous
 # read access, so we download the source from maven central instead
-Source0: http://repo1.maven.org/maven2/org/osgi/osgi.annotation/%{version}/osgi.annotation-%{version}.jar
+Source0: http://repo1.maven.org/maven2/org/osgi/osgi.annotation/%{version}/osgi.annotation-%{version}-sources.jar
 Source1: http://repo1.maven.org/maven2/org/osgi/osgi.annotation/%{version}/osgi.annotation-%{version}.pom
 
 BuildArch:     noarch
@@ -28,10 +28,8 @@ This package contains the API documentation for %{name}.
 %prep
 %setup -c -q
 
-mkdir -p src/main/java && mv OSGI-OPT/src/org src/main/java
-
-rm -r org OSGI-OPT
-
+mkdir -p src/main/resources && mv about.html src/main/resources
+mkdir -p src/main/java && mv org src/main/java
 cp -p %{SOURCE1} pom.xml
 
 # Ensure OSGi metadata is generated
@@ -63,25 +61,14 @@ cp -p %{SOURCE1} pom.xml
 %mvn_install
 
 %files -f .mfiles
-%license LICENSE
-%doc about.html
+%doc LICENSE
+%dir %{_javadir}/osgi-annotation
+%dir %{_mavenpomdir}/osgi-annotation
 
 %files javadoc -f .mfiles-javadoc
 %doc LICENSE
 
 %changelog
-* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 7.0.0-3
-- Mass rebuild for javapackages-tools 201902
-
-* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 7.0.0-2
-- Mass rebuild for javapackages-tools 201901
-
-* Tue Nov 20 2018 Marian Koncek <mkoncek@redhat.com> - 7.0.0-1
-- Update to upstream version 7.0.0
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.0-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
 * Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.0-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild