[felix-shell/f19] Update to latest upstream version rhbz #895405.

[mbooth]

commit 8586bdf10ee39506d1c0112f790b23e95c591ab4
Author: Mat Booth <fedora at matbooth.co.uk>
Date:   Tue Apr 16 17:58:59 2013 +0100

    Update to latest upstream version rhbz #895405.
    
    - Enable tests

 .gitignore            |    1 +
 felix-shell-pom.patch |   39 ---------------------------------------
 felix-shell.spec      |   37 ++++++++++++++++++++++---------------
 sources               |    2 +-
 4 files changed, 24 insertions(+), 55 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 24681e2..b086150 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /org.apache.felix.shell-1.4.2-project.tar.gz
+/org.apache.felix.shell-1.4.3-source-release.tar.gz
diff --git a/felix-shell.spec b/felix-shell.spec
index 0e9b443..61064df 100644
--- a/felix-shell.spec
+++ b/felix-shell.spec
@@ -1,15 +1,15 @@
+%global project felix
 %global bundle org.apache.felix.shell
-Name:           felix-shell
-Version:        1.4.2
-Release:        9%{?dist}
+
+Name:           %{project}-shell
+Version:        1.4.3
+Release:        1%{?dist}
 Summary:        Apache Felix Shell Service
 
 Group:          Development/Libraries
 License:        ASL 2.0
 URL:            http://felix.apache.org
-Source0:        http://www.picvi.com/external/apache/felix/org.apache.felix.shell-1.4.2-project.tar.gz
-#Fixed org.osgi.core and org.osgi.compendium's groupId
-Patch0:        felix-shell-pom.patch
+Source0:        http://archive.apache.org/dist/%{project}/%{bundle}-%{version}-source-release.tar.gz
 
 BuildArch: noarch
 
@@ -18,6 +18,7 @@ BuildRequires: jpackage-utils
 BuildRequires: maven-local
 BuildRequires: felix-osgi-core
 BuildRequires: felix-osgi-compendium
+BuildRequires: maven-clean-plugin
 BuildRequires: maven-plugin-bundle
 BuildRequires: felix-parent
 
@@ -41,20 +42,22 @@ API documentation for %{name}.
 
 %prep
 %setup -q -n %{bundle}-%{version}
-%patch0 -p0
+
+%pom_remove_plugin org.codehaus.mojo:rat-maven-plugin
 
 %build
-mvn-rpmbuild -e -Dmaven.test.skip=true install javadoc:javadoc
+mvn-rpmbuild install javadoc:aggregate
 
 %install
 # jar
-install -d -m 755 %{buildroot}%{_javadir}/felix
-install -Dpm 644 target/%{bundle}-%{version}.jar   %{buildroot}%{_javadir}/felix/%{name}.jar
+install -d -m 755 %{buildroot}%{_javadir}/%{project}
+install -Dpm 644 target/%{bundle}-%{version}.jar \
+        %{buildroot}%{_javadir}/%{project}/%{bundle}.jar
 
 # pom
 install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.felix-%{name}.pom
-%add_maven_depmap JPP.felix-%{name}.pom felix/%{name}.jar
+install -Dpm 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}
@@ -67,8 +70,8 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 
 %files
 %doc LICENSE NOTICE
-%{_javadir}/felix/*
-%{_mavenpomdir}/JPP.felix-%{name}.pom
+%{_javadir}/%{project}/*
+%{_mavenpomdir}/JPP.%{project}-%{bundle}.pom
 %{_mavendepmapfragdir}/*
 
 %files javadoc
@@ -76,6 +79,10 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 %{_javadocdir}/%{name}
 
 %changelog
+* Mon Apr 15 2013 Mat Booth <fedora at matbooth.co.uk> - 1.4.3-1
+- Update to latest upstream version rhbz #895405.
+- Enable tests
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.2-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
@@ -105,4 +112,4 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 - Fix directory that owned by other package in files section
 
 * Fri Jun 25 2010 Hui Wang <huwang at redhat.com> - 1.4.2-1
-- Initial version of the package
\ No newline at end of file
+- Initial version of the package
diff --git a/sources b/sources
index bef9133..d690ec3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-af6a5ee11fb1c5ae1e1905a3bb53f40a  org.apache.felix.shell-1.4.2-project.tar.gz
+563de2ba250e9a95a32353288a004410  org.apache.felix.shell-1.4.3-source-release.tar.gz