[rpms/bsh] epel10: Install versionless javadocs

[rpms/bsh] epel10: Install versionless javadocs

[Mikolaj Izdebski]

A new commit has been pushed.

Repo   : rpms/bsh
Branch : epel10
Commit : bb284bdae792370bd8dc35c53e1c04bd45724f40
Author : Mikolaj Izdebski <mizdebsk@redhat.com>
Date   : 2013-07-12T10:58:07+02:00
Stats  : +9/-4 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/bsh/c/bb284bdae792370bd8dc35c53e1c04bd45724f40?branch=epel10

Log:
Install versionless javadocs

---
diff --git a/bsh.spec b/bsh.spec
index a6bfaf7..0f83d06 100644
--- a/bsh.spec
+++ b/bsh.spec
@@ -157,9 +157,8 @@ find docs -name "*.log" -exec rm -f {} \;
 (cd docs/manual && rm -rf html)
 (cd docs/manual && rm -rf xsl)
 # javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 # menu entry
 desktop-file-install --mode=644 \
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE3}
@@ -215,6 +214,12 @@ if [ $1 -eq 0 ] ; then
     /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
+# Workaround for RPM bug #646523 - can't change symlink to directory
+# TODO: Remove this in F-22
+%pretrans javadoc -p <lua>
+dir = "%{_javadocdir}/%{name}"
+dummy = posix.readlink(dir) and os.remove(dir)
+
 %posttrans utils
 /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
@@ -230,7 +235,6 @@ fi
 %doc docs/*
 
 %files javadoc
-%{_javadocdir}/%{name}-%{version}
 %{_javadocdir}/%{name}
 
 %files demo
@@ -245,6 +249,7 @@ fi
 %changelog
 * Fri Jul 12 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.3.0-26
 - Use %%add_maven_depmap instead of legacy macros
+- Install versionless javadocs
 
 * Wed Jul 10 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.3.0-26
 - Remove arch-specific conditionals