[felix-main] - Update to latest upstream version. - Update spec to newer guidelines rhbz #810215. - Fix FTBFS fol

[mbooth]

commit d6e60c0bce078c41f16c8085b5da6460c77fc2a3
Author: Mat Booth <fedora at matbooth.co.uk>
Date:   Thu Feb 21 15:33:43 2013 +0000

    - Update to latest upstream version.
    - Update spec to newer guidelines rhbz #810215.
    - Fix FTBFS following mass rebuild.

 .gitignore                                |    1 +
 felix-main.spec                           |   96 ++++++++++------------------
 org.apache.felix.main-2.0.5~pom.xml.patch |   62 ------------------
 sources                                   |    2 +-
 4 files changed, 36 insertions(+), 125 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a92071e..928a64d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 org.apache.felix.main-2.0.5-project.tar.gz
+/org.apache.felix.main-4.2.0-source-release.tar.gz
diff --git a/felix-main.spec b/felix-main.spec
index 5824c83..a5ad130 100644
--- a/felix-main.spec
+++ b/felix-main.spec
@@ -4,54 +4,41 @@
 %global project felix
 %global bundle org.apache.felix.main
 %global groupId org.apache.felix
-%global artifactId %{bundle}
 
 Name:    %{project}-main
-Version: 2.0.5
-Release: 10%{?dist}
+Version: 4.2.0
+Release: 1%{?dist}
 Summary: Apache Felix Main
 
 Group:   Development/Libraries
 License: ASL 2.0
 URL:     http://felix.apache.org
-Source0: http://www.apache.org/dist/felix/%{bundle}-%{version}-project.tar.gz
-
-# TODO check availability and use original artifacts:
-# - org.apache.felix.shell https://bugzilla.redhat.com/show_bug.cgi?id=615869
-Patch0: %{bundle}-%{version}~pom.xml.patch
+Source0: http://www.apache.org/dist/%{project}/%{bundle}-%{version}-source-release.tar.gz
 
 BuildArch: noarch
 
 BuildRequires: java-devel >= 1:1.6.0
 BuildRequires: jpackage-utils
-BuildRequires: felix-parent
+BuildRequires: felix-bundlerepository
+BuildRequires: felix-gogo-command
+BuildRequires: felix-gogo-runtime
+BuildRequires: felix-gogo-shell
 BuildRequires: felix-osgi-compendium
 BuildRequires: felix-osgi-core
-BuildRequires: felix-framework
-BuildRequires: maven2
-BuildRequires:    maven-antrun-plugin
-BuildRequires:    maven-compiler-plugin
-BuildRequires:    maven-dependency-plugin
-BuildRequires:    maven-install-plugin
-BuildRequires:    maven-invoker-plugin
-BuildRequires:    maven-jar-plugin
-BuildRequires:    maven-javadoc-plugin
-BuildRequires:    maven-release-plugin
-BuildRequires:    maven-resources-plugin
-BuildRequires:    maven-surefire-plugin
-BuildRequires:    maven-surefire-provider-junit4
-# TODO check availability and use new names
-#BuildRequires:    maven-bundle-plugin
-# instead of
-BuildRequires:    maven-plugin-bundle
-
+BuildRequires: felix-framework >= 4.2.0
+BuildRequires: maven-local
+BuildRequires: maven-dependency-plugin
+BuildRequires: maven-surefire-provider-junit4
+
+Requires: felix-bundlerepository
+Requires: felix-gogo-command
+Requires: felix-gogo-runtime
+Requires: felix-gogo-shell
 Requires: felix-osgi-compendium
 Requires: felix-osgi-core
-Requires: felix-framework
+Requires: felix-framework >= 4.2.0
 Requires: java >= 1:1.6.0
-
-Requires(post):   jpackage-utils
-Requires(postun): jpackage-utils
+Requires: jpackage-utils
 
 %description
 Apache Felix Main Classes.
@@ -64,59 +51,44 @@ Requires:       jpackage-utils
 %description javadoc
 API documentation for %{name}.
 
-%global POM %{_mavenpomdir}/JPP.%{project}-%{bundle}.pom
-
 %prep
 %setup -q -n %{bundle}-%{version}
-%patch0 -p1 -b .sav
 
 %build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-%__mkdir_p $MAVEN_REPO_LOCAL
-mvn-jpp -e \
-        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-        install javadoc:javadoc
+mvn-rpmbuild install javadoc:aggregate
 
 %install
 # jars
-install -d -m 0755 %{buildroot}%{_javadir}/%{project}
+install -d -m 755 %{buildroot}%{_javadir}/%{project}
 install -m 644 target/%{bundle}-%{version}.jar \
         %{buildroot}%{_javadir}/%{project}/%{bundle}.jar
 
-%add_to_maven_depmap %{groupId} %{artifactId} %{version} JPP/%{project} %{bundle}
-
 # poms
 install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{POM}
+install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{project}-%{bundle}.pom
 
-# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
-%__cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
+%add_maven_depmap JPP.%{project}-%{bundle}.pom %{project}/%{bundle}.jar
 
-%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} || :
+# javadoc
+install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
 
 %files
-%defattr(-,root,root,-)
+%doc LICENSE NOTICE
 %{_javadir}/%{project}/*
-%{POM}
-%config(noreplace) %{_mavendepmapfragdir}/%{name}
-%doc LICENSE
+%{_mavenpomdir}/*
+%{_mavendepmapfragdir}/*
 
 %files javadoc
-%defattr(-,root,root,-)
+%doc LICENSE NOTICE
 %{_javadocdir}/%{name}
-%doc LICENSE
 
 %changelog
+* Thu Feb 21 2013 Mat Booth <fedora at matbooth.co.uk> - 4.2.0-1
+- Update to latest upstream version.
+- Update spec to newer guidelines rhbz #810215.
+- Fix FTBFS following mass rebuild.
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.5-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index 06ae3ce..77f99bf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7df69f4690da83f7ba7e72383ab322fe  org.apache.felix.main-2.0.5-project.tar.gz
+7bc0c5fa8a0d4d8177c112bc5b98e79e  org.apache.felix.main-4.2.0-source-release.tar.gz