[hsqldb] Doc path fixes (#993841).

[Ville Skyttä]

commit 543ac89b110aeb7d40160ba1a0eef192f359c35a
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Fri Dec 6 23:20:24 2013 +0200

    Doc path fixes (#993841).
    
    - Do not include API docs in -manual.
    - Fix bogus date in %changelog.

 hsqldb.spec |   22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 deletions(-)
---
diff --git a/hsqldb.spec b/hsqldb.spec
index b390342..da3d143 100644
--- a/hsqldb.spec
+++ b/hsqldb.spec
@@ -28,11 +28,12 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 %global pomversion 2.3.0
 
 Name:           hsqldb
 Version:        2.3.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          1
 Summary:        HyperSQL Database Engine
 License:        BSD
@@ -130,6 +131,7 @@ chmod -R go=u-w *
 
 # Fix doc location
 sed -i -e 's/doc-src/doc/g' build/build.xml
+sed -i -e 's|doc/apidocs|%{_javadocdir}/%{name}|g' index.html
 
 %patch0 -p1
 %patch1 -p1
@@ -167,14 +169,13 @@ install -m 600 %{SOURCE4} %{buildroot}%{_localstatedir}/lib/%{name}/sqltool.rc
 # lib
 install -d -m 755 %{buildroot}%{_localstatedir}/lib/%{name}/lib
 # javadoc
-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
-cp -r doc/apidocs/* %{buildroot}%{_javadocdir}/%{name}
+install -d -m 755 %{buildroot}%{_javadocdir}
+mv doc/apidocs %{buildroot}%{_javadocdir}/%{name}
 # data
 install -d -m 755 %{buildroot}%{_localstatedir}/lib/%{name}/data
 # manual
-install -d -m 755 %{buildroot}%{_docdir}/%{name}-%{version}
-cp -r doc/* %{buildroot}%{_docdir}/%{name}-%{version}
-cp index.html %{buildroot}%{_docdir}/%{name}-%{version}
+install -d -m 755 %{buildroot}%{_pkgdocdir}
+cp -r doc index.html %{buildroot}%{_pkgdocdir}
 
 cd ..
 # Maven metadata
@@ -235,7 +236,7 @@ popd
 %{_mavenpomdir}/*
 
 %files manual
-%doc %{_docdir}/%{name}-%{version}
+%doc %{_pkgdocdir}
 
 %files javadoc
 %doc %{_javadocdir}/%{name}
@@ -243,6 +244,11 @@ popd
 %files demo
 
 %changelog
+* Fri Dec  6 2013 Ville Skyttä <ville.skytta at iki.fi> - 1:2.3.1-2
+- Doc path fixes (#993841).
+- Do not include API docs in -manual.
+- Fix bogus date in %%changelog.
+
 * Thu Oct 17 2013 Tomas Radej <tradej at redhat.com> - 1:2.3.1-1
 - Updated to latest upstream version
 
@@ -345,7 +351,7 @@ popd
 * Mon Jan 22 2007 Deepak Bhole <dbhole at redhat.com> 1:1.8.0.7-2jpp
 - Update copyright date
 
-* Thu Jan 22 2007 Deepak Bhole <dbhole at redhat.com> 1:1.8.0.7-1jpp.2
+* Mon Jan 22 2007 Deepak Bhole <dbhole at redhat.com> 1:1.8.0.7-1jpp.2
 - Bump release to build in rawhide
 
 * Thu Jan 11 2007 Deepak Bhole <dbhole at redhat.com> 1:1.8.0.7-1jpp