From 345a88185c48a3599549c2af80ec65f45dc410fe Mon Sep 17 00:00:00 2001 From: Mariusz Mazur Date: Fri, 19 May 2017 16:50:51 +0200 Subject: [PATCH] Attempt a 1.36.3 update; rel 0.1 --- libguestfs-link.patch | 12 ++++++------ libguestfs.spec | 8 ++++---- ncurses.patch | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/libguestfs-link.patch b/libguestfs-link.patch index 89b121c..10afb50 100644 --- a/libguestfs-link.patch +++ b/libguestfs-link.patch @@ -1,11 +1,11 @@ ---- libguestfs-1.28.6/gobject/Makefile.am.orig 2015-03-01 21:20:01.977601510 +0100 -+++ libguestfs-1.28.6/gobject/Makefile.am 2015-03-01 21:24:35.947590012 +0100 -@@ -54,7 +54,7 @@ - libguestfs_gobject_1_0_la_CFLAGS = -I$(top_srcdir)/src -I$(srcdir)/include \ +--- libguestfs-1.36.3/gobject/Makefile.am~ 2017-03-24 13:30:37.000000000 +0100 ++++ libguestfs-1.36.3/gobject/Makefile.am 2017-05-19 16:32:49.635277409 +0200 +@@ -55,7 +55,7 @@ + libguestfs_gobject_1_0_la_CFLAGS = -I$(top_srcdir)/lib -I$(srcdir)/include \ -DGUESTFS_PRIVATE=1 \ $(GOBJECT_CFLAGS) --libguestfs_gobject_1_0_la_LDFLAGS = $(LDFLAGS) -L$(top_builddir)/src +-libguestfs_gobject_1_0_la_LDFLAGS = $(LDFLAGS) -L$(top_builddir)/lib +libguestfs_gobject_1_0_la_LDFLAGS = $(LDFLAGS) - libguestfs_gobject_1_0_la_LIBADD = $(top_builddir)/src/libguestfs.la $(GOBJECT_LIBS) $(GIO_LIBS) + libguestfs_gobject_1_0_la_LIBADD = $(top_builddir)/lib/libguestfs.la $(GOBJECT_LIBS) $(GIO_LIBS) pkgconfigdir = $(libdir)/pkgconfig diff --git a/libguestfs.spec b/libguestfs.spec index d6024a6..5db32a9 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -35,12 +35,12 @@ Summary: Library and tools for accessing and modifying virtual machine disk images Summary(pl.UTF-8): Biblioteka i narzędzia do dostępu i modyfikacji obrazów dysków maszyn wirtualnych Name: libguestfs -Version: 1.32.4 -Release: 4 +Version: 1.36.3 +Release: 0.1 License: LGPL v2+ Group: Libraries -Source0: http://libguestfs.org/download/1.32-stable/%{name}-%{version}.tar.gz -# Source0-md5: f0ac7aa2382b557cc012c239b5e69bb3 +Source0: http://libguestfs.org/download/1.36-stable/%{name}-%{version}.tar.gz +# Source0-md5: 1f4fadd9efca82793b488ae8d489cc50 Patch0: ncurses.patch Patch1: augeas-libxml2.patch Patch2: %{name}-link.patch diff --git a/ncurses.patch b/ncurses.patch index 24a6989..b3f6f36 100644 --- a/ncurses.patch +++ b/ncurses.patch @@ -1,5 +1,5 @@ ---- libguestfs-1.12.7/fish/progress.c.wiget 2011-10-09 14:09:04.429015818 +0200 -+++ libguestfs-1.12.7/fish/progress.c 2011-10-09 14:09:31.781454156 +0200 +--- libguestfs-1.36.3/common/progress/progress.c.orig 2011-10-09 14:09:04.429015818 +0200 ++++ libguestfs-1.36.3/common/progress/progress.c 2011-10-09 14:09:31.781454156 +0200 @@ -31,8 +31,8 @@ /* Include these last since they redefine symbols such as 'lines' * which seriously breaks other headers. -- 2.44.0