diff --git a/SPECS/felix-gogo-runtime.spec b/SPECS/felix-gogo-runtime.spec index c5ca6e5..970322b 100644 --- a/SPECS/felix-gogo-runtime.spec +++ b/SPECS/felix-gogo-runtime.spec @@ -3,11 +3,11 @@ %{!?scl:%global pkg_name %{name}} %{?scl:%scl_package %{project}-gogo-runtime} -%{!?maven_scl:%global maven_scl_prefix %{nil}} +%{?java_common_find_provides_and_requires} Name: %{?scl_prefix}%{project}-gogo-runtime Version: 0.10.0 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Community OSGi R4 Service Platform Implementation - Basic Commands License: ASL 2.0 URL: http://felix.apache.org/site/apache-felix-gogo.html @@ -27,13 +27,10 @@ Patch4: %{pkg_name}-parent.patch BuildArch: noarch -BuildRequires: %{maven_scl_prefix}maven-local -BuildRequires: %{maven_scl_prefix}felix-osgi-core -BuildRequires: %{maven_scl_prefix}felix-osgi-compendium +BuildRequires: %{?scl_prefix_java_common}maven-local +BuildRequires: %{?scl_prefix_maven}felix-osgi-core +BuildRequires: %{?scl_prefix_maven}felix-osgi-compendium BuildRequires: %{?scl_prefix}felix-gogo-parent -BuildRequires: %{maven_scl_prefix}junit - -%{?scl:BuildRequires: %{?scl_prefix}build} %{?scl:Requires: %scl_runtime} @@ -59,17 +56,17 @@ This package contains the API documentation for %{pkg_name}. %patch3 -p1 %patch4 -p1 -%{?scl:scl enable %{scl} - << "EOF"} +%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"} %mvn_file : %{project}/%{pkg_name} %{?scl:EOF} %build -%{?scl:scl enable %{scl} - << "EOF"} +%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"} %mvn_build %{?scl:EOF} %install -%{?scl:scl enable %{scl} - << "EOF"} +%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"} %mvn_install %{?scl:EOF} @@ -82,6 +79,9 @@ This package contains the API documentation for %{pkg_name}. %doc LICENSE NOTICE %changelog +* Thu Jan 15 2015 Mat Booth - 0.10.0-13 +- Related: rhbz#1175105 - Rebuilt to regenerate requires/provides + * Fri May 16 2014 Roland Grunberg - 0.10.0-12 - Make changes to build on DTS 3.0.