Resolves: (well, push it along a bit) rhbz#921311 selinux foo

This commit is contained in:
Caolán McNamara 2013-03-15 12:11:58 +00:00
parent bcd2a2c1b9
commit a519603a7d
2 changed files with 39 additions and 1 deletions

View File

@ -0,0 +1,32 @@
--- 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,20 +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");
- exit (EXIT_FAILURE);
- }
-
- file = fdopen (fd, "w");
- if (!file) {
- show_error_string_and_exit ("Could not open temporary file for writing");
+ 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);
}

View File

@ -1,7 +1,7 @@
Summary: GNOME Structured File library
Name: libgsf
Version: 1.14.26
Release: 1%{?dist}
Release: 2%{?dist}
Group: System Environment/Libraries
License: LGPLv2
Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.14/%{name}-%{version}.tar.xz
@ -13,6 +13,8 @@ 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
%description
A library for reading and writing structured files (e.g. MS OLE and Zip)
@ -29,6 +31,7 @@ libgsf.
%prep
%setup -q
%patch0 -p1 -b .gnome695907-selinux-use-tmpdir-for-tmpfile.patch
%build
%configure --disable-gtk-doc --disable-static
@ -72,6 +75,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
rm -rf $RPM_BUILD_ROOT
%changelog
* Fri Mar 15 2013 Caolán McNamara <caolanm@redhat.com> 1.14.26-2
- Resolves: (well, push it along a bit) rhbz#921311 selinux foo
* Mon Mar 04 2013 Caolán McNamara <caolanm@redhat.com> 1.14.26-1
- latest version
- drop integrated gnome689706.gsf_input_dup.patch