diff --git a/SPECS/felix-gogo-shell.spec b/SPECS/felix-gogo-shell.spec index 48c5eee..2094da1 100644 --- a/SPECS/felix-gogo-shell.spec +++ b/SPECS/felix-gogo-shell.spec @@ -5,11 +5,11 @@ %{!?scl:%global pkg_name %{name}} %{?scl:%scl_package %{project}-gogo-shell} -%{!?maven_scl:%global maven_scl_prefix %{nil}} +%{?java_common_find_provides_and_requires} Name: %{?scl_prefix}%{project}-gogo-shell Version: 0.10.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Community OSGi R4 Service Platform Implementation - Basic Commands Group: Development/Tools License: ASL 2.0 @@ -25,20 +25,9 @@ Patch1: ignoreActivatorException.patch BuildArch: noarch BuildRequires: java-1.7.0-openjdk-devel >= 1.7.0 -BuildRequires: jpackage-utils -BuildRequires: %{maven_scl_prefix}maven-local -BuildRequires: %{maven_scl_prefix}maven-plugin-bundle -BuildRequires: %{maven_scl_prefix}maven-surefire-provider-junit +BuildRequires: %{?scl_prefix_java_common}maven-local BuildRequires: %{?scl_prefix}felix-gogo-parent BuildRequires: %{?scl_prefix}felix-gogo-runtime -BuildRequires: %{maven_scl_prefix}felix-osgi-compendium -BuildRequires: %{maven_scl_prefix}maven-install-plugin -#BuildRequires: mockito -%{?scl:BuildRequires: %{?scl_prefix}build} - -Requires: java -Requires: jpackage-utils -%{?scl:Requires: %scl_runtime} %description Apache Felix is a community effort to implement the OSGi R4 Service Platform @@ -62,33 +51,29 @@ This package contains the API documentation for %{pkg_name}. %patch1 %build -scl enable %{scl} - <> %{_builddir}/%{bundle}-%{version}/.mfiles-javadoc; -done - - %files -f .mfiles +%dir %{_javadir}/felix-gogo-shell +%dir %{_mavenpomdir}/felix-gogo-shell %doc DEPENDENCIES LICENSE NOTICE %files javadoc -f .mfiles-javadoc %doc LICENSE %changelog +* Fri Jan 16 2015 Mat Booth - 0.10.0-8 +- Related: rhbz#1175105 - Rebuilt to regenerate requires/provides +- Fix unowned directories + * Sat May 17 2014 Sami Wagiaalla 0.10.0-7 - Build for DTS 3. - Install javadoc manually