Update for latest guidelines

felix-utils.spec

@@ -1,15 +1,13 @@
-%global site_name org.apache.felix.utils
-%global grp_name  felix
+%global bundle org.apache.felix.utils
 
 Name:             felix-utils
 Version:          1.2.0
-Release:          2%{?dist}
+Release:          3%{?dist}
 Summary:          Utility classes for OSGi
 License:          ASL 2.0
 Group:            Development/Libraries
 URL:              http://felix.apache.org
-
-Source0:          http://archive.apache.org/dist/%{grp_name}/%{site_name}-%{version}-source-release.tar.gz
+Source0:          http://archive.apache.org/dist/felix/%{bundle}-%{version}-source-release.tar.gz
 
 BuildArch:        noarch
 
@@ -18,61 +16,48 @@ BuildRequires:    maven-local
 BuildRequires:    jpackage-utils
 BuildRequires:    felix-osgi-compendium
 BuildRequires:    felix-osgi-core
-BuildRequires:    maven-clean-plugin
 BuildRequires:    maven-surefire-provider-junit4
+BuildRequires:    mockito
 
-Requires:         jpackage-utils
 Requires:         java
-Requires:         felix-osgi-compendium
-Requires:         felix-osgi-core
 
 %description
 Utility classes for OSGi
 
 %package javadoc
-Summary:          API documentation for %{name}
 Group:            Documentation
-Requires:         jpackage-utils
+Summary:          API documentation for %{name}
 
 %description javadoc
 This package contains the API documentation for %{name}.
 
 %prep
-%setup -q -n %{site_name}-%{version}
+%setup -q -n %{bundle}-%{version}
 
 # Remove compiler plugin so default target of 1.5 is used
 %pom_remove_plugin :maven-compiler-plugin
 # Remove rat plugin that is not in Fedora
 %pom_remove_plugin org.codehaus.mojo:rat-maven-plugin
 
+%mvn_file :%{bundle} "felix/%{bundle}"
+
 %build
 # one of the tests fails in mock (local build is ok)
-mvn-rpmbuild install javadoc:aggregate -Dmaven.test.failure.ignore=true
+%mvn_build -- -Dmaven.test.failure.ignore=true
 
 %install
-# jars
-install -Dpm 644 target/%{site_name}-%{version}.jar %{buildroot}%{_javadir}/%{grp_name}/%{name}.jar
+%mvn_install
 
-# pom
-install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{grp_name}-%{name}.pom
-
-# javadoc
-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-
-%add_maven_depmap JPP.%{grp_name}-%{name}.pom %{grp_name}/%{name}.jar
-
-%files
+%files -f .mfiles
 %doc LICENSE NOTICE DEPENDENCIES
-%{_javadir}/%{grp_name}/%{name}.jar
-%{_mavenpomdir}/JPP.%{grp_name}-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
 
-%files javadoc
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE NOTICE
-%doc %{_javadocdir}/%{name}
 
 %changelog
+* Mon Aug 05 2013 Mat Booth <fedora@matbooth.co.uk> - 1.2.0-3
+- Update for latest guidelines
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
@@ -102,7 +87,7 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
 * Thu Oct 13 2011 Jaromir Capik <jcapik@redhat.com> - 1.1.0-3
 - osgi.org groupId patch removed (fixed in felix-osgi-* packages)
 
-* Wed Sep 08 2011 Jaromir Capik <jcapik@redhat.com> - 1.1.0-2
+* Thu Sep 08 2011 Jaromir Capik <jcapik@redhat.com> - 1.1.0-2
 - Moved to felix subdir
 - Minor spec file changes