[maliit-framework] Fix duplicate documentation (#1001292)

[Michael Schwendt]

commit 60794739e21571780c26c5b90d5faa0d38e3bc41
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Fri Dec 13 23:37:56 2013 +0100

    Fix duplicate documentation (#1001292)
    
    - Add BR graphviz for /usr/bin/dot (missing images in documentation)
    - Fix summaries, descriptions and Group tags of IM module subpackages
    - Fix directory ownership

 maliit-framework.spec |   67 ++++++++++++++++++++++++++++--------------------
 1 files changed, 39 insertions(+), 28 deletions(-)
---
diff --git a/maliit-framework.spec b/maliit-framework.spec
index 46e72d8..f86cb2e 100644
--- a/maliit-framework.spec
+++ b/maliit-framework.spec
@@ -1,6 +1,6 @@
 Name:           maliit-framework
 Version:        0.94.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Input method framework
 
 Group:          System Environment/Libraries
@@ -11,6 +11,7 @@ Source0:        http://maliit.org/releases/%{name}/%{name}-%{version}.tar.bz2
 BuildRequires: dbus-devel
 BuildRequires: dbus-glib-devel
 BuildRequires: doxygen
+BuildRequires: graphviz
 BuildRequires: glib2-devel
 BuildRequires: gobject-introspection-devel
 BuildRequires: gtk2-devel
@@ -36,46 +37,40 @@ communicate with the Maliit server via input context plugins. The communication
 link currently uses D-Bus.
 
 %package qt4
-Summary: Development package for %{name}
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: pkgconfig
+Summary: Input method module for Qt 4 based on Maliit framework
+Group: System Environment/Libraries
+Requires: %{name}%{?_isa} = %{version}-%{release}
 
 %description qt4
-Files for development with %{name}.
+Input method module for Qt 4 based on Maliit framework.
 
 %package gtk2
-Summary: Development package for %{name}
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: pkgconfig
+Summary: Input method module for GTK+ 2 based on Maliit framework
+Group: System Environment/Libraries
+Requires: %{name}%{?_isa} = %{version}-%{release}
 
 %description gtk2
-Files for development with %{name}.
+Input method module for GTK+ 2 based on Maliit framework.
 
 %package gtk3
-Summary: Development package for %{name}
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: pkgconfig
+Summary: Input method module for GTK+ 3 based on Maliit framework
+Group: System Environment/Libraries
+Requires: %{name}%{?_isa} = %{version}-%{release}
 
 %description gtk3
-Files for development with %{name}.
+Input method module for GTK+ 3 based on Maliit framework.
 
 %package devel
-Summary: Development package for %{name}
+Summary: Development files for %{name}
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: pkgconfig
+Requires: %{name}%{?_isa} = %{version}-%{release}
 
 %description devel
 Files for development with %{name}.
 
 %package docs
 Summary: Documentation files for %{name}
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: gtk-doc
+Group: Documentation
 BuildArch: noarch
 
 %description docs
@@ -84,10 +79,10 @@ This package contains developer documentation for %{name}.
 %package examples
 Summary: Tests and examples for %{name}
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: %{name}-gtk2 = %{version}-%{release}
-Requires: %{name}-gtk3 = %{version}-%{release}
-Requires: %{name}-qt4 = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: %{name}-gtk2%{?_isa} = %{version}-%{release}
+Requires: %{name}-gtk3%{?_isa} = %{version}-%{release}
+Requires: %{name}-qt4%{?_isa} = %{version}-%{release}
 
 %description examples
 This package contains tests and examples for %{name}.
@@ -112,6 +107,10 @@ make install INSTALL="install -p" INSTALL_ROOT=%{buildroot} DESTDIR=%{buildroot}
 find %{buildroot} -name '.moc' -exec rm -rf {} ';'
 find %{buildroot} -name '.gitignore' -exec rm -rf {} ';'
 
+# move installed docs to include them in subpackage via %%doc magic
+rm -rf __tmp_doc ; mkdir __tmp_doc
+mv ${RPM_BUILD_ROOT}%{_docdir}/%{name}/* __tmp_doc
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -138,6 +137,9 @@ fi
 %doc LICENSE.LGPL README NEWS
 %{_bindir}/maliit-server
 %{_libdir}/libmaliit*.so.*
+%dir %{_libdir}/maliit
+%dir %{_libdir}/maliit/plugins
+%dir %{_libdir}/maliit/plugins/factories
 %{_libdir}/maliit/plugins/factories/libmaliit-plugins-quick-factory.so
 %{_libdir}/girepository-1.0/Maliit-1.0.typelib
 %{_datadir}/dbus-1/services/org.maliit.server.service
@@ -156,17 +158,26 @@ fi
 %{_libdir}/libmaliit*.so
 %{_libdir}/pkgconfig/maliit*.pc
 %{_libdir}/qt4/mkspecs/features/maliit*
+%dir %{_datadir}/gir-1.0
 %{_datadir}/gir-1.0/Maliit-1.0.gir
 
 %files docs
-%{_datadir}/doc/maliit-framework
-%{_datadir}/gtk-doc/html/maliit
+%doc __tmp_doc/*
+%dir %{_datadir}/gtk-doc
+%dir %{_datadir}/gtk-doc/html
+%{_datadir}/gtk-doc/html/maliit/
 
 %files examples
 %{_bindir}/maliit-example*
 %{_libdir}/maliit-framework-tests
 
 %changelog
+* Fri Dec 13 2013 Michael Schwendt <mschwendt at fedoraproject.org> - 0.94.2-3
+- Fix duplicate documentation (#1001292)
+- Add BR graphviz for /usr/bin/dot (missing images in documentation)
+- Fix summaries, descriptions and Group tags of IM module subpackages
+- Fix directory ownership
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.94.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild