From aff456e8b48544eb21bf7b596479024bd0601c84 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 1 May 2012 10:37:40 +0100 Subject: [PATCH] New upstream version 1.17.37. --- .gitignore | 1 + ...-gobject-Fix-installation-of-headers.patch | 83 ------------------- libguestfs.spec | 12 ++- sources | 2 +- 4 files changed, 7 insertions(+), 91 deletions(-) delete mode 100644 0001-gobject-Fix-installation-of-headers.patch diff --git a/.gitignore b/.gitignore index 120a01e..785e58f 100644 --- a/.gitignore +++ b/.gitignore @@ -170,3 +170,4 @@ libguestfs-1.5.3.tar.gz /libguestfs-1.17.34.tar.gz /libguestfs-1.17.35.tar.gz /libguestfs-1.17.36.tar.gz +/libguestfs-1.17.37.tar.gz diff --git a/0001-gobject-Fix-installation-of-headers.patch b/0001-gobject-Fix-installation-of-headers.patch deleted file mode 100644 index 1353352..0000000 --- a/0001-gobject-Fix-installation-of-headers.patch +++ /dev/null @@ -1,83 +0,0 @@ -From d448ae0c2bff2079212734835899e17cac468620 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Fri, 27 Apr 2012 09:10:43 +0100 -Subject: [PATCH] gobject: Fix installation of headers. - -RPM build errors: -error: Installed (but unpackaged) file(s) found: - /usr/include/optargs-add_domain.h - /usr/include/optargs-add_drive_opts.h - /usr/include/optargs-btrfs_filesystem_resize.h - /usr/include/optargs-compress_device_out.h - /usr/include/optargs-compress_out.h - /usr/include/optargs-copy_device_to_device.h - /usr/include/optargs-copy_device_to_file.h - /usr/include/optargs-copy_file_to_device.h - /usr/include/optargs-copy_file_to_file.h - /usr/include/optargs-e2fsck.h - /usr/include/optargs-inspect_get_icon.h - /usr/include/optargs-md_create.h - /usr/include/optargs-mkfs_btrfs.h - /usr/include/optargs-mkfs_opts.h - /usr/include/optargs-mount_9p.h - /usr/include/optargs-mount_local.h - /usr/include/optargs-ntfsclone_out.h - /usr/include/optargs-ntfsfix.h - /usr/include/optargs-ntfsresize_opts.h - /usr/include/optargs-set_e2attrs.h - /usr/include/optargs-test0.h - /usr/include/optargs-tune2fs.h - /usr/include/optargs-umount_local.h - /usr/include/session.h - /usr/include/struct-application.h - /usr/include/struct-btrfssubvolume.h - /usr/include/struct-dirent.h - /usr/include/struct-inotify_event.h - /usr/include/struct-int_bool.h - /usr/include/struct-isoinfo.h - /usr/include/struct-lvm_lv.h - /usr/include/struct-lvm_pv.h - /usr/include/struct-lvm_vg.h - /usr/include/struct-mdstat.h - /usr/include/struct-partition.h - /usr/include/struct-stat.h - /usr/include/struct-statvfs.h - /usr/include/struct-version.h - /usr/include/struct-xattr.h - /usr/include/tristate.h - -We want to put these headers into the subdirectory, but not -guestfs-gobject.h. This isn't easy with automake. ---- - gobject/Makefile.am | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/gobject/Makefile.am b/gobject/Makefile.am -index bceec9b..4fe1098 100644 ---- a/gobject/Makefile.am -+++ b/gobject/Makefile.am -@@ -39,7 +39,7 @@ libname = libguestfs-gobject-1.0.la - - lib_LTLIBRARIES = $(libname) - --libguestfs_gobject_1_0_ladir = $(includedir) -+libguestfs_gobject_1_0_ladir = $(includedir)/guestfs-gobject - - libguestfs_gobject_1_0_la_HEADERS = $(guestfs_gobject_headers) - libguestfs_gobject_1_0_la_SOURCES = $(guestfs_gobject_sources) -@@ -49,6 +49,12 @@ libguestfs_gobject_1_0_la_LIBS = $(GOBJECT_LIBS) - libguestfs_gobject_1_0_la_LDFLAGS = $(LDFLAGS) -L$(top_builddir)/src - libguestfs_gobject_1_0_la_LIBADD = -lguestfs - -+# All the headers except should be installed -+# in the subdirectory. -+install-data-hook: -+ rm $(DESTDIR)$(includedir)/guestfs-gobject/guestfs-gobject.h -+ install -m 0644 include/guestfs-gobject.h $(DESTDIR)$(includedir) -+ - -include $(INTROSPECTION_MAKEFILE) - INTROSPECTION_GIRS = - INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --warn-all --- -1.7.10 - diff --git a/libguestfs.spec b/libguestfs.spec index 5d1585e..049e051 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -21,8 +21,8 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 -Version: 1.17.36 -Release: 2%{?dist} +Version: 1.17.37 +Release: 1%{?dist} License: LGPLv2+ Group: Development/Libraries URL: http://libguestfs.org/ @@ -34,8 +34,6 @@ Patch1: ruby-1.9-vendor-not-site.patch BuildRequires: autoconf, automake, libtool, gettext-devel %endif -Patch10: 0001-gobject-Fix-installation-of-headers.patch - %if 0%{?rhel} >= 7 ExclusiveArch: x86_64 %endif @@ -661,9 +659,6 @@ for %{name}. autoreconf -i %endif -%patch10 -p1 -autoreconf -i - mkdir -p daemon/m4 # Replace developer-specific README that ships with libguestfs, with @@ -1069,6 +1064,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue May 01 2012 Richard W.M. Jones - 1:1.17.37-1 +- New upstream version 1.17.37. + * Fri Apr 27 2012 Richard W.M. Jones - 1:1.17.36-2 - Add upstream patch to fix installation of gobject headers. diff --git a/sources b/sources index 19d272a..cd1b07a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f73795f130193a91424da58cb5ac719c libguestfs-1.17.36.tar.gz +953be2426d5f5982c7a74a7aa49f8e42 libguestfs-1.17.37.tar.gz