From 361146686efa98693b9ecc8e4575980e1955b20d Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
Date: Nov 25 2010 11:43:59 +0000
Subject: Fix pom file names and add_to_maven_depmap calls (Resolves rhbz#655790)


---

diff --git a/apache-resource-bundles.spec b/apache-resource-bundles.spec
index 4d494af..3cdf5e2 100644
--- a/apache-resource-bundles.spec
+++ b/apache-resource-bundles.spec
@@ -4,7 +4,7 @@
 
 Name:		apache-resource-bundles
 Version:	2
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Apache Resource Bundles
 
 Group:		Development/Libraries
@@ -97,8 +97,8 @@ pushd apache-jar-resource-bundle
 install -m 644 \
 	target/apache-jar-resource-bundle-%{jar_version}.jar \
 	$RPM_BUILD_ROOT%{_javadir}/%{name}/jar-%{jar_version}.jar
-cp pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-apache-jar-resource-bundle.pom
-%add_to_maven_depmap org.apache apache-jar-resource-bundle %{jar_version} JPP %{name}/jar
+cp pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-jar.pom
+%add_to_maven_depmap org.apache apache-jar-resource-bundle %{jar_version} JPP/%{name} jar
 popd
 
 # license-header
@@ -106,8 +106,8 @@ pushd apache-license-header-resource-bundle
 install -m 644 \
 	target/apache-license-header-resource-bundle-%{lh_version}.jar \
 	$RPM_BUILD_ROOT%{_javadir}/%{name}/license-header-%{lh_version}.jar
-cp pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-apache-license-header-resource-bundle.pom
-%add_to_maven_depmap org.apache apache-license-header-resource-bundle %{lh_version} JPP %{name}/license-header
+cp pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-license-header.pom
+%add_to_maven_depmap org.apache apache-license-header-resource-bundle %{lh_version} JPP/%{name} license-header
 popd
 
 # incubator-disclaimer
@@ -115,8 +115,8 @@ pushd apache-incubator-disclaimer-resource-bundle
 install -m 644 \
 	target/apache-incubator-disclaimer-resource-bundle-%{id_version}.jar \
 	$RPM_BUILD_ROOT%{_javadir}/%{name}/incubator-disclaimer-%{id_version}.jar
-cp pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-apache-incubator-disclaimer-resource-bundle.pom
-%add_to_maven_depmap org.apache apache-incubator-disclaimer-resource-bundle %{id_version} JPP %{name}/incubator-disclaimer
+cp pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-incubator-disclaimer.pom
+%add_to_maven_depmap org.apache apache-incubator-disclaimer-resource-bundle %{id_version} JPP/%{name} incubator-disclaimer
 popd
 
 # Unversioned jars
@@ -148,6 +148,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Nov 25 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 2-5
+- Fix pom file names and add_to_maven_depmap calls (Resolves rhbz#655790)
+
 * Wed Sep 8 2010 Alexander Kurtakov <akurtako@redhat.com> 2-4
 - Add maven-site-plugin BR.
 - Use newer names of maven plugins.