From 9842f3dc5751e0acca59f6b0a54faa02b87bf89ec61bcb9ac68fdf7e230b34aa Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 5 May 2008 23:37:43 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libvirt?expand=0&rev=14 --- libvirt.changes | 5 +++++ libvirt.spec | 8 ++++++-- suse-paths.patch | 12 ++++++++++++ 3 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 suse-paths.patch diff --git a/libvirt.changes b/libvirt.changes index 91c1627..f836792 100644 --- a/libvirt.changes +++ b/libvirt.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon May 5 11:18:49 MDT 2008 - jfehlig@novell.com + +- Fix path to iptables. bnc#386280 + ------------------------------------------------------------------- Thu Apr 24 14:00:06 MDT 2008 - jfehlig@novell.com diff --git a/libvirt.spec b/libvirt.spec index 261dac6..0cb3d74 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -12,7 +12,7 @@ Name: libvirt -BuildRequires: PolicyKit-devel avahi-devel bridge-utils cyrus-sasl-devel fdupes gettext gnutls-devel libxml2-devel ncurses-devel pkg-config python-devel readline-devel xen-devel xhtml-dtd +BuildRequires: PolicyKit-devel avahi-devel bridge-utils cyrus-sasl-devel fdupes gettext gnutls-devel iptables libxml2-devel ncurses-devel pkg-config python-devel readline-devel xen-devel xhtml-dtd # Only for directory ownership: BuildRequires: gtk-doc Url: http://libvirt.org/ @@ -20,7 +20,7 @@ License: LGPL v2.1 or later Group: Development/Libraries/C and C++ AutoReqProv: yes Version: 0.4.0 -Release: 43 +Release: 48 Summary: A C toolkit to interract with the virtualization capabilities of Linux Requires: dnsmasq Requires: bridge-utils @@ -34,6 +34,7 @@ Source0: %{name}-%{version}.tar.bz2 Source1: libvirtd.init Patch0: auth-callback.patch Patch1: xen-3_2-hypercall.patch +Patch2: suse-paths.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 %define _libexecdir %{_prefix}/lib/%{name} @@ -125,6 +126,7 @@ Authors: %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 rm po/no.* %build @@ -233,6 +235,8 @@ rm -rf $RPM_BUILD_ROOT %{py_sitedir}/libvirtmod* %changelog +* Mon May 05 2008 jfehlig@novell.com +- Fix path to iptables. bnc#386280 * Thu Apr 24 2008 jfehlig@novell.com - Fix Xen 3.2 hypercalls. bnc#378798 * Thu Apr 10 2008 jfehlig@novell.com diff --git a/suse-paths.patch b/suse-paths.patch new file mode 100644 index 0000000..3ef1972 --- /dev/null +++ b/suse-paths.patch @@ -0,0 +1,12 @@ +diff -ru a/configure.in b/configure.in +--- a/configure.in 2007-12-17 16:07:47.000000000 -0700 ++++ b/configure.in 2008-05-05 10:30:03.000000000 -0600 +@@ -204,7 +204,7 @@ + AC_DEFINE_UNQUOTED(IPTABLES_DIR, "$IPTABLES_DIR", [directory used for saving iptables chains]) + fi + +-AC_PATH_PROG(IPTABLES_PATH, iptables, /sbin/iptables) ++AC_PATH_PROG(IPTABLES_PATH, iptables, /sbin/iptables, [/usr/sbin:$PATH]) + AC_DEFINE_UNQUOTED(IPTABLES_PATH, "$IPTABLES_PATH", [path to iptables binary]) + + dnl