Some fixes for RPM builds:

Mon Jun 11 14:10:00 BST 2007 Richard W.M. Jones <rjones@redhat.com>

	* libvirt.spec.in: BuildRequires gnutls-devel and
	  set the remote PIDfile when configuring.
	* qemud/Makefile.am: Distribute the Perl scripts.
	* qemud/qemud.c: Only use QEMUD_DEBUG when ENABLE_DEBUG
	  is defined.

diff --git a/ChangeLog b/ChangeLog
index f0b6016ee6c285836f79fb9ea8ffca99cdacd752..fd5e6ad3fc501ddc695be6069f88f1f9cf31bc23 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Mon Jun 11 14:10:00 BST 2007 Richard W.M. Jones <rjones@redhat.com>
+
+       * libvirt.spec.in: BuildRequires gnutls-devel and
+         set the remote PIDfile when configuring.
+       * qemud/Makefile.am: Distribute the Perl scripts.
+       * qemud/qemud.c: Only use QEMUD_DEBUG when ENABLE_DEBUG
+         is defined.
+
+Mon Jun 11 13:25:00 BST 2007 Richard W.M. Jones <rjones@redhat.com>
+
+       * RENAMES: Suggested list of file renames.
+
 Mon Jun 11 13:24:00 BST 2007 Richard W.M. Jones <rjones@redhat.com>
 
        * docs/examples/.cvsignore: Ignore .deps and .libs subdirectories.

diff --git a/libvirt.spec.in b/libvirt.spec.in
index 73112360fed5f85f3bbdf5c5e55545354b42c7e5..4d5c9bee56411e727d135c827dc37ac4b3bacdc2 100644 (file)
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -27,6 +27,7 @@ BuildRequires: ncurses-devel
 BuildRequires: gettext
 BuildRequires: libsysfs-devel
 BuildRequires: /sbin/iptables
+BuildRequires: gnutls-devel
 Obsoletes: libvir
 ExclusiveArch: i386 x86_64 ia64
 
@@ -61,7 +62,7 @@ of recent versions of Linux (and other OSes).
 %setup -q
 
 %build
-%configure --with-init-script=redhat --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid
+%configure --with-init-script=redhat --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid --with-remote-file=%{_localstatedir}/run/libvirtd.pid
 make
 
 %install

diff --git a/qemud/Makefile.am b/qemud/Makefile.am
index 09c09594d63f7bf45dcbeaf6d553636fb6777a78..69fdd7776bd1d31a3b3dcceeaa666da9dda468d9 100644 (file)
--- a/qemud/Makefile.am
+++ b/qemud/Makefile.am
@@ -52,6 +52,7 @@ EXTRA_DIST = libvirtd.in default-network.xml \
        protocol.x remote_protocol.x \
        protocol.c protocol.h \
        remote_protocol.c remote_protocol.h \
+       remote_generate_stubs.pl rpcgen_fix.pl \
        remote_dispatch_prototypes.h \
        remote_dispatch_localvars.h \
        remote_dispatch_proc_switch.h

diff --git a/qemud/qemud.c b/qemud/qemud.c
index 5a6180f2a752a8e9fea0c302ac42a1317f7839f4..b9e1281c7b0e7b942e09ed9d84ef9ad21d1fb24c 100644 (file)
--- a/qemud/qemud.c
+++ b/qemud/qemud.c
@@ -836,9 +836,11 @@ remoteCheckDN (gnutls_x509_crt_t cert)
         wildcards++;
     }
 
+#ifdef ENABLE_DEBUG
     /* Print the client's DN. */
     qemudLog (QEMUD_DEBUG,
               "remoteCheckDN: failed: client DN is %s", name);
+#endif
 
     return 0; // Not found.
 }