PR#1: Update to upstream version 7.0.0 - rpms/osgi-compendium

rpms / osgi-compendium

#1 Update to upstream version 7.0.0

Closed 5 years ago by mkoncek. Opened 5 years ago by mkoncek.

rpms/ mkoncek/osgi-compendium update-version into master

Marian Koncek • 5 years ago

40a2edb

.gitignore

file modified

		`@@ -1,1 +1,2 @@`
		`/osgi.cmpn-6.0.0.jar`
		`+ /osgi.cmpn-7.0.0.jar`

osgi-compendium.spec

file modified

+18 -32

		`@@ -1,21 +1,20 @@`
		`Name: osgi-compendium`
		`- Version: 6.0.0`
		`- Release: 6%{?dist}`
		`+ Version: 7.0.0`
		`+ Release: 1%{?dist}`
		`Summary: Interfaces and Classes for use in compiling OSGi bundles`
		`License: ASL 2.0`
		`URL: http://www.osgi.org`
		`BuildArch: noarch`

		`- Source0: https://osgi.org/download/r6/osgi.cmpn-%{version}.jar`
		`+ Source0: https://osgi.org/download/r7/osgi.cmpn-%{version}.jar`

		`BuildRequires: maven-local`
		`+ BuildRequires: mvn(jakarta.ws.rs:jakarta.ws.rs-api)`
		`BuildRequires: mvn(javax.persistence:persistence-api)`
		`BuildRequires: mvn(javax.servlet:javax.servlet-api)`
		`- BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)`
		`BuildRequires: mvn(org.osgi:osgi.annotation)`
		`BuildRequires: mvn(org.osgi:osgi.core)`

		`-`
		`%description`
		`OSGi Compendium, Interfaces and Classes for use in compiling bundles.`

		`@@ -30,9 +29,6 @@`
		`%prep`
		`%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 xmlns src/main/resources`
		`@@ -42,31 +38,19 @@`

		`mv META-INF/maven/org.osgi/osgi.cmpn/pom.xml .`

		`+ rm -r org OSGI-OPT`
		`+`
		`%pom_xpath_inject pom:project '`
		`- <packaging>bundle</packaging>`
		`<properties>`
		`- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>`
		`- </properties>`
		`- <build>`
		`- <plugins>`
		`- <plugin>`
		`- <groupId>org.apache.felix</groupId>`
		`- <artifactId>maven-bundle-plugin</artifactId>`
		`- <extensions>true</extensions>`
		`- <configuration>`
		`- <instructions>`
		`- <Bundle-Name>${project.artifactId}</Bundle-Name>`
		`- <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>`
		`- </instructions>`
		`- </configuration>`
		`- </plugin>`
		`- </plugins>`
		`- </build>'`
		`-`
		`- %pom_add_dep org.osgi:osgi.annotation::provided`
		`- %pom_add_dep org.osgi:osgi.core::provided`
		`- %pom_add_dep javax.servlet:javax.servlet-api::provided`
		`- %pom_add_dep javax.persistence:persistence-api::provided`
		`+ <maven.compiler.source>1.8</maven.compiler.source>`
		`+ <maven.compiler.target>1.8</maven.compiler.target>`
		`+ </properties>'`
		`+`
		`+ %pom_add_dep jakarta.ws.rs:jakarta.ws.rs-api`
		`+ %pom_add_dep javax.persistence:persistence-api`
		`+ %pom_add_dep javax.servlet:javax.servlet-api`
		`+ %pom_add_dep org.osgi:osgi.annotation`
		`+ %pom_add_dep org.osgi:osgi.core`

		`%build`
		`%mvn_build`
		`@@ -74,7 +58,6 @@`
		`%install`
		`%mvn_install`

		`-`
		`%files -f .mfiles`
		`%license LICENSE`
		`%doc about.html`
		`@@ -84,6 +67,9 @@`


		`%changelog`
		`+ * Tue Dec 18 2018 Marian Koncek <mkoncek@redhat.com> - 7.0.0-2`
		`+ - Update to upstream version 7.0.0`
		`+`
		`* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.0-6`
		`- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild`

sources

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- 40a24e915b654df4aed69c7f0f663eec osgi.cmpn-6.0.0.jar`
		`+ SHA512 (osgi.cmpn-7.0.0.jar) = 7fb3ab1f27b097290d67369bde993c9fbbe2db81b541f90ac332d0181c2823b21b7f4444070b627216d601582997f16cb9886d8e177c3a24e7fa118a875316ae`