diff --git a/osgi-core.spec b/osgi-core.spec index cf084a6..439fb65 100644 --- a/osgi-core.spec +++ b/osgi-core.spec @@ -1,34 +1,30 @@ -Name: osgi-core -Version: 6.0.0 -Release: 8 -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 - -BuildRequires: maven-local mvn(org.apache.felix:maven-bundle-plugin) mvn(org.osgi:org.osgi.annotation) +Name: osgi-core +Version: 7.0.0 +Release: 1 +Summary: OSGi Core API +License: ASL 2.0 +URL: https://www.osgi.org +Source0: https://osgi.org/download/r7/osgi.core-%{version}.jar +BuildRequires: maven-local mvn(org.apache.felix:maven-bundle-plugin) +BuildRequires: mvn(org.osgi:osgi.annotation) +BuildArch: noarch %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 -Summary: API documentation for osgi-core -Provides: %{name}-javadoc = %{version}-%{release} -Obsoletes: %{name}-javadoc < %{version}-%{release} - -%description help -This package provides API documentation for osgi-core. +%package javadoc +Summary: API documentation for %{name} +%description javadoc +This package provides %{summary}. %prep -%autosetup -c -p1 - -cp -p %SOURCE1 pom.xml -mkdir -p src/main/java -mv org src/main/java/ - +%setup -q -c +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 @@ -49,7 +45,6 @@ mv org src/main/java/ ' - %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 - 7.0.0-1 +- Update from 6.0.0 to 7.0.0 + * Fri Dec 06 2019 yangjian - 6.0.0-8 - Package init diff --git a/osgi-core.yaml b/osgi-core.yaml new file mode 100644 index 0000000..00bbaf0 --- /dev/null +++ b/osgi-core.yaml @@ -0,0 +1,4 @@ +version_control: NA +src_repo: NA +tag_prefix: NA +seperator: NA diff --git a/osgi.core-6.0.0-sources.jar b/osgi.core-6.0.0-sources.jar deleted file mode 100644 index 88e2a74..0000000 Binary files a/osgi.core-6.0.0-sources.jar and /dev/null differ diff --git a/osgi.core-6.0.0.pom b/osgi.core-6.0.0.pom deleted file mode 100644 index 00e405b..0000000 --- a/osgi.core-6.0.0.pom +++ /dev/null @@ -1,34 +0,0 @@ - - - 4.0.0 - org.osgi - osgi.core - 6.0.0 - OSGi Core Release 6, Interfaces and Classes for use in compiling bundles. - org.osgi:osgi.core - http://www.osgi.org/ - - OSGi Alliance - http://www.osgi.org/ - - - - Apache License, Version 2.0 - http://opensource.org/licenses/apache2.0.php - repo - - - - https://www.osgi.org/members/git/build.git - scm:git:https://www.osgi.org/members/git/build.git - scm:git:https://www.osgi.org/members/git/build.git - - - - osgi - info@osgi.org - OSGi Alliance - OSGi Alliance - - - diff --git a/osgi.core-7.0.0.jar b/osgi.core-7.0.0.jar new file mode 100644 index 0000000..553045b Binary files /dev/null and b/osgi.core-7.0.0.jar differ