[hsqldb] More merge review fixes.

[Alexander Kurtakov]

commit 42b541ee1ace9b8eba2e9421e754e88b8aa47fd6
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Tue Jan 25 11:56:21 2011 +0200

    More merge review fixes.

 hsqldb.spec               |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/hsqldb-1.8.0-standard.cfg b/hsqldb-1.8.0-standard.cfg
old mode 100755
new mode 100644
diff --git a/hsqldb.spec b/hsqldb.spec
index c7b3921..1df06cc 100644
--- a/hsqldb.spec
+++ b/hsqldb.spec
@@ -32,7 +32,7 @@
 
 Name:       hsqldb
 Version:    1.8.1.3
-Release:    1%{?dist}
+Release:    2%{?dist}
 Epoch:      1
 Summary:    HyperSQL Database Engine
 License:    BSD
@@ -87,6 +87,7 @@ Documentation for %{name}.
 %package javadoc
 Summary:    Javadoc for %{name}
 Group:      Documentation
+Requires:   jpackage-utils
 
 %description javadoc
 Javadoc for %{name}.
@@ -196,6 +197,11 @@ fi
 %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 doc/hsqldb_lic.txt
@@ -225,9 +231,11 @@ fi
 %files demo
 %defattr(-,root,root,-)
 %{_datadir}/%{name}
-%doc doc/hsqldb_lic.txt
 
 %changelog
+* Tue Jan 25 2011 Alexander Kurtakov <akurtako at redhat.com> 1:1.8.1.3-2
+- More merge review fixes.
+
 * Mon Jan 24 2011 Alexander Kurtakov <akurtako at redhat.com> 1:1.8.1.3-1
 - Update to new upstream version.
 - Fixes for the merge review.