From 0a29f985f5787ffcf8ce0490a73cdad482c1e8da Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
Date: Nov 25 2010 16:01:47 +0000
Subject: Fix pom filenames (Resolves rhbz#655792)


- Add several packages to Requires
- Remove versioned jars and javadocs
- Remove clean section and rm -rf in the beginning of %install

---

diff --git a/cal10n.spec b/cal10n.spec
index f7985d9..f5280fc 100644
--- a/cal10n.spec
+++ b/cal10n.spec
@@ -1,6 +1,6 @@
 Name:           cal10n
 Version:        0.7.4
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Compiler assisted localization library (CAL10N)
 
 Group:          Development/Libraries
@@ -28,6 +28,7 @@ BuildRequires: maven-site-plugin
 BuildRequires: maven-surefire-maven-plugin
 BuildRequires: maven-surefire-provider-junit4
 
+Requires:      java
 Requires(post):   jpackage-utils >= 1.7.3
 Requires(postun): jpackage-utils >= 1.7.3
 
@@ -46,14 +47,16 @@ Features:
 %package javadoc
 Group:          Documentation
 Summary:        Javadoc for %{name}
+Requires:       jpackage-utils
 
 %description javadoc
 API documentation for %{name}.
 
 %package -n maven-cal10n-plugin
-Summary: CAL10N maven plugin
-Group: Development/Tools
-Requires: maven2
+Summary:    CAL10N maven plugin
+Group:      Development/Tools
+Requires:   maven2
+Requires:   %{name} = %{version}-%{release}
 
 %description -n maven-cal10n-plugin
 Maven plugin verifying that the codes defined in
@@ -72,17 +75,14 @@ mvn-jpp \
         install javadoc:aggregate
 
 %install
-rm -rf %{buildroot}
 
 # jars
 install -d -m 0755 %{buildroot}%{_javadir}/%{name}
 install -m 644 cal10n-api/target/cal10n-api-%{version}.jar \
-        %{buildroot}%{_javadir}/%{name}/cal10n-api-%{version}.jar
+        %{buildroot}%{_javadir}/%{name}/cal10n-api.jar
 install -m 644 maven-cal10n-plugin/target/maven-cal10n-plugin-%{version}.jar \
-        %{buildroot}%{_javadir}/%{name}/maven-cal10n-plugin-%{version}.jar
+        %{buildroot}%{_javadir}/%{name}/maven-cal10n-plugin.jar
 
-(cd %{buildroot}%{_javadir}/%{name} && for jar in *-%{version}*; \
-    do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
 
 %add_to_maven_depmap ch.qos.cal10n cal10n-parent %{version} JPP/%{name} cal10n-parent
 %add_to_maven_depmap ch.qos.cal10n cal10n-api %{version} JPP/%{name} cal10n-api
@@ -91,17 +91,15 @@ install -m 644 maven-cal10n-plugin/target/maven-cal10n-plugin-%{version}.jar \
 # poms
 install -d -m 755 %{buildroot}%{_mavenpomdir}
 install -pm 644 pom.xml \
-    %{buildroot}%{_mavenpomdir}/JPP.%{name}-parent.pom
+    %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}-parent.pom
 install -pm 644 cal10n-api/pom.xml \
-    %{buildroot}%{_mavenpomdir}/JPP.%{name}-api.pom
+    %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}-api.pom
 install -pm 644 maven-cal10n-plugin/pom.xml \
     %{buildroot}%{_mavenpomdir}/JPP.%{name}-maven-cal10n-plugin.pom
 
 # javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
-ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
-rm -rf target/site/api*
+install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
 
 %post
 %update_maven_depmap
@@ -109,28 +107,35 @@ rm -rf target/site/api*
 %postun
 %update_maven_depmap
 
-%clean
-%{__rm} -rf %{buildroot}
+%pre javadoc
+# workaround for rpm bug 646523
+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
+
 
 %files
 %defattr(-,root,root,-)
 %dir %{_javadir}/%{name}
 %{_javadir}/%{name}/%{name}*.jar
-%{_datadir}/maven2/poms/JPP.%{name}-parent*
-%{_datadir}/maven2/poms/JPP.%{name}-api*
-%{_mavendepmapfragdir}/*
+%{_mavenpomdir}/JPP.%{name}-%{name}-parent*
+%{_mavenpomdir}/JPP.%{name}-%{name}-api*
+%{_mavendepmapfragdir}/%{name}
 
 %files -n maven-cal10n-plugin
 %defattr(-,root,root,-)
 %{_javadir}/%{name}/maven*.jar
-%{_datadir}/maven2/poms/JPP.%{name}-maven*
+%{_mavenpomdir}/JPP.%{name}-maven*
 
 %files javadoc
 %defattr(-,root,root,-)
-%{_javadocdir}/%{name}-%{version}
 %{_javadocdir}/%{name}
 
 %changelog
+* Thu Nov 25 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0.7.4-4
+- Fix pom filenames (Resolves rhbz#655792)
+- Add several packages to Requires
+- Remove versioned jars and javadocs
+
 * Wed Sep 8 2010 Alexander Kurtakov <akurtako@redhat.com> 0.7.4-3
 - Fix build failure (javadoc:aggregate).