!2 Update from 6.0.0 to 7.0.0

Merge pull request !2 from 雷炬/master

osgi-core.spec

@@ -1,34 +1,30 @@
-Name:           osgi-core
+Name:                osgi-core
-Version:        6.0.0
+Version:             7.0.0
-Release:        8
+Release:             1
-License:        ASL 2.0
+Summary:             OSGi Core API
-Summary:        OSGi Core API
+License:             ASL 2.0
-URL:            https://www.osgi.org
+URL:                 https://www.osgi.org
-Source0:        https://repo1.maven.org/maven2/org/osgi/osgi.core/%{version}/osgi.core-%{version}-sources.jar
+Source0:             https://osgi.org/download/r7/osgi.core-%{version}.jar
-Source1:        https://repo1.maven.org/maven2/org/osgi/osgi.core/%{version}/osgi.core-%{version}.pom
+BuildRequires:       maven-local mvn(org.apache.felix:maven-bundle-plugin)
-BuildArch:      noarch
+BuildRequires:       mvn(org.osgi:osgi.annotation)
-
+BuildArch:           noarch
-BuildRequires:  maven-local mvn(org.apache.felix:maven-bundle-plugin) mvn(org.osgi:org.osgi.annotation)
 
 %description
-OSGi Core version 6, this version is used to compile bundled interfaces and classes.
+OSGi Core, Interfaces and Classes for use in compiling bundles.
 
-%package help
+%package javadoc
-Summary:        API documentation for osgi-core
+Summary:             API documentation for %{name}
-Provides:      %{name}-javadoc = %{version}-%{release}
-Obsoletes:     %{name}-javadoc < %{version}-%{release}
-
-%description help
-This package provides API documentation for osgi-core.
 
+%description javadoc
+This package provides %{summary}.
 
 %prep
-%autosetup  -c  -p1
+%setup -q -c
-
+rm -r org
-cp -p %SOURCE1 pom.xml
+find -name '*.class' -delete
-mkdir -p src/main/java
+mkdir -p src/main/{java,resources}
-mv org src/main/java/
+mv OSGI-OPT/src/org src/main/java/
-
+mv META-INF/maven/org.osgi/osgi.core/pom.xml .
 %pom_xpath_inject pom:project '
 <packaging>bundle</packaging>
 <properties>
@@ -49,7 +45,6 @@ mv org src/main/java/
     </plugin>
   </plugins>
 </build>'
-
 %pom_add_dep org.osgi:osgi.annotation::provided
 
 %build
@@ -58,13 +53,16 @@ mv org src/main/java/
 %install
 %mvn_install
 
-
 %files -f .mfiles
 %license LICENSE
 %doc about.html
 
-%files help -f .mfiles-javadoc
+%files javadoc -f .mfiles-javadoc
+%license LICENSE
 
 %changelog
+* Thu Aug 13 2020 leiju <leiju4@huawei.com> - 7.0.0-1
+- Update from 6.0.0 to 7.0.0
+
 * Fri Dec 06 2019 yangjian<yangjian79@huawei.com> - 6.0.0-8
 - Package init

osgi-core.yaml

@@ -0,0 +1,4 @@
+version_control: NA
+src_repo: NA
+tag_prefix: NA
+seperator: NA

osgi.core-6.0.0.pom

@@ -1,34 +0,0 @@
-<?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>