From 204356a85acdb2470b2c155807dc6d3f73aae46b Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 28 Jan 2012 16:17:15 +0000 Subject: [PATCH] New upstream version 1.17.3. - Remove patch now upstream. --- .gitignore | 1 + ...76-now-requires-dev-to-be-a-devtmpfs.patch | 28 ------------------- libguestfs.spec | 13 ++++----- sources | 2 +- 4 files changed, 8 insertions(+), 36 deletions(-) delete mode 100644 0001-appliance-udev-176-now-requires-dev-to-be-a-devtmpfs.patch diff --git a/.gitignore b/.gitignore index 9ad8a13..e374dae 100644 --- a/.gitignore +++ b/.gitignore @@ -136,3 +136,4 @@ libguestfs-1.5.3.tar.gz /libguestfs-1.16.0.tar.gz /libguestfs-1.17.1.tar.gz /libguestfs-1.17.2.tar.gz +/libguestfs-1.17.3.tar.gz diff --git a/0001-appliance-udev-176-now-requires-dev-to-be-a-devtmpfs.patch b/0001-appliance-udev-176-now-requires-dev-to-be-a-devtmpfs.patch deleted file mode 100644 index f953036..0000000 --- a/0001-appliance-udev-176-now-requires-dev-to-be-a-devtmpfs.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 8f564ae7a2fb0f170308bd103a6be0a981583b1c Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Fri, 27 Jan 2012 15:36:31 +0000 -Subject: [PATCH] appliance: udev >= 176 now requires /dev to be a devtmpfs. - -See this udev commit: -https://git.kernel.org/?p=linux/hotplug/udev.git;a=commitdiff;h=220893b3cbdbf8932f95c44811b169a8f0d33939 ---- - appliance/init | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/appliance/init b/appliance/init -index d3a6156..4d74f91 100755 ---- a/appliance/init -+++ b/appliance/init -@@ -18,6 +18,9 @@ rm -f /sys; mkdir /sys - mount -t sysfs /sys /sys - mkdir -p /run/lock - -+# devtmpfs is required since udev 176 -+mount -t devtmpfs /dev /dev -+ - 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.6 - diff --git a/libguestfs.spec b/libguestfs.spec index 1645409..ff8fb9d 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.17.2 -Release: 3%{?dist} +Version: 1.17.3 +Release: 1%{?dist} License: LGPLv2+ Group: Development/Libraries URL: http://libguestfs.org/ @@ -41,9 +41,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root ExclusiveArch: x86_64 %endif -# Upstream patch to work with udev >= 176. -Patch0001: 0001-appliance-udev-176-now-requires-dev-to-be-a-devtmpfs.patch - # Basic build requirements: BuildRequires: /usr/bin/pod2man BuildRequires: /usr/bin/pod2text @@ -626,8 +623,6 @@ for %{name}. %prep %setup -q -%patch0001 -p1 - mkdir -p daemon/m4 # Replace developer-specific README that ships with libguestfs, with @@ -1026,6 +1021,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Jan 28 2012 Richard W.M. Jones - 1:1.17.3-1 +- New upstream version 1.17.3. +- Remove patch now upstream. + * Fri Jan 27 2012 Richard W.M. Jones - 1:1.17.2-3 - Upstream patch to work with udev >= 176. diff --git a/sources b/sources index abeb8f7..d9149a9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c74b6080471a6c90d97cf082b631e142 libguestfs-1.17.2.tar.gz +3b0aedbae81229ba005f85633d3935c2 libguestfs-1.17.3.tar.gz