From bfa0c267e8bd8ec6a8e76ba927e2156bd2104bc7 Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
Date: Dec 06 2010 16:43:59 +0000
Subject: Fix pom filename (Resolves rhbz#655827)


- Add depmap for main pom file
- Fixes according to new guidelines (versionless jars, javadocs)

---

diff --git a/xbean.spec b/xbean.spec
index 424b5d3..a8d2ee1 100644
--- a/xbean.spec
+++ b/xbean.spec
@@ -2,7 +2,7 @@ Name:           xbean
 Version:        3.7
 BuildArch:      noarch
 
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Java plugin based web server
 
 Group:          Development/Libraries
@@ -16,8 +16,6 @@ URL:            http://geronimo.apache.org/xbean/
 Source0:        xbean-%{version}.tar.xz
 Source1:        xbean.depmap
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 Patch0:         pom-%{version}.patch
 
 BuildRequires:  java-devel
@@ -85,37 +83,29 @@ mvn-jpp -e \
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 # for every module we want to be built
 for sub in reflect naming classpath; do
     # install jar
     install -Dpm 644 %{name}-${sub}/target/%{name}-${sub}-%{version}.jar \
-            $RPM_BUILD_ROOT/%{_javadir}/xbean/%{name}-${sub}-%{version}.jar;
+            $RPM_BUILD_ROOT/%{_javadir}/xbean/%{name}-${sub}.jar;
 
     # intall pom
-    install -Dpm 644 %{name}-${sub}/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}-${sub}.pom
+    install -Dpm 644 %{name}-${sub}/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.%{name}-%{name}-${sub}.pom
 
     # maven depmap
-    %add_to_maven_depmap org.apache.xbean %{name}-${sub} %{version} JPP/xbean %{name}-${sub}
+    %add_to_maven_depmap org.apache.xbean %{name}-${sub} %{version} JPP/%{name} %{name}-${sub}
 done
 
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/
-ln -sf %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-# unversioned symlinks
-pushd $RPM_BUILD_ROOT%{_javadir}/%{name}
-for jar in *-%{version}*; do
-    ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`
-done
-popd # come back from javadir
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 # parent pom
-install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
+install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.%{name}-main.pom
+%add_to_maven_depmap org.apache.xbean %{name} %{version} JPP/%{name} main
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+%pre javadoc
+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 
 %post
 %update_maven_depmap
@@ -126,7 +116,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc LICENSE NOTICE
-%{_mavenpomdir}/JPP-*.pom
+%{_mavenpomdir}/*.pom
 %{_mavendepmapfragdir}/%{name}
 %{_javadir}/%{name}
 
@@ -134,9 +124,13 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc LICENSE
 %{_javadocdir}/%{name}
-%{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Mon Dec  6 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.7-4
+- Fix pom filename (Resolves rhbz#655827)
+- Add depmap for main pom file
+- Fixes according to new guidelines (versionless jars, javadocs)
+
 * Fri Jul 30 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.7-3
 - Use javadoc:aggregate to generate javadocs