From 2eaa6f953c1708e244aec4d3ae7cc1888ee24537 Mon Sep 17 00:00:00 2001
From: Michal Srb <msrb@redhat.com>
Date: Aug 06 2013 07:10:45 +0000
Subject: Adapt to current guidelines


- Install NOTICE file with javadoc subpackage

---

diff --git a/felix-gogo-runtime.spec b/felix-gogo-runtime.spec
index 081bf77..8a26283 100644
--- a/felix-gogo-runtime.spec
+++ b/felix-gogo-runtime.spec
@@ -4,40 +4,39 @@
 %{!?scl:%global pkg_name %{name}}
 %{?scl:%scl_package %{project}-gogo-runtime}
 
-Name:            %{?scl_prefix}%{project}-gogo-runtime
-Version:          0.10.0
-Release:          9%{?dist}
-Summary:          Community OSGi R4 Service Platform Implementation - Basic Commands
-Group:            Development/Tools
-License:          ASL 2.0
-URL:              http://felix.apache.org/site/apache-felix-gogo.html
+Name:           %{?scl_prefix}%{project}-gogo-runtime
+Version:        0.10.0
+Release:        10%{?dist}
+Summary:        Community OSGi R4 Service Platform Implementation - Basic Commands
+License:        ASL 2.0
+URL:            http://felix.apache.org/site/apache-felix-gogo.html
 
-Source0:          http://www.mirrorservice.org/sites/ftp.apache.org//felix/org.apache.felix.gogo.runtime-0.10.0-project.tar.gz 
+Source0:        http://www.mirrorservice.org/sites/ftp.apache.org//felix/org.apache.felix.gogo.runtime-0.10.0-project.tar.gz 
 
 # Typecast an Event constructor call with java.util.Properties to 
 # java.util.Dictionary because the call to the constructor with Properties
 # was ambiguous.
-Patch1:           %{pkg_name}-dictionary.patch
+Patch1:         %{pkg_name}-dictionary.patch
 # Changed path to DEPENDENCIES, LICENSE and NOTICE from META-INF to root dir
-Patch2:           %{pkg_name}-bundle-resources.patch
+Patch2:         %{pkg_name}-bundle-resources.patch
 # Removed failing thread IO test
-Patch3:           %{pkg_name}-deleted-io-test.patch
+Patch3:         %{pkg_name}-deleted-io-test.patch
 # Removed relativePath to parent pom
-Patch4:           %{pkg_name}-parent.patch
+Patch4:         %{pkg_name}-parent.patch
 
-BuildArch:        noarch
+BuildArch:      noarch
 
-BuildRequires:    java
-BuildRequires:    jpackage-utils
-BuildRequires:    maven-local
-BuildRequires:    felix-osgi-core
-BuildRequires:    felix-osgi-compendium
-BuildRequires:    maven-surefire-provider-junit4
-BuildRequires:    %{?scl_prefix}felix-gogo-parent
+BuildRequires:  maven-local
+BuildRequires:  mvn(junit:junit)
+BuildRequires:  mvn(org.apache.felix:gogo-parent)
+BuildRequires:  mvn(org.easymock:easymock)
+BuildRequires:  mvn(org.mockito:mockito-all)
+BuildRequires:  mvn(org.osgi:org.osgi.compendium)
+BuildRequires:  mvn(org.osgi:org.osgi.core)
+
+BuildRequires:  %{?scl_prefix}felix-gogo-parent
 %{?scl:BuildRequires:	  %{?scl_prefix}build}
 
-Requires:         java 
-Requires:         jpackage-utils
 %{?scl:Requires: %scl_runtime}
 
 %description
@@ -50,9 +49,7 @@ OSGi technology combines aspects of these aforementioned principles to define a
 dynamic service deployment framework that is amenable to remote management.
 
 %package javadoc
-Group:            Documentation
-Summary:          Javadoc for %{name}
-Requires:         jpackage-utils
+Summary:        Javadoc for %{name}
 
 %description javadoc
 This package contains the API documentation for %{name}.
@@ -64,36 +61,28 @@ This package contains the API documentation for %{name}.
 %patch3 -p1
 %patch4 -p1
 
+%mvn_file : %{project}/%{name}
+
 %build
 %{?scl:%scl_maven_opts}
-mvn-rpmbuild install javadoc:aggregate 
+%mvn_build
 
 %install
-# jars
-install -d -m 0755 %{buildroot}%{_javadir}/%{project}
-install -pm 644 target/%{bundle}-%{version}.jar %{buildroot}%{_javadir}/%{project}/%{bundle}.jar
-
-# pom
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{project}-%{bundle}.pom
-%add_maven_depmap JPP.%{project}-%{bundle}.pom %{project}/%{bundle}.jar
+%mvn_install
 
-# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{pkg_name}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{pkg_name}
 
-
-%files
+%files -f .mfiles
+%dir %{_javadir}/%{project}
 %doc DEPENDENCIES LICENSE NOTICE 
-%{_javadir}/*
-%{_mavenpomdir}/JPP.%{project}-%{bundle}.pom
-%{_mavendepmapfragdir}/%{name}
 
-%files javadoc
-%doc LICENSE
-%{_javadocdir}/%{pkg_name}
+%files javadoc -f .mfiles-javadoc
+%doc LICENSE NOTICE
 
 %changelog
+* Tue Aug 06 2013 Michal Srb <msrb@redhat.com> - 0.10.0-10
+- Adapt to current guidelines
+- Install NOTICE file with javadoc subpackage
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10.0-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild