[gtksourceview] Add patch for format-security FTBFS

Peter Robinson pbrobinson at fedoraproject.org
Sat Apr 26 10:17:41 UTC 2014


commit 84ae3d02d3f25e8c57cbeb3a2ebeb2e89185a3bf
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sat Apr 26 11:17:19 2014 +0100

    Add patch for format-security FTBFS

 gtksourceview-format-security.patch |   11 +++++++++++
 gtksourceview.spec                  |   17 ++++++++---------
 2 files changed, 19 insertions(+), 9 deletions(-)
---
diff --git a/gtksourceview-format-security.patch b/gtksourceview-format-security.patch
new file mode 100644
index 0000000..2d71605
--- /dev/null
+++ b/gtksourceview-format-security.patch
@@ -0,0 +1,11 @@
+--- gtksourceview-1.8.5/tests/test-widget.c.orig	2014-04-26 11:04:57.142120367 +0100
++++ gtksourceview-1.8.5/tests/test-widget.c	2014-04-26 11:05:40.432727665 +0100
+@@ -190,7 +190,7 @@
+ 					 GTK_DIALOG_DESTROY_WITH_PARENT,
+ 					 GTK_MESSAGE_ERROR,
+ 					 GTK_BUTTONS_OK,
+-					 tmp);
++					 "%s", tmp);
+ 	g_free (tmp);
+ 	
+ 	gtk_dialog_run (GTK_DIALOG (dialog));
diff --git a/gtksourceview.spec b/gtksourceview.spec
index 5ff5834..ceadffc 100644
--- a/gtksourceview.spec
+++ b/gtksourceview.spec
@@ -6,15 +6,17 @@
 Summary: A library for viewing source files
 Name: gtksourceview
 Version: 1.8.5
-Release: 14%{?dist} 
+Release: 15%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://gtksourceview.sourceforge.net/ 
+
 Source0: http://ftp.gnome.org/pub/gnome/sources/gtksourceview/1.8/%{name}-%{version}.tar.bz2
 Patch0: use-gnu.patch
 Patch1: fix-build.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
+Patch2: gtksourceview-format-security.patch
+
 BuildRequires: gnome-vfs2-devel
 BuildRequires: libxml2-devel
 BuildRequires: gtk2-devel >= %{gtk2_version}
@@ -45,15 +47,14 @@ applications which use GtkSourceView.
 %setup -q
 %patch0 -p1 -b .use-gnu
 %patch1 -p1 -b .fix-build
+%patch2 -p1 -b .format-security
 
 %build
-
 %configure --disable-gtk-doc --disable-static
 
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # remove unwanted files
@@ -65,23 +66,21 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 %postun -p /sbin/ldconfig
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files -f %{po_package}.lang
-%defattr(-,root,root,-)
 %doc README AUTHORS COPYING NEWS MAINTAINERS ChangeLog
 %{_datadir}/gtksourceview-1.0
 %{_libdir}/*.so.*
 
 %files devel
-%defattr(-,root,root,-)
 %{_includedir}/gtksourceview-1.0
 %{_datadir}/gtk-doc/html/gtksourceview
 %{_libdir}/pkgconfig/*.pc
 %{_libdir}/*.so
 
 %changelog
+* Sat Apr 26 2014 Peter Robinson <pbrobinson at fedoraproject.org> 1:1.8.5-15
+- Add patch for format-security FTBFS
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.8.5-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 


More information about the scm-commits mailing list