From 2df017fec446d977e0cc0e4db7884d270e0b6868bdd0d853e01a6d1f29f8b14e Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Mon, 12 Jan 2009 01:05:34 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/libvirt?expand=0&rev=34

---
 devhelp.patch   | 14 ++++++++++++++
 libvirt.changes |  7 +++++++
 libvirt.spec    | 13 ++++++++++---
 libvirtd.init   |  6 +++---
 4 files changed, 34 insertions(+), 6 deletions(-)
 create mode 100644 devhelp.patch

diff --git a/devhelp.patch b/devhelp.patch
new file mode 100644
index 0000000..2028ea4
--- /dev/null
+++ b/devhelp.patch
@@ -0,0 +1,14 @@
+Index: libvirt-0.4.6/docs/devhelp/Makefile.am
+===================================================================
+--- libvirt-0.4.6.orig/docs/devhelp/Makefile.am
++++ libvirt-0.4.6/docs/devhelp/Makefile.am
+@@ -1,7 +1,8 @@
+ DEVHELP_DIR=$(datadir)/gtk-doc/html/libvirt
+ HTML_FILES=index.html general.html $(HTML_MODULES)
+ HTML_MODULES=				\
+-	libvirt-libvirt.html
++	libvirt-libvirt.html            \
++        libvirt-virterror.html
+ 
+ EXTRA_FORMAT=				\
+ 	home.png			\
diff --git a/libvirt.changes b/libvirt.changes
index cae3a32..efbeb8b 100644
--- a/libvirt.changes
+++ b/libvirt.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Jan  9 09:41:49 MST 2009 - jfehlig@novell.com
+
+- Added missing html and png files to libvirt-doc package
+  devhelp.patch
+  bnc#463810
+
 -------------------------------------------------------------------
 Mon Dec 15 12:40:41 MST 2008 - jfehlig@novell.com
 
diff --git a/libvirt.spec b/libvirt.spec
index 8a5ab63..c33ab7b 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libvirt (Version 0.4.6)
 #
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -49,7 +49,7 @@ License:        LGPL v2.1 or later
 Group:          Development/Libraries/C and C++
 AutoReqProv:    yes
 Version:        0.4.6
-Release:        13
+Release:        14
 Summary:        A C toolkit to interract with the virtualization capabilities of Linux
 Requires:       readline
 Requires:       ncurses
@@ -86,6 +86,7 @@ Patch16:        xen-pv-cdrom.patch
 Patch17:        detach-disk.patch
 Patch18:        migrate-params.patch
 Patch19:        cve-2008-5086.patch
+Patch20:        devhelp.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -196,6 +197,7 @@ Authors:
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
+%patch20 -p1
 rm po/no.*
 
 %build
@@ -221,11 +223,11 @@ export CFLAGS="$RPM_OPT_FLAGS"
            ac_cv_path_QEMU_IMG=/usr/bin/qemu-img-xen \
            ac_cv_path_ISCSIADM=/sbin/iscsiadm
 make DOCS_DIR=%{_docdir}/%{name}-python EXAMPLE_DIR=%{_docdir}/%{name}-python/examples HTML_DIR=%{_docdir}/%{name}
-cd docs/examples ; make index.html ; cd ../..
 
 %install
 %makeinstall DOCS_DIR=%{_docdir}/%{name}-python EXAMPLE_DIR=%{_docdir}/%{name}-python/examples HTML_DIR=%{_docdir}/%{name}
 cp -a AUTHORS ChangeLog COPYING NEWS README TODO $RPM_BUILD_ROOT%{_docdir}/%{name}/
+cd docs ; cp -a *.html  $RPM_BUILD_ROOT%{_docdir}/%{name} ; cp -a *.png  $RPM_BUILD_ROOT%{_docdir}/%{name} ; cd ..
 # remove currently unsupported locale(s)
 rm -rf $RPM_BUILD_ROOT/usr/share/locale/sr@latin
 # for now, do not install the default network definition
@@ -318,6 +320,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-, root, root)
 %{_datadir}/gtk-doc/html/libvirt
 %doc %{_docdir}/%{name}/*.gif
+%doc %{_docdir}/%{name}/*.png
 %doc %{_docdir}/%{name}/*.html
 %doc %{_docdir}/%{name}/html
 
@@ -328,6 +331,10 @@ rm -rf $RPM_BUILD_ROOT
 %{py_sitedir}/libvirtmod*
 
 %changelog
+* Fri Jan 09 2009 jfehlig@novell.com
+- Added missing html and png files to libvirt-doc package
+  devhelp.patch
+  bnc#463810
 * Mon Dec 15 2008 jfehlig@novell.com
 - Patch for CVE-2008-5086
   bnc#459009
diff --git a/libvirtd.init b/libvirtd.init
index fe63711..a4aad0e 100644
--- a/libvirtd.init
+++ b/libvirtd.init
@@ -5,11 +5,11 @@
 #
 ### BEGIN INIT INFO
 # Provides:          libvirtd
-# Required-Start:    $network
+# Required-Start:    $network $remote_fs
 # Should-Start:      xend
 # Default-Start:     3 5
-# Required-Stop:     $null
-# Should-Stop:       $null
+# Required-Stop:     $network $remote_fs
+# Should-Stop:       xend
 # Default-Stop:      0 1 2 4 6
 # Short-Description: daemon for libvirt virtualization API
 # Description:       This is a daemon for managing QEMU guest instances