commit ef731dae5171156f90a7d3bc245531cf15a9e1a6
Author: Jakub Bogusz <[email protected]>
Date: Mon Mar 2 17:18:14 2015 +0100
- updated to 1.28.6
- updated link patch
libguestfs-link.patch | 29 ++++-------------------------
libguestfs.spec | 9 +++++----
2 files changed, 9 insertions(+), 29 deletions(-)
---
diff --git a/libguestfs.spec b/libguestfs.spec
index c0c5d85..44313c5 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -27,12 +27,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.28.3
+Version: 1.28.6
Release: 1
License: LGPL v2+
Group: Libraries
Source0:
http://libguestfs.org/download/1.28-stable/%{name}-%{version}.tar.gz
-# Source0-md5: b816b1ff11fe543b024dcec7eddcf228
+# Source0-md5: f9a9dc43460475fe714e22df821c2739
Patch0: ncurses.patch
Patch1: augeas-libxml2.patch
Patch2: %{name}-link.patch
@@ -74,7 +74,7 @@ BuildRequires: readline-devel
BuildRequires: rpmbuild(macros) >= 1.656
# libsystemd-journal
BuildRequires: systemd-devel >= 1:196
-BuildRequires: yajl-devel >= 2
+BuildRequires: yajl-devel >= 2.0.4
%if %{with appliance}
BuildRequires: supermin >= 5.1.0
%endif
@@ -102,7 +102,7 @@ BuildRequires: ocaml >= 1:4.0
BuildRequires: ocaml-camlp4
BuildRequires: ocaml-fileutils-devel
BuildRequires: ocaml-findlib
-BuildRequires: ocaml-gettext-tools
+BuildRequires: ocaml-gettext-devel
BuildRequires: ocaml-pcre-devel
# for virt-builder
BuildRequires: xz-devel
@@ -147,6 +147,7 @@ BuildRequires: ruby-rubygems
BuildRequires: systemtap-sdt-devel
%endif
Requires: qemu-common >= 1.1.0
+Requires: yajl >= 2.0.4
Suggests: db-utils
Suggests: icoutils
Suggests: netpbm-progs
diff --git a/libguestfs-link.patch b/libguestfs-link.patch
index a41a23c..89b121c 100644
--- a/libguestfs-link.patch
+++ b/libguestfs-link.patch
@@ -1,32 +1,11 @@
---- libguestfs-1.20.1/src/Makefile.am.orig 2012-12-20 16:40:46.000000000
+0100
-+++ libguestfs-1.20.1/src/Makefile.am 2013-01-06 19:21:18.854294111 +0100
-@@ -178,6 +178,7 @@
- $(PCRE_LIBS) $(MAGIC_LIBS) \
- $(LIBVIRT_LIBS) $(LIBXML2_LIBS) \
- $(YAJL_LIBS) \
-+ $(SELINUX_LIB) \
- ../gnulib/lib/libgnu.la \
- $(GETADDRINFO_LIB) \
- $(HOSTENT_LIB) \
---- libguestfs-1.24.0/gobject/Makefile.am.orig 2013-10-19 09:15:17.000000000
+0200
-+++ libguestfs-1.24.0/gobject/Makefile.am 2013-10-26 07:35:22.919512265
+0200
-@@ -54,8 +54,8 @@
+--- 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 \
-DGUESTFS_PRIVATE=1 \
$(GOBJECT_CFLAGS)
-libguestfs_gobject_1_0_la_LDFLAGS = $(LDFLAGS) -L$(top_builddir)/src
--libguestfs_gobject_1_0_la_LIBADD = -lguestfs $(GOBJECT_LIBS) $(GIO_LIBS)
+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)/src/libguestfs.la
$(GOBJECT_LIBS) $(GIO_LIBS)
pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = libguestfs-gobject-1.0.pc
-@@ -80,7 +80,7 @@
- Guestfs-1.0.gir: $(libname)
- Guestfs_1_0_gir_INCLUDES = GObject-2.0 Gio-2.0
- Guestfs_1_0_gir_CFLAGS = $(INCLUDES) -I$(srcdir)/include
--Guestfs_1_0_gir_LIBS = $(libname)
-+Guestfs_1_0_gir_LIBS = $(libname) $(top_builddir)/src/libguestfs.la
- Guestfs_1_0_gir_FILES = $(patsubst %,$(srcdir)/%,$(introspection_sources))
- INTROSPECTION_GIRS += Guestfs-1.0.gir
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libguestfs.git/commitdiff/ef731dae5171156f90a7d3bc245531cf15a9e1a6
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
