[meanwhile/f18] Various fixes

[Simone Caronni]

commit 0dd0b479d2376698261b352df57a0dca1b5dbae6
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Thu Aug 8 13:53:50 2013 +0200

    Various fixes
    
    - Fix documentation generation.
    - SPEC file cleanup.
    - Documentation is now noarch.
    - Run autotools on source; remove aarch64 patch.

 .gitignore              |    1 +
 meanwhile-aarch64.patch | 1633 -----------------------------------------------
 meanwhile.spec          |   47 +-
 sources                 |    2 +-
 4 files changed, 30 insertions(+), 1653 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e3dd9a8..ec45864 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 meanwhile-1.0.2.tar.gz
+/meanwhile-1.1.0.tar.gz
diff --git a/meanwhile.spec b/meanwhile.spec
index 8764c97..e665019 100644
--- a/meanwhile.spec
+++ b/meanwhile.spec
@@ -1,28 +1,26 @@
 Name:           meanwhile
 Version:        1.1.0
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Lotus Sametime Community Client library
 License:        LGPLv2+
 URL:            http://%{name}.sourceforge.net
 
-# The source for this package was pulled from upstream's vcs.  Use the following
-# commands to generate the tarball:
-# cvs -d:pserver:anonymous@%{name}.cvs.sourceforge.net:/cvsroot/%{name} login
-# [hit return for the password]
-# cvs -d:pserver:anonymous@%{name}.cvs.sourceforge.net:/cvsroot/%{name} co -d %{name}-1.1.0 -r %{name}_v1_1_0 %{name}
-# cd %{name}-1.1.0
-# ./autogen.sh
-# make dist
+# The source for this package was pulled from upstream's vcs.  Use the following commands to generate the tarball:
+
+# cvs -d:pserver:anonymous at meanwhile.cvs.sourceforge.net:/cvsroot/meanwhile co -d meanwhile-1.1.0 -r meanwhile_v1_1_0 meanwhile
+# tar -cvzf meanwhile-1.1.0.tar.gz meanwhile-1.1.0
+
 Source:         %{name}-%{version}.tar.gz
 Patch0:         %{name}-crash.patch
 Patch1:         %{name}-fix-glib-headers.patch
 Patch2:         %{name}-file-transfer.patch
 Patch3:         %{name}-status-timestamp-workaround.patch
-Patch4:         %{name}-aarch64.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  autoconf
+BuildRequires:  automake
 BuildRequires:  glib2-devel
 BuildRequires:  doxygen
+BuildRequires:  libtool
 
 %description
 The heart of the %{name} Project is the %{name} library, providing the basic
@@ -43,6 +41,9 @@ will need to install %{name}-devel.
 %package doc
 Summary:        Documentation for the %{name} library
 License:        GFDL
+BuildArch:      noarch
+Provides:       meanwhile-docs = %{version}-%{release}
+Obsoletes:      meanwhile-docs < 1.1.10-11
 
 %description doc
 Documentation for the %{name} library.
@@ -53,20 +54,22 @@ Documentation for the %{name} library.
 %patch1 -p1 -b .fix-glib-headers
 %patch2 -p1 -b .file-transfer
 %patch3 -p1 -b .status-timestamp-workaround
-%patch4 -p1 -b .aarch64
 
 %build
+autoreconf -vif
 %configure --enable-doxygen
 make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
-# Remove the latex documentation.  Nobody reads it, it installs a font for
-# some unknown reason, and people have to build it themselves.  Dumb.
-rm -rf %{buildroot}%{_datadir}/doc/%{name}-doc-%{version}/latex \
-    %{buildroot}%{_libdir}/lib%{name}.a \
-    %{buildroot}%{_libdir}/lib%{name}.la
+make install DESTDIR=%{buildroot} INSTALL="install -p"
+find %{buildroot} -name '*.la' -delete
+find %{buildroot} -name '*.a' -delete
+
+# Prepare documents for inclusion through %%doc in the %%files section
+mkdir docs
+mv %{buildroot}%{_datadir}/doc/%{name}-doc-%{version}/{html,samples} docs
+rm -rf %{buildroot}%{_datadir}/doc/%{name}-doc-%{version}/
 
 %post -p /sbin/ldconfig
 
@@ -82,9 +85,15 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}-doc-%{version}/latex \
 %{_libdir}/pkgconfig/%{name}.pc
 
 %files doc
-%{_datadir}/doc/%{name}-doc-%{version}/
+%doc docs/*
 
 %changelog
+* Thu Aug 08 2013 Simone Caronni <negativo17 at gmail.com> - 1.1.0-11
+- Fix documentation generation.
+- SPEC file cleanup.
+- Documentation is now noarch.
+- Run autotools on source; remove aarch64 patch.
+
 * Tue Mar 26 2013 Simone Caronni <negativo17 at gmail.com> - 1.1.0-10
 - Added aarch64 patch.
 
diff --git a/sources b/sources
index ed30ad0..ce3218f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-129dc61c82401962b3948249992a00d7  meanwhile-1.1.0.tar.gz
+848ae3b5cb6813fcb2d09e0b76ae165f  meanwhile-1.1.0.tar.gz