[anjuta/f17] Install user manual in main anjuta package and obsolete anjuta-doc

[Kalev Lember]

commit adf68b9082922fb21e0a3df4d57822536f6584a1
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Wed Mar 21 14:39:10 2012 +0200

    Install user manual in main anjuta package and obsolete anjuta-doc
    
    With this change About->User's Manual can work out of the box, without
    having users install any extra packages.
    
    Also, moving it all in one package makes it possible to use %find_lang
    macro for user manual, which has the plus of doing proper lang() markup.

 anjuta.spec |   24 ++++++------------------
 1 files changed, 6 insertions(+), 18 deletions(-)
---
diff --git a/anjuta.spec b/anjuta.spec
index d1be366..71fe94a 100644
--- a/anjuta.spec
+++ b/anjuta.spec
@@ -46,6 +46,10 @@ Requires:       gnome-icon-theme
 Requires:       hicolor-icon-theme
 Requires:       libgda-sqlite >= 4.2.0
 
+# Obsolete the -doc subpackage and instead install the user help in main
+# anjuta package so that About->User's Manual could work out of the box.
+Obsoletes:      anjuta-doc < 1:3.3.92-1
+
 %description
 Anjuta DevStudio is a versatile software development studio featuring
 a number of advanced programming facilities including project
@@ -62,14 +66,6 @@ Requires:       %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %description devel
 This package contains development files for %{name}.
 
-%package doc
-Summary:        Documentation for Anjuta DevStudio
-Group:          Documentation
-Requires:       %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-BuildArch:      noarch
-
-%description doc
-Documentation for Anjuta DevStudio provided in DocBook format.
 
 %prep
 %setup -q -n %{name}-%{version}
@@ -104,7 +100,7 @@ find $RPM_BUILD_ROOT -type f -name "*.la" -delete
 # Use %%doc instead.
 rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
 
-%find_lang %{name}
+%find_lang %{name} --all-name --with-gnome
 
 desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/anjuta.desktop
 
@@ -188,20 +184,12 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 %dir %{_includedir}/libanjuta-3.0
 %{_includedir}/libanjuta-3.0/libanjuta
 
-%files doc
-%dir %{_datadir}/gnome/help/%{name}-build-tutorial
-%{_datadir}/gnome/help/%{name}-build-tutorial/C
-
-%dir %{_datadir}/gnome/help/%{name}-faqs
-%{_datadir}/gnome/help/%{name}-faqs/C
-
-%dir %{_datadir}/gnome/help/%{name}-manual
-%{_datadir}/gnome/help/%{name}-manual/*
 
 %changelog
 * Wed Mar 21 2012 Kalev Lember <kalevlember at gmail.com> - 1:3.3.92-1
 - Update to 3.3.92
 - Spec file cleanup
+- Install user manual in main anjuta package and obsolete anjuta-doc
 
 * Sat Mar 17 2012 Kalev Lember <kalevlember at gmail.com> - 1:3.3.91-1
 - Update to 3.3.91