diff --git a/gnome689706.gsf_input_dup.patch b/gnome689706.gsf_input_dup.patch deleted file mode 100644 index b44bcf6..0000000 --- a/gnome689706.gsf_input_dup.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/gsf/gsf-infile-msole.c b/gsf/gsf-infile-msole.c -index 41134c8..a368a77 100644 ---- a/gsf/gsf-infile-msole.c -+++ b/gsf/gsf-infile-msole.c -@@ -642,20 +642,9 @@ static GsfInput * - gsf_infile_msole_dup (GsfInput *src_input, GError **err) - { - GsfInfileMSOle const *src = GSF_INFILE_MSOLE (src_input); -- GsfInfileMSOle *dst = ole_dup (src, err); -+ GsfInfileMSOle *parent = GSF_INFILE_MSOLE (gsf_input_container (src_input)); - -- if (dst == NULL) -- return NULL; -- -- if (src->bat.block != NULL) { -- dst->bat.block = g_new (guint32, src->bat.num_blocks), -- memcpy (dst->bat.block, src->bat.block, -- sizeof (guint32) * src->bat.num_blocks); -- } -- dst->bat.num_blocks = src->bat.num_blocks; -- dst->dirent = src->dirent; -- -- return GSF_INPUT (dst); -+ return gsf_infile_msole_new_child(parent, src->dirent, err); - } - - static guint8 const * diff --git a/libgsf.spec b/libgsf.spec index 4210d1a..0f10ad9 100644 --- a/libgsf.spec +++ b/libgsf.spec @@ -7,8 +7,8 @@ distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} Summary: GNOME Structured File library Name: libgsf -Version: 1.14.25 -Release: 2%{?dist} +Version: 1.14.26 +Release: 1%{?dist} Group: System Environment/Libraries License: LGPLv2 Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.14/%{name}-%{version}.tar.xz @@ -19,8 +19,6 @@ BuildRequires: libtool, libxml2-devel, glib2-devel, bzip2-devel, gettext BuildRequires: libbonobo-devel, pygtk2-devel, intltool, gnome-vfs2-devel Obsoletes: libgsf-gnome < 1.14.22 -Patch0: gnome689706.gsf_input_dup.patch - %description A library for reading and writing structured files (e.g. MS OLE and Zip) @@ -44,7 +42,6 @@ Python bindings for libgsf %prep %setup -q -%patch0 -p1 -b .gnome689706 %build %configure --disable-gtk-doc --disable-static --with-python @@ -98,6 +95,10 @@ fi rm -rf $RPM_BUILD_ROOT %changelog +* Mon Mar 04 2013 Caolán McNamara 1.14.26-1 +- latest version +- drop integrated gnome689706.gsf_input_dup.patch + * Fri Feb 22 2013 Caolán McNamara 1.14.25-2 - Resolves: gnome#689706 fix gsf_input_dup