Fridrich Strba 2020-03-31 06:11:41 +00:00 committed by Git OBS Bridge
parent 782984dec6
commit f4a1f5d533
2 changed files with 16 additions and 8 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Mar 31 06:10:51 UTC 2020 - Fridrich Strba <fstrba@suse.com>
- Build against OSGi R7 APIs
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Dec 2 06:30:52 UTC 2019 - Fridrich Strba <fstrba@suse.com> Mon Dec 2 06:30:52 UTC 2019 - Fridrich Strba <fstrba@suse.com>

View File

@ -1,7 +1,7 @@
# #
# spec file for package felix-shell # spec file for package felix-shell
# #
# Copyright (c) 2019 SUSE LLC # Copyright (c) 2020 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -23,14 +23,14 @@ Release: 0
Summary: Apache Felix Shell Service Summary: Apache Felix Shell Service
License: Apache-2.0 License: Apache-2.0
Group: Development/Libraries/Java Group: Development/Libraries/Java
URL: http://felix.apache.org URL: https://felix.apache.org
Source0: http://archive.apache.org/dist/felix/%{bundle}-%{version}-source-release.tar.gz Source0: http://archive.apache.org/dist/felix/%{bundle}-%{version}-source-release.tar.gz
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: maven-local BuildRequires: maven-local
BuildRequires: mvn(org.apache.felix:felix-parent:pom:) BuildRequires: mvn(org.apache.felix:felix-parent:pom:)
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
BuildRequires: mvn(org.osgi:org.osgi.compendium) BuildRequires: mvn(org.osgi:osgi.cmpn)
BuildRequires: mvn(org.osgi:org.osgi.core) BuildRequires: mvn(org.osgi:osgi.core)
BuildArch: noarch BuildArch: noarch
%description %description
@ -48,6 +48,10 @@ This package contains API documentation for %{name}.
%pom_remove_plugin org.codehaus.mojo:rat-maven-plugin %pom_remove_plugin org.codehaus.mojo:rat-maven-plugin
# Use latest OSGi implementation
%pom_change_dep :org.osgi.core org.osgi:osgi.core
%pom_change_dep :org.osgi.compendium org.osgi:osgi.cmpn
%pom_add_dep junit:junit::test %pom_add_dep junit:junit::test
%{mvn_file} :%{bundle} "felix/%{bundle}" %{mvn_file} :%{bundle} "felix/%{bundle}"
@ -63,11 +67,10 @@ This package contains API documentation for %{name}.
%fdupes -s %{buildroot}%{_javadocdir} %fdupes -s %{buildroot}%{_javadocdir}
%files -f .mfiles %files -f .mfiles
%license LICENSE %license LICENSE NOTICE
%doc NOTICE DEPENDENCIES %doc DEPENDENCIES
%files javadoc -f .mfiles-javadoc %files javadoc -f .mfiles-javadoc
%license LICENSE %license LICENSE NOTICE
%doc NOTICE
%changelog %changelog