From 27935a452f478b744cefc4aa6199d2933b5226cb Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
Date: Wed, 15 Dec 2010 17:38:12 +0100
Subject: [PATCH] Add compatibility depmap jdom:jdom

- Versionless jars & javadocs
---
 jdom.spec | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/jdom.spec b/jdom.spec
index 6f57b58..c7335f2 100644
--- a/jdom.spec
+++ b/jdom.spec
@@ -30,7 +30,7 @@
 
 Name:           jdom
 Version:        1.1.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Epoch:          0
 Summary:        Java alternative to DOM and SAX
 License:        ASL 1.1
@@ -94,17 +94,13 @@ ant -Dj2se.apidoc=%{_javadocdir}/java package javadoc-link
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 # jars
 mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp -p build/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+cp -p build/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
 # javadoc
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr build/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr build/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 # demo
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
@@ -115,8 +111,8 @@ mkdir -p $RPM_BUILD_ROOT%{_mavenpomdir}
 cp jdom-1.1.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-jdom.pom
 %add_to_maven_depmap org.jdom %{name} %{version} JPP %{name}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+# compatibility depmap
+%add_to_maven_depmap %{name} %{name} %{version} JPP %{name}
 
 %post
 %update_maven_depmap
@@ -124,17 +120,21 @@ rm -rf $RPM_BUILD_ROOT
 %postun
 %update_maven_depmap
 
+%pre javadoc
+# workaround for rpm bug, can be removed in F-17
+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
+
 %files
 %defattr(-,root,root,-)
 %doc CHANGES.txt COMMITTERS.txt LICENSE.txt README.txt TODO.txt
-%{_javadir}/%{name}*.jar
+%{_javadir}/%{name}.jar
 %{_mavendepmapfragdir}/%{name}
 %{_mavenpomdir}/*.pom
 
 %files javadoc
 %defattr(-,root,root,-)
 %{_javadocdir}/%{name}
-%{_javadocdir}/%{name}-%{version}
 %doc LICENSE.txt
 
 %files demo
@@ -143,6 +143,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc LICENSE.txt
 
 %changelog
+* Wed Dec 15 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.1.1-4
+- Add compatibility depmap jdom:jdom
+- Versionless jars & javadocs
+
 * Wed Nov 3 2010 Alexander Kurtakov <akurtako@redhat.com> 0:1.1.1-3
 - Really fix license tag.