[CUnit] Fix HTML documentation installation location.

[Michael Schwendt]

commit e343c2579d6218450f3cda513cd37b1af448327c
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Sun Jun 1 17:49:10 2014 +0200

    Fix HTML documentation installation location.
    
    - Replace CUnit-2.1-3-src.tar.bz2 tarball, which really
      is 2.1-2 in disguise according to configure.in, with 2.1-3 as
      published on 2014-04-24.
    - BR libtool
    - Run autoreconf instead of autoconf.
    - Drop --enable-curses because without BuildRequires ncurses-devel it
      would disable itself automatically (and if it were enabled, test programs
      would need to link with ncurses explicitly).

 .gitignore |    1 +
 CUnit.spec |   37 ++++++++++++++++++++++++++-----------
 sources    |    2 +-
 3 files changed, 28 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8e88f4c..2ee421a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /CUnit-2.1-2-src.tar.bz2
 /CUnit-2.1-3-src.tar.bz2
+/CUnit-2.1-3.tar.bz2
diff --git a/CUnit.spec b/CUnit.spec
index cf53971..91d2897 100644
--- a/CUnit.spec
+++ b/CUnit.spec
@@ -1,16 +1,17 @@
+%global tarver 2.1-3
+
 Name:           CUnit
 Version:        2.1.3
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Unit testing framework for C
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://cunit.sourceforge.net/
-# TODO: 404 Not Found
-# This is version 2.1-2 in disguise according to configure.in!
-Source0:        http://downloads.sourceforge.net/cunit/%{name}-2.1-3-src.tar.bz2
+Source0:        http://downloads.sourceforge.net/cunit/%{name}-%{tarver}.tar.bz2
 
 BuildRequires:  automake
+BuildRequires:  libtool
 
 %description 
 CUnit is a lightweight system for writing, administering,
@@ -27,20 +28,24 @@ The %{name}-devel package contains the header files
 and libraries for use with CUnit package.
 
 %prep
-%setup -q -n %{name}-2.1-3
+%setup -q -n %{name}-%{tarver}
 find -name *.c -exec chmod -x {} \;
 
 %build
-autoconf -f -i
-%configure --enable-curses --disable-static
+autoreconf -f -i
+%configure --disable-static
 make %{?_smp_mflags}
 
 %install
 make install DESTDIR=%{buildroot}
 rm -f `find %{buildroot} -name *.la`
 
+# work around bad docdir= in doc/Makefile*
+mkdir -p %{buildroot}%{_docdir}/%{name}
+mv %{buildroot}%{_prefix}/doc/%{name} %{buildroot}%{_docdir}/%{name}/html
+
 # add some doc files into the buildroot manually (#1001276)
-for f in AUTHORS ChangeLog COPYING NEWS README TODO ; do
+for f in AUTHORS ChangeLog COPYING NEWS README TODO VERSION ; do
     install -p -m0644 -D $f %{buildroot}%{_docdir}/%{name}/${f}
 done
 
@@ -58,17 +63,27 @@ done
 %{_docdir}/%{name}/NEWS
 %{_docdir}/%{name}/README
 %{_docdir}/%{name}/TODO
+%{_docdir}/%{name}/VERSION
 
 %files devel
-%{_docdir}/%{name}/headers/
-%{_docdir}/%{name}/*.css
-%{_docdir}/%{name}/*.html
+%{_docdir}/%{name}/html/
 %{_includedir}/%{name}/
 %{_libdir}/libcunit.so
 %{_libdir}/pkgconfig/cunit.pc
 %{_mandir}/man3/CUnit.3*
 
 %changelog
+* Sun Jun  1 2014 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1.3-9
+- Fix HTML documentation installation location.
+- Replace CUnit-2.1-3-src.tar.bz2 tarball, which really
+  is 2.1-2 in disguise according to configure.in, with 2.1-3 as
+  published on 2014-04-24.
+- BR libtool
+- Run autoreconf instead of autoconf.
+- Drop --enable-curses because without BuildRequires ncurses-devel it
+  would disable itself automatically (and if it were enabled, test programs
+  would need to link with ncurses explicitly).
+
 * Sun Sep 29 2013 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1.3-8
 - Add %%_isa to -devel base package dependency.
 - Headers get installed by "make install", copying them from the HTML
diff --git a/sources b/sources
index 07151b5..bb9fda7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e5180e2fa788abf6172c921ee19fae6a  CUnit-2.1-3-src.tar.bz2
+b5f1a9f6093869c070c6e4a9450cc10c  CUnit-2.1-3.tar.bz2