diff --git a/.gitignore b/.gitignore index 9a7b374..391bba4 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/libgovirt-0.3.1.tar.xz +SOURCES/libgovirt-0.3.3.tar.xz diff --git a/.libgovirt.metadata b/.libgovirt.metadata index f2c05f5..4838408 100644 --- a/.libgovirt.metadata +++ b/.libgovirt.metadata @@ -1 +1 @@ -d9d1a0f7ef8db841f39e2f7c8f3a75c8da86db47 SOURCES/libgovirt-0.3.1.tar.xz +051aa0d9e3a1d31427dfc8038f5500f2e51b2dfc SOURCES/libgovirt-0.3.3.tar.xz diff --git a/SOURCES/0001-cdrom-Allow-empty-filename-when-serializing-to-XML.patch b/SOURCES/0001-cdrom-Allow-empty-filename-when-serializing-to-XML.patch deleted file mode 100644 index 4612068..0000000 --- a/SOURCES/0001-cdrom-Allow-empty-filename-when-serializing-to-XML.patch +++ /dev/null @@ -1,37 +0,0 @@ -From bdb788fcced810b45d7c02882c80114477576a46 Mon Sep 17 00:00:00 2001 -From: Christophe Fergeau -Date: Mon, 22 Sep 2014 14:11:07 +0200 -Subject: [PATCH] cdrom: Allow empty filename when serializing to XML - -Removing a CDROM image from a VM is achieved by updating the current VM -file to be "". The code currently forbid NULL filenames in update -requests, this commit removes this limitation so that it's possible to -remove a CD image from a VM through libgovirt. ---- - govirt/ovirt-cdrom.c | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) - -diff --git a/govirt/ovirt-cdrom.c b/govirt/ovirt-cdrom.c -index 020159c..d852403 100644 ---- a/govirt/ovirt-cdrom.c -+++ b/govirt/ovirt-cdrom.c -@@ -151,13 +151,16 @@ static gboolean ovirt_cdrom_init_from_xml(OvirtResource *resource, - static char *ovirt_cdrom_to_xml(OvirtResource *resource) - { - OvirtCdrom *cdrom; -+ const char *file; - - g_return_val_if_fail(OVIRT_IS_CDROM(resource), NULL); - cdrom = OVIRT_CDROM(resource); -- g_return_val_if_fail(cdrom->priv->file != NULL, NULL); -+ file = cdrom->priv->file; -+ if (file == NULL) { -+ file = ""; -+ } - -- return g_strdup_printf("\n\t\n", -- cdrom->priv->file); -+ return g_strdup_printf("\n\t\n", file); - } - - diff --git a/SPECS/libgovirt.spec b/SPECS/libgovirt.spec index 1204256..9c1f8d4 100644 --- a/SPECS/libgovirt.spec +++ b/SPECS/libgovirt.spec @@ -8,19 +8,18 @@ Summary: A GObject library for interacting with oVirt REST API Name: libgovirt -Version: 0.3.1 -Release: 3%{?dist}%{?extra_release} +Version: 0.3.3 +Release: 1%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries Source: http://ftp.gnome.org/pub/GNOME/sources/libgovirt/0.3/%{name}-%{version}.tar.xz -Patch0: 0001-cdrom-Allow-empty-filename-when-serializing-to-XML.patch URL: http://people.freedesktop.org/~teuf/govirt/ BuildRequires: glib2-devel +BuildRequires: intltool BuildRequires: rest-devel >= 0.7.92 %if %{with_gir} BuildRequires: gobject-introspection-devel %endif -Requires: rest >= 0.7.92 %description libgovirt is a library that allows applications to use oVirt REST API @@ -43,7 +42,6 @@ Libraries, includes, etc. to compile with the libgovirt library %prep %setup -q -%patch0 -p1 %build %if %{with_gir} @@ -59,6 +57,7 @@ Libraries, includes, etc. to compile with the libgovirt library %__make install DESTDIR=%{buildroot} rm -f %{buildroot}%{_libdir}/*.a rm -f %{buildroot}%{_libdir}/*.la +%find_lang %{name} --with-gnome %check make check @@ -67,7 +66,7 @@ make check %postun -p /sbin/ldconfig -%files +%files -f %{name}.lang %doc AUTHORS COPYING MAINTAINERS README %{_libdir}/%{name}.so.2* %if %{with_gir} @@ -85,6 +84,10 @@ make check %endif %changelog +* Tue May 12 2015 Christophe Fergeau 0.3.3-1 +- Rebase to 0.3.3 + Resolves: rhbz#1214234 + * Fri Oct 10 2014 Christophe Fergeau 0.3.1-3 - Add upstream patch allowing to remove CD images from an OvirtCdrom Resolves: rhbz#1151171