From 09997e34f1cb234c76338c2d2e2d07b0ce04385b Mon Sep 17 00:00:00 2001
From: Mat Booth <fedora@matbooth.co.uk>
Date: Aug 05 2013 16:57:07 +0000
Subject: Update for latest guidelines


---

diff --git a/felix-osgi-core.spec b/felix-osgi-core.spec
index 5361eb1..f74e6aa 100644
--- a/felix-osgi-core.spec
+++ b/felix-osgi-core.spec
@@ -2,9 +2,8 @@
 
 Name:    felix-osgi-core
 Version: 1.4.0
-Release: 13%{?dist}
+Release: 14%{?dist}
 Summary: Felix OSGi R4 Core Bundle
-
 Group:   Development/Libraries
 License: ASL 2.0
 URL:     http://felix.apache.org/site/apache-felix-osgi-core.html
@@ -13,10 +12,11 @@ Source0: http://www.apache.org/dist/felix/%{bundle}-%{version}-project.tar.gz
 BuildArch: noarch
 
 BuildRequires: java-devel
+BuildRequires: jpackage-utils
 BuildRequires: maven-local
 BuildRequires: felix-parent
 BuildRequires: maven-surefire-provider-junit4
-BuildRequires: jpackage-utils
+BuildRequires: mockito
 
 Requires: java
 
@@ -25,45 +25,34 @@ OSGi Service Platform Release 4 Core Interfaces and 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}"
+%mvn_alias "org.apache.felix:%{bundle}" "org.osgi:%{bundle}"
+
 %build
 export LC_ALL=en_US.UTF-8
-mvn-rpmbuild package javadoc:aggregate
+%mvn_build -- -Drat.numUnapprovedLicenses=50
 
 %install
-# jars
-install -d -m 0755 %{buildroot}%{_javadir}/felix
-install -m 644 target/%{bundle}-%{version}.jar \
-        %{buildroot}%{_javadir}/felix/%{bundle}.jar
+%mvn_install
 
-# poms
-install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.felix-%{bundle}.pom
+%files -f .mfiles
+%doc LICENSE NOTICE
 
-# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
-%__cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
-
-%add_maven_depmap -a "org.osgi:%{bundle}" JPP.felix-%{bundle}.pom felix/%{bundle}.jar
-
-%files
-%doc LICENSE
-%{_javadir}/felix
-%{_mavenpomdir}/JPP.felix-%{bundle}.pom
-%{_mavendepmapfragdir}/%{name}
-
-%files javadoc
-%doc LICENSE
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
+%doc LICENSE NOTICE
 
 %changelog
+* Mon Aug 05 2013 Mat Booth <fedora@matbooth.co.uk> - 1.4.0-14
+- Update for latest guidelines
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.0-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild