From 11c06572d4025f6c8f46ed2dab9d8d1eecaebb08 Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
Date: Nov 26 2010 13:48:49 +0000
Subject: Fix pom filenames (Resolves rhbz#655797)


Also:
- Make few tweaks according to new guidelines
- Make jar unversioned

---

diff --git a/emma.spec b/emma.spec
index 141d2c8..0eb2285 100644
--- a/emma.spec
+++ b/emma.spec
@@ -28,12 +28,12 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define shortver 2.0
+%global shortver 2.0
 
 Summary:        Code Coverage Tool
 Name:           emma
 Version:        %{shortver}.5312
-Release:        5%{?dist}
+Release:        6%{?dist}
 Epoch:          0
 Group:          Development/Tools
 License:        CPL
@@ -70,7 +70,6 @@ Requires(post):    jpackage-utils >= 0:1.7.5-1jpp.3
 Requires(postun):  jpackage-utils >= 0:1.7.5-1jpp.3
 
 BuildArch:      noarch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
 EMMA is an open-source toolkit for measuring and reporting Java
@@ -82,6 +81,7 @@ work fast and iterative.
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Documentation
+Requires:       jpackage-utils
 
 %description javadoc
 %{summary}.
@@ -109,28 +109,24 @@ ant -Dbuild.compiler=modern build javadoc
 rm -rf $RPM_BUILD_ROOT
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
 install -m 644 dist/%{name}.jar \
-               $RPM_BUILD_ROOT%{_javadir}/%{name}-%{shortver}.jar
+               $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 install -m 644 dist/%{name}_ant.jar \
-               $RPM_BUILD_ROOT%{_javadir}/%{name}_ant-%{shortver}.jar
+               $RPM_BUILD_ROOT%{_javadir}/%{name}_ant.jar
 %add_to_maven_depmap emma emma %{version} JPP %{name}
 %add_to_maven_depmap emma emma_ant %{version} JPP %{name}_ant
 
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{shortver}.jar; do ln -sf ${jar} `echo $jar| sed  "s|-%{shortver}||g"`; done)
 
 # poms
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
 install -pm 644 %{SOURCE1} \
-    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}.pom
+    $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
 install -pm 644 %{SOURCE2} \
-    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}_ant.pom
+    $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}_ant.pom
 
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 cp -pr out/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post
 %update_maven_depmap
 
@@ -141,7 +137,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc cpl-v10.html
 %{_javadir}/*
-%{_mavenpomdir}/JPP.%{name}*
+%{_mavenpomdir}/JPP-%{name}*
 %{_mavendepmapfragdir}/%{name}
 
 %files javadoc
@@ -150,6 +146,11 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_javadocdir}/%{name}*
 
 %changelog
+* Fri Nov 26 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:2.0.5312-6
+- Fix pom filenames (Resolves rhbz#655797)
+- Make few tweaks according to new guidelines
+- Make jar unversioned
+
 * Mon Jul 12 2010 Andrew Overholt <overholt@redhat.com> 0:2.0.5312-5
 - Ensure license is also in -javadoc package