[aries-util] fix rhbz#991990, switch to XMvn

[Marek Goldmann]

commit 03de89fcecc2366f0128f0a3dca09e8e40f313ee
Author: gil <puntogil at libero.it>
Date:   Thu Aug 8 04:34:12 2013 +0200

    fix rhbz#991990, switch to XMvn

 aries-util.spec |   76 +++++++++++++++++++------------------------------------
 1 files changed, 26 insertions(+), 50 deletions(-)
---
diff --git a/aries-util.spec b/aries-util.spec
index c2cdda6..0a25b6d 100644
--- a/aries-util.spec
+++ b/aries-util.spec
@@ -1,45 +1,27 @@
 Name:          aries-util
 Version:       0.4
-Release:       5%{?dist}
+Release:       6%{?dist}
 Summary:       Apache Aries Util
 License:       ASL 2.0
-Group:         Development/Libraries
 URL:           http://aries.apache.org/
-
 # svn export http://svn.apache.org/repos/asf/aries/tags/org.apache.aries.util-0.4/ aries-util-0.4
 # tar cafJ aries-util-0.4.tar.xz aries-util-0.4
-
 Source0:       %{name}-%{version}.tar.xz
-Patch0:        %{name}-%{version}-xml.patch
-Patch1:        %{name}-%{version}-java.patch
+Patch0:        %{name}-%{version}-java.patch
 
 BuildArch:     noarch
 
 BuildRequires: java-devel
-BuildRequires: jpackage-utils
 BuildRequires: maven-local
-BuildRequires: maven-compiler-plugin
-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: felix-osgi-compendium
-BuildRequires: felix-osgi-core
-
-Requires:      java
-Requires:      jpackage-utils
-Requires:      felix-osgi-compendium
-Requires:      felix-osgi-core
+BuildRequires: mvn(org.apache.felix:org.osgi.compendium)
+BuildRequires: mvn(org.apache.felix:org.osgi.core)
 
 %description
 This package contains the OSGi common util for Apache Aries.
 
 %package javadoc
-Summary:       Javadocs for %{name}
-Group:         Documentation
-Requires:      jpackage-utils
+Summary:       Javadoc for %{name}
 
 %description javadoc
 This package contains the API documentation for %{name}.
@@ -47,45 +29,39 @@ This package contains the API documentation for %{name}.
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1
-%patch1 -p1
+
+%pom_remove_parent
+%pom_xpath_inject "pom:project" "<groupId>org.apache.aries</groupId>"
+#%%pom_xpath_remove "pom:project/pom:packaging"
+%pom_xpath_set "pom:project/pom:packaging" jar
+%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:artifactId = 'org.osgi.compendium' ]/pom:groupId" org.apache.felix
+%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:artifactId = 'org.osgi.core' ]/pom:groupId" org.apache.felix
+%pom_remove_dep org.eclipse:osgi
 
 %build
+
+%mvn_file :org.apache.aries.util %{name}
 # test disabled because of missing dependency:
 # org.apache.aries.testsupport:org.apache.aries.testsupport.unit:jar
-mvn-rpmbuild \
-  -Dmaven.test.skip=true \
-  -Dproject.build.sourceEncoding=UTF-8 \
-  package javadoc:aggregate
+%mvn_build -f -- -Dproject.build.sourceEncoding=UTF-8
 
 %install
+%mvn_install
 
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-# jar
-install -pm 644 target/org.apache.aries.util-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-
-# pom
-install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
-
-# depmap
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-# javadoc
-cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-%files
+%files -f .mfiles
 %doc LICENSE NOTICE
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-%{_javadir}/*
 
-%files javadoc
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE NOTICE
-%{_javadocdir}/%{name}
 
 %changelog
+* Thu Aug 08 2013 gil cattaneo <puntogil at libero.it> 0.4-6
+- fix rhbz#991990
+- switch to XMvn
+- resolve some rpmlint problems
+- use pom macros
+- minor changes to adapt to current guideline
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild