[felix-main] Update for latest guidelines

[mbooth]

commit ec723842b52dd765f4a26580925bfabc9797b5e8
Author: Mat Booth <fedora at matbooth.co.uk>
Date:   Mon Aug 5 16:05:10 2013 +0100

    Update for latest guidelines

 felix-main.spec |   52 +++++++++++++++-------------------------------------
 1 files changed, 15 insertions(+), 37 deletions(-)
---
diff --git a/felix-main.spec b/felix-main.spec
index 45f38d3..735eb12 100644
--- a/felix-main.spec
+++ b/felix-main.spec
@@ -1,19 +1,13 @@
-# Prevent brp-java-repack-jars from being run.
-%define __jar_repack %{nil}
-
-%global project felix
 %global bundle org.apache.felix.main
-%global groupId org.apache.felix
 
-Name:    %{project}-main
+Name:    felix-main
 Version: 4.2.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Apache Felix Main
-
 Group:   Development/Libraries
 License: ASL 2.0
 URL:     http://felix.apache.org
-Source0: http://www.apache.org/dist/%{project}/%{bundle}-%{version}-source-release.tar.gz
+Source0: http://www.apache.org/dist/felix/%{bundle}-%{version}-source-release.tar.gz
 
 BuildArch: noarch
 
@@ -27,8 +21,6 @@ BuildRequires: felix-osgi-compendium
 BuildRequires: felix-osgi-core
 BuildRequires: felix-framework >= 4.2.0
 BuildRequires: maven-local
-BuildRequires: maven-clean-plugin
-BuildRequires: maven-install-plugin
 BuildRequires: maven-dependency-plugin
 BuildRequires: maven-surefire-provider-junit4
 BuildRequires: mockito
@@ -41,52 +33,38 @@ Requires: felix-osgi-compendium
 Requires: felix-osgi-core
 Requires: felix-framework >= 4.2.0
 Requires: java >= 1:1.6.0
-Requires: jpackage-utils
 
 %description
 Apache Felix Main Classes.
 
 %package javadoc
 Group:          Documentation
-Summary:        Javadoc for %{name}
-Requires:       jpackage-utils
+Summary:        API documentation for %{name}
 
 %description javadoc
-API documentation for %{name}.
+This package contains API documentation for %{name}.
 
 %prep
 %setup -q -n %{bundle}-%{version}
 
+%mvn_file :%{bundle} "felix/%{bundle}"
+
 %build
-mvn-rpmbuild install javadoc:aggregate
+%mvn_build
 
 %install
-# jars
-install -d -m 755 %{buildroot}%{_javadir}/%{project}
-install -m 644 target/%{bundle}-%{version}.jar \
-        %{buildroot}%{_javadir}/%{project}/%{bundle}.jar
-
-# poms
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{project}-%{bundle}.pom
+%mvn_install
 
-%add_maven_depmap JPP.%{project}-%{bundle}.pom %{project}/%{bundle}.jar
+%files -f .mfiles
+%doc LICENSE NOTICE DEPENDENCIES
 
-# javadoc
-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
-
-%files
-%doc LICENSE NOTICE
-%{_javadir}/%{project}/*
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-
-%files javadoc
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE NOTICE
-%{_javadocdir}/%{name}
 
 %changelog
+* Mon Aug 05 2013 Mat Booth <fedora at matbooth.co.uk> - 4.2.0-4
+- Update for latest guidelines
+
 * Sat Aug 03 2013 Mat Booth <fedora at matbooth.co.uk> - 4.2.0-3
 - Add missing BRs