From 3976ae5451617947ed99bccb1452c6c584d3edff Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sun, 6 Feb 2011 17:45:21 +0000 Subject: [PATCH] New upstream version 1.9.8. --- .gitignore | 1 + ...etc-mtab-to-be-a-symlink-to-proc-mou.patch | 35 ------------------- ...rhbz557655.sh-so-it-works-with-traci.patch | 24 ------------- libguestfs.spec | 16 +++------ sources | 2 +- 5 files changed, 7 insertions(+), 71 deletions(-) delete mode 100644 0001-appliance-Force-etc-mtab-to-be-a-symlink-to-proc-mou.patch delete mode 100644 0002-regressions-Fix-rhbz557655.sh-so-it-works-with-traci.patch diff --git a/.gitignore b/.gitignore index 6a0ce0f..d791487 100644 --- a/.gitignore +++ b/.gitignore @@ -55,3 +55,4 @@ libguestfs-1.5.3.tar.gz /libguestfs-1.9.5.tar.gz /libguestfs-1.9.6.tar.gz /libguestfs-1.9.7.tar.gz +/libguestfs-1.9.8.tar.gz diff --git a/0001-appliance-Force-etc-mtab-to-be-a-symlink-to-proc-mou.patch b/0001-appliance-Force-etc-mtab-to-be-a-symlink-to-proc-mou.patch deleted file mode 100644 index 8ea56c2..0000000 --- a/0001-appliance-Force-etc-mtab-to-be-a-symlink-to-proc-mou.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 522da71ebdbca3b69978292a818b9317905a7d3c Mon Sep 17 00:00:00 2001 -From: Richard W.M. Jones -Date: Wed, 2 Feb 2011 18:33:25 +0000 -Subject: [PATCH 1/2] appliance: Force /etc/mtab to be a symlink to /proc/mounts - -Since Fedora util-linux 2.19, the %post script has done: - - rm -f /etc/mtab - ln -s /proc/mounts /etc/mtab - -We now parse /etc/mtab, and it seems to be a good idea in -general to make it work like this. ---- - appliance/init | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -diff --git a/appliance/init b/appliance/init -index 4a9476d..207aa79 100755 ---- a/appliance/init -+++ b/appliance/init -@@ -16,6 +16,11 @@ rm -f /proc; mkdir /proc - mount -t proc /proc /proc - mount -t sysfs /sys /sys - -+# util-linux >= 2.19 %post script does this. It seems to -+# be a good idea in general. -+rm -f /etc/mtab -+ln -s /proc/mounts /etc/mtab -+ - if [ ! -L /etc/init.d/udev -a -x /etc/init.d/udev ]; then - if type service >/dev/null 2>&1; then - service udev start --- -1.7.3.5 - diff --git a/0002-regressions-Fix-rhbz557655.sh-so-it-works-with-traci.patch b/0002-regressions-Fix-rhbz557655.sh-so-it-works-with-traci.patch deleted file mode 100644 index d07c22b..0000000 --- a/0002-regressions-Fix-rhbz557655.sh-so-it-works-with-traci.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 1668c3fcc9a67e59c98121a473d68087d105d334 Mon Sep 17 00:00:00 2001 -From: Richard W.M. Jones -Date: Wed, 2 Feb 2011 20:26:19 +0000 -Subject: [PATCH 2/2] regressions: Fix rhbz557655.sh so it works with tracing enabled. - ---- - regressions/rhbz557655.sh | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/regressions/rhbz557655.sh b/regressions/rhbz557655.sh -index 2306147..2bc10cd 100755 ---- a/regressions/rhbz557655.sh -+++ b/regressions/rhbz557655.sh -@@ -77,6 +77,7 @@ EOF - # number of truncate_size. - mv test.err test.err~ - grep -E 'set[-_]memsize|truncate[-_]size' test.err~ | -+ grep -Ev 'libguestfs: trace:' | - grep -Ev 'proc 200' > test.err - rm test.err~ - --- -1.7.3.5 - diff --git a/libguestfs.spec b/libguestfs.spec index 741d750..7566d59 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -29,8 +29,8 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 -Version: 1.9.7 -Release: 7%{?dist} +Version: 1.9.8 +Release: 1%{?dist} License: LGPLv2+ Group: Development/Libraries URL: http://libguestfs.org/ @@ -40,13 +40,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root # Disable FUSE tests, not supported in Koji at the moment. Patch0: libguestfs-1.7.13-no-fuse-test.patch -# Temporary non-upstream patch to fix /etc/mtab. -# See: https://www.redhat.com/archives/libguestfs/2011-February/msg00006.html -Patch1: 0001-appliance-Force-etc-mtab-to-be-a-symlink-to-proc-mou.patch - -# Fix for regressions/rhbz557655.sh so it works when tracing is enabled. -Patch2: 0002-regressions-Fix-rhbz557655.sh-so-it-works-with-traci.patch - # Basic build requirements: BuildRequires: /usr/bin/pod2man BuildRequires: /usr/bin/pod2text @@ -433,8 +426,6 @@ php-%{name} contains PHP bindings for %{name}. %setup -q %patch0 -p1 -%patch1 -p1 -%patch2 -p1 mkdir -p daemon/m4 @@ -767,6 +758,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Feb 6 2011 Richard W.M. Jones - 1:1.9.8-1 +- New upstream version 1.9.8. + * Sun Feb 6 2011 Richard W.M. Jones - 1:1.9.7-7 - Rebuild against rpm-4.9.0-0.beta1.6.fc15 to fix OCaml deps. See discussion: http://lists.fedoraproject.org/pipermail/devel/2011-February/148398.html diff --git a/sources b/sources index 23e05d1..22a2d55 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2159c94473c7174a37d339f19b90f490 libguestfs-1.9.7.tar.gz +a2377d14a7dbdb49af83fe4e39b21ebe libguestfs-1.9.8.tar.gz