diff --git a/SPECS/felix-gogo-command.spec b/SPECS/felix-gogo-command.spec
index 18d30e2..0dc343b 100644
--- a/SPECS/felix-gogo-command.spec
+++ b/SPECS/felix-gogo-command.spec
@@ -5,11 +5,11 @@
 
 %{!?scl:%global pkg_name %{name}}
 %{?scl:%scl_package %{project}-gogo-command}
-%{!?maven_scl:%global maven_scl_prefix %{nil}}
+%{?java_common_find_provides_and_requires}
 
 Name:           %{?scl_prefix}%{project}-gogo-command
 Version:        0.12.0
-Release:        9%{?dist}
+Release:        12%{?dist}
 Summary:        Apache Felix Gogo Command
 
 Group:          Development/Libraries
@@ -22,30 +22,13 @@ Patch1:         java7compatibility.patch
 
 BuildArch:      noarch
 
-BuildRequires:  java
 # This is to ensure we get OpenJDK and not GCJ
 BuildRequires:  java-1.7.0-openjdk-devel >= 1:1.7.0
-BuildRequires:  %{maven_scl_prefix}maven-local
-BuildRequires:  %{maven_scl_prefix}maven-dependency-plugin
-BuildRequires:  %{maven_scl_prefix}maven-surefire-plugin
-BuildRequires:  %{maven_scl_prefix}maven-surefire-provider-junit
-BuildRequires:  %{maven_scl_prefix}jpackage-utils
-BuildRequires:  %{maven_scl_prefix}maven-install-plugin
-#BuildRequires:  mockito
-
-BuildRequires:  %{maven_scl_prefix}felix-osgi-core
-BuildRequires:  %{maven_scl_prefix}felix-framework
-BuildRequires:  %{maven_scl_prefix}felix-osgi-compendium
+BuildRequires:  %{?scl_prefix_java_common}maven-local
+BuildRequires:  %{?scl_prefix_maven}maven-dependency-plugin
+
 BuildRequires:  %{?scl_prefix}felix-gogo-runtime
 BuildRequires:  %{?scl_prefix}felix-gogo-parent
-BuildRequires:   %{maven_scl_prefix}felix-bundlerepository
-%{?scl:BuildRequires:	  %{?scl_prefix}build}
-
-Requires:       felix-framework
-Requires:       felix-osgi-compendium
-Requires:       %{?scl_prefix}felix-gogo-runtime
-Requires:       felix-bundlerepository
-%{?scl:Requires: %scl_runtime}
 
 %description
 Provides basic shell commands for Gogo.
@@ -53,43 +36,45 @@ Provides basic shell commands for Gogo.
 %package javadoc
 Group:          Documentation
 Summary:        Javadoc for %{pkg_name}
-Requires:       jpackage-utils
 
 %description javadoc
 API documentation for %{pkg_name}.
 
-%global POM %{_mavenpomdir}/JPP.%{project}-%{bundle}.pom
-
 %prep
 %setup -q -n %{bundle}-%{version} 
 %patch0 -p1
 %patch1 -p1
 
 %build
-scl enable %{scl} - <<EOF
+scl enable %{scl_maven} %{scl} - <<"EOF"
+%pom_xpath_inject "pom:dependencies/pom:dependency[pom:artifactId[text()='org.osgi.compendium']]" "<scope>provided</scope>"
+%pom_xpath_inject "pom:dependencies/pom:dependency[pom:artifactId[text()='org.apache.felix.bundlerepository']]" "<scope>provided</scope>"
 %mvn_build
 EOF
 
 %install
-scl enable %{scl} - <<EOF
+scl enable %{scl_maven} %{scl} - <<"EOF"
 %mvn_install
 EOF
 
-jdir=target/site/apidocs
-install -dm755 %{buildroot}%{_javadocdir}/%{pkg_name}
-touch %{_builddir}/.mfiles-javadoc
-for f in `ls $jdir | grep -E "html|css"`; do
-  cp $jdir/$f %{buildroot}%{_javadocdir}/%{pkg_name}/;
-  echo %{_javadocdir}/%{pkg_name}/$f >> %{_builddir}/%{bundle}-%{version}/.mfiles-javadoc;
-done
-
 %files -f .mfiles
+%dir %{_javadir}/felix-gogo-command
+%dir %{_mavenpomdir}/felix-gogo-command
 %doc LICENSE
 
 %files javadoc -f .mfiles-javadoc
 %doc LICENSE
 
 %changelog
+* Fri Jan 16 2015 Mat Booth <mat.booth@redhat.com> - 0.12.0-12
+- Fix unowned directories
+
+* Fri Jan 16 2015 Mat Booth <mat.booth@redhat.com> - 0.12.0-11
+- Related: rhbz#1175105 - Rebuilt to regenerate requires/provides
+
+* Wed May 21 2014 Mat Booth <mat.booth@redhat.com> - 0.12.0-10
+- Removed R's that are only needed when running on a felix osgi runtime
+
 * Sat May 17 2014 Sami Wagiaalla <swagiaal@redhat.com> 0.12.0-9
 - Use pkg_name instead of name for javadoc location.