From ebf5803a02044fefa4788466f5c5bc34aa20d9d2 Mon Sep 17 00:00:00 2001 From: Richard W.M. Jones Date: Mar 24 2010 15:44:52 +0000 Subject: Fix patch2 for this old version of patch. --- diff --git a/libguestfs-1.0.85-weaken-dependency-on-libntfs-3g.patch b/libguestfs-1.0.85-weaken-dependency-on-libntfs-3g.patch index 852baf2..972df1d 100644 --- a/libguestfs-1.0.85-weaken-dependency-on-libntfs-3g.patch +++ b/libguestfs-1.0.85-weaken-dependency-on-libntfs-3g.patch @@ -16,25 +16,6 @@ up pulling more files into the appliance than are strictly required, but it will fix the Fedora packaging problems being felt by the Fedora maintainer of ntfs-3g. -After applying this commit, the change to hostfiles looks like this: - -@@ -1489,7 +1489,7 @@ - ./lib/libpam_misc.so.0 - ./lib/libdmraid.so - ./lib/libidn.so.11 --./lib/libntfs-3g.so.74 -+./lib/libntfs-3g.so.* - ./lib/libext2fs.so.2.* - ./lib/libpam.so.0 - ./lib/libsepol.so.1 -@@ -1520,7 +1520,6 @@ - ./lib/libnss_files-*.so - ./lib/libgio-2.0.so.0 - ./lib/libpam_misc.so.0.* --./lib/libntfs-3g.so.74.* - ./lib/libanl.so.1 - ./lib/libdevmapper-event-lvm2.so.2.* - ./lib/libpthread.so.0 --- diff --git a/appliance/supermin-split.sh.in b/appliance/supermin-split.sh.in diff --git a/libguestfs.spec b/libguestfs.spec index 311a58f..7dda34d 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -42,7 +42,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 Version: 1.0.85 -Release: 1%{?dist}.6 +Release: 1%{?dist}.7 License: LGPLv2+ Group: Development/Libraries URL: http://libguestfs.org/ @@ -683,8 +683,9 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Wed Mar 24 2010 Richard W.M. Jones - 1:1.0.85-1.el5.6 +* Wed Mar 24 2010 Richard W.M. Jones - 1:1.0.85-1.el5.7 - Backport patch to weaken dependency on ntfs-3g. +- Fix patch2 for this old version of patch. * Tue Mar 2 2010 Richard W.M. Jones - 1:1.0.85-1.el5.5 - Expand %%{_rpmconfigdir} macro, which doesn't seem to expand or exist