[felix-osgi-compendium] Update for latest guidelines

[mbooth]

commit e1fbc582b8ac0a12fd3a6d00bacc4319f705e1f3
Author: Mat Booth <fedora at matbooth.co.uk>
Date:   Mon Aug 5 18:55:10 2013 +0100

    Update for latest guidelines

 felix-osgi-compendium.demap |   14 ----------
 felix-osgi-compendium.spec  |   60 +++++++++++-------------------------------
 2 files changed, 16 insertions(+), 58 deletions(-)
---
diff --git a/felix-osgi-compendium.spec b/felix-osgi-compendium.spec
index 1680134..8a64000 100644
--- a/felix-osgi-compendium.spec
+++ b/felix-osgi-compendium.spec
@@ -1,15 +1,9 @@
-# Prevent brp-java-repack-jars from being run.
-%define __jar_repack %{nil}
-
 %global bundle org.osgi.compendium
-%global felixdir %{_javadir}/felix
-%global POM %{_mavenpomdir}/JPP.felix-%{bundle}.pom
 
 Name:    felix-osgi-compendium
 Version: 1.4.0
-Release: 15%{?dist}
+Release: 16%{?dist}
 Summary: Felix OSGi R4 Compendium Bundle
-
 Group:   Development/Libraries
 License: ASL 2.0
 URL:     http://felix.apache.org
@@ -29,32 +23,23 @@ BuildArch:      noarch
 BuildRequires: java-devel >= 1:1.6.0
 BuildRequires: jpackage-utils
 BuildRequires: maven-local
-BuildRequires: maven-compiler-plugin
-BuildRequires: maven-install-plugin
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-javadoc-plugin
-BuildRequires: maven-resources-plugin
-BuildRequires: maven-plugin-bundle
 BuildRequires: maven-surefire-provider-junit4
 BuildRequires: felix-osgi-core
 BuildRequires: felix-osgi-foundation
 BuildRequires: tomcat-servlet-3.0-api
+BuildRequires: mockito
 
-Requires: felix-osgi-core
-Requires: felix-osgi-foundation
 Requires: java >= 1:1.6.0
-Requires: tomcat-servlet-3.0-api
 
 %description
 OSGi Service Platform Release 4 Compendium 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}
@@ -70,38 +55,25 @@ API documentation for %{name}.
 # add getResourceURL method
 %patch4 -p1
 
+%mvn_file :%{bundle} "felix/%{bundle}"
+%mvn_alias "org.apache.felix:%{bundle}" "org.osgi:%{bundle}"
+
 %build
-mvn-rpmbuild install javadoc:javadoc
+%mvn_build -- -Drat.numUnapprovedLicenses=100
 
 %install
-# jar
-install -pD -T -m 644 target/%{bundle}-%{version}.jar \
-  %{buildroot}%{felixdir}/%{bundle}.jar
-
-# pom
-install -pD -T -m 644 pom.xml %{buildroot}%{POM}
-%add_maven_depmap JPP.felix-%{bundle}.pom felix/%{bundle}.jar -a "org.osgi:%{bundle}"
+%mvn_install
 
-# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
-%__cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
+%files -f .mfiles
+%doc LICENSE NOTICE
 
-%pre javadoc
-# workaround for rpm bug, can be removed in F-17
-[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
-rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
-
-%files
-%doc LICENSE
-%{_mavendepmapfragdir}/%{name}
-%{felixdir}
-%{POM}
-
-%files javadoc
-%doc LICENSE
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
+%doc LICENSE NOTICE
 
 %changelog
+* Mon Aug 05 2013 Mat Booth <fedora at matbooth.co.uk> - 1.4.0-16
+- Update for latest guidelines
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.0-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild