diff --git a/.gitignore b/.gitignore index e6a011a..5e426ed 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/libgsf-1.14.26.tar.xz +/libgsf-1.14.27.tar.xz diff --git a/libgsf-gnome-695907-selinux-use-tmpdir-for-tmpfile.patch b/libgsf-gnome-695907-selinux-use-tmpdir-for-tmpfile.patch deleted file mode 100644 index 73ee5ec..0000000 --- a/libgsf-gnome-695907-selinux-use-tmpdir-for-tmpfile.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- libgsf-1.14.26/thumbnailer/main.c 2013-03-15 11:52:30.534080736 +0000 -+++ libgsf-1.14.26/thumbnailer/main.c 2013-03-15 12:03:26.380766098 +0000 -@@ -97,14 +97,19 @@ - static void - write_thumbnail (const char *filename, gconstpointer data, gsize size, int thumb_size) - { -+ GError *error = NULL; - char *tmp_name; - int fd; - FILE *file; - -- tmp_name = g_strdup_printf ("%s.XXXXXX", filename); -- fd = g_mkstemp (tmp_name); -- if (fd == -1) { -- perror ("Could not create temporary file"); -+ fd = g_file_open_tmp("gsf-thumbnailer-XXXXXX", &tmp_name, &error); -+ if(error) { -+ if(error->message) { -+ g_printerr ("error: %s\n", error->message); -+ } else { -+ g_printerr ("error: %s\n", "Could not create tmp file"); -+ } -+ g_error_free(error); - exit (EXIT_FAILURE); - } - diff --git a/libgsf.spec b/libgsf.spec index 0211a2f..2a4d658 100644 --- a/libgsf.spec +++ b/libgsf.spec @@ -1,7 +1,7 @@ Summary: GNOME Structured File library Name: libgsf -Version: 1.14.26 -Release: 4%{?dist} +Version: 1.14.27 +Release: 1%{?dist} Group: System Environment/Libraries License: LGPLv2 Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.14/%{name}-%{version}.tar.xz @@ -13,8 +13,7 @@ BuildRequires: libbonobo-devel, pygtk2-devel, intltool, gnome-vfs2-devel Obsoletes: libgsf-gnome < 1.14.22 Obsoletes: libgsf-python < 1.14.26 -Patch0: libgsf-gnome-695907-selinux-use-tmpdir-for-tmpfile.patch -Patch1: libgsf-aarch64.patch +Patch0: libgsf-aarch64.patch %description A library for reading and writing structured files (e.g. MS OLE and Zip) @@ -32,8 +31,7 @@ libgsf. %prep %setup -q -%patch0 -p1 -b .gnome695907-selinux-use-tmpdir-for-tmpfile.patch -%patch1 -p1 -b .aarch64 +%patch0 -p1 -b .aarch64 %build %configure --disable-gtk-doc --disable-static @@ -77,6 +75,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -rf $RPM_BUILD_ROOT %changelog +* Thu Jul 25 2013 Caolán McNamara 1.14.27-1 +- latest version + * Thu Apr 04 2013 Caolán McNamara 1.14.26-4 - Resolves: rhbz#922395 crash on fwrite diff --git a/sources b/sources index 3e3a39f..b175c1e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3c5a4fbd16a727c36974078e6d0e9575 libgsf-1.14.26.tar.xz +12f3693e8ad783a8b78b240cf54e33d9 libgsf-1.14.27.tar.xz