[felix-framework] - Update to latest upstream version rhbz #895404. - No longer need to remove maven-compiler-plugin i

[mbooth]

commit 16f6fa285f43eafc38a569f719a6b75427361c2f
Author: Mat Booth <fedora at matbooth.co.uk>
Date:   Thu Feb 21 15:50:47 2013 +0000

    - Update to latest upstream version rhbz #895404.
    - No longer need to remove maven-compiler-plugin invocation.

 .gitignore                     |    1 +
 felix-framework-encoding.patch |   40 -----------------------------
 felix-framework.spec           |   55 ++++++++++++++++------------------------
 sources                        |    2 +-
 4 files changed, 24 insertions(+), 74 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 151afc5..6350376 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 org.apache.felix.framework-2.0.5-project.tar.gz
 /org.apache.felix.framework-4.0.1-source-release.tar.gz
 /org.apache.felix.framework-4.0.2-source-release.tar.gz
+/org.apache.felix.framework-4.2.0-source-release.tar.gz
diff --git a/felix-framework.spec b/felix-framework.spec
index 85517ea..e06aca0 100644
--- a/felix-framework.spec
+++ b/felix-framework.spec
@@ -4,41 +4,31 @@
 %global project felix
 %global bundle org.apache.felix.framework
 %global groupId org.apache.felix
-%global artifactId %{bundle}
 
 Name:           %{project}-framework
-Version:        4.0.2
-Release:        6%{?dist}
+Version:        4.2.0
+Release:        1%{?dist}
 Summary:        Apache Felix Framework
 
 Group:          Development/Libraries
 License:        ASL 2.0
 URL:            http://felix.apache.org
-Source0:        http://apache.miloslavbrada.cz//felix/%{bundle}-%{version}-source-release.tar.gz
-
-Patch0:         felix-framework-encoding.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-osgi-compendium
-BuildRequires:  felix-osgi-core
-BuildRequires:  maven-local
-BuildRequires:  maven-install-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
-BuildRequires:  maven-plugin-bundle
-BuildRequires:  apache-rat-plugin
-
-
-Requires:       felix-osgi-compendium
-Requires:       felix-osgi-core
-Requires:       java >= 1:1.6.0
+BuildRequires: java-devel >= 1:1.6.0
+BuildRequires: jpackage-utils
+BuildRequires: felix-osgi-compendium
+BuildRequires: felix-osgi-core
+BuildRequires: maven-local
+BuildRequires: maven-surefire-provider-junit4
+BuildRequires: apache-rat-plugin
+
+Requires: felix-osgi-compendium
+Requires: felix-osgi-core
+Requires: java >= 1:1.6.0
+Requires: jpackage-utils
 
 %description
 Apache Felix Framework Interfaces and Classes.
@@ -51,19 +41,15 @@ Requires:       jpackage-utils
 %description javadoc
 API documentation for %{name}.
 
-%global POM %{_mavenpomdir}/JPP.%{project}-%{bundle}.pom
-
 %prep
 %setup -q -n %{bundle}-%{version}
-%patch0 -p1
-%pom_remove_plugin :maven-compiler-plugin
 
 %build
 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
 
@@ -74,9 +60,8 @@ install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{project}-%{bundle}.pom
 %add_maven_depmap JPP.%{project}-%{bundle}.pom %{project}/%{bundle}.jar
 
 # javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
-%__cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
-
+install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
 
 %files
 %doc LICENSE NOTICE
@@ -89,6 +74,10 @@ install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
 %{_javadocdir}/%{name}
 
 %changelog
+* Thu Feb 21 2013 Mat Booth <fedora at matbooth.co.uk> - 4.2.0-1
+- Update to latest upstream version rhbz #895404.
+- No longer need to remove maven-compiler-plugin invocation.
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.2-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index 39b1fc4..dcf3270 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-85b423f09186dd2d94f96b301fc72952  org.apache.felix.framework-4.0.2-source-release.tar.gz
+10c1c7cfb668dc93cbab3d942590b1c9  org.apache.felix.framework-4.2.0-source-release.tar.gz