rpms/xv/devel xv-3.10a-format.patch,NONE,1.1 xv.spec,1.14,1.15

[Paul Howarth]

Author: pghmcfc

Update of /cvs/nonfree/rpms/xv/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv10826

Modified Files:
	xv.spec 
Added Files:
	xv-3.10a-format.patch 
Log Message:
Fix build with -Werror=format-security

xv-3.10a-format.patch:
 xvpbm.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE xv-3.10a-format.patch ---
--- xvpbm.c
+++ xvpbm.c
@@ -885,8 +885,8 @@ int WritePBM(fp,pic,ptype,w,h,rmap,gmap,
 	  }
 	}
 	else {
-	  if (*pix) fprintf(fp,str1);
-	       else fprintf(fp,str0);
+	  if (*pix) fprintf(fp,"%s",str1);
+	       else fprintf(fp,"%s",str0);
 	  len+=2;
 	  if (len>68) { fprintf(fp,"\n"); len=0; }
 	}


Index: xv.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xv/devel/xv.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xv.spec	31 Aug 2014 20:51:27 -0000	1.14
+++ xv.spec	22 Oct 2014 15:19:21 -0000	1.15
@@ -3,7 +3,7 @@
 
 Name: xv
 Version: %{vprog}.jumbopatch.%{vjumbo}
-Release: 19%{?dist}
+Release: 20%{?dist}
 Summary: Interactive image display program for X
 Summary(de.UTF-8): X-basierender Bild-Viewer für praktische sämtliche Grafiken
 Summary(es.UTF-8): Visualizador de imágenes para X para cuasi todos los formatos de imágenes
@@ -31,6 +31,7 @@
 Patch5: xv-3.10a-libpng15.patch
 Patch6: xv-3.10a-namemax.patch
 Patch7: xv-3.10a-xvcut.patch
+Patch8: xv-3.10a-format.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libtiff-devel libpng-devel jasper-devel desktop-file-utils
 %if "%{?rhel}" != "4"
@@ -150,6 +151,9 @@
 # cut/paste fix for 24bit+ images
 %patch7 -p1
 
+# fix build with -Werror=format-security
+%patch8
+
 # Include permission to distribute
 %{__install} -m 0644 -p %{SOURCE2} .
 
@@ -285,6 +289,9 @@
 %doc %{_docdir}/%{name}-%{vprog}/manuals/
 
 %changelog
+* Wed Oct 22 2014 Paul Howarth <paul at city-fan.org> 3.10a.jumbopatch.20070520-20
+- Fix build with -Werror=format-security
+
 * Sun Aug 31 2014 Sérgio Basto <sergio at serjux.com> - 3.10a.jumbopatch.20070520-19
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
@@ -348,7 +355,7 @@
 * Fri Jan 18 2008 Gabriel Somlo <somlo at cmu.edu> 3.10a.jumbopatch.20070520-5
 - fix window destroy, file dialog bugs (thanks to <Ian.Collier at comlab.ox.ac.uk>)
 
-* Sun Dec 17 2007 Gabriel Somlo <somlo at cmu.edu> 3.10a.jumbopatch.20070520-4
+* Mon Dec 17 2007 Gabriel Somlo <somlo at cmu.edu> 3.10a.jumbopatch.20070520-4
 - added icon
 
 * Fri Dec 14 2007 Gabriel Somlo <somlo at cmu.edu> 3.10a.jumbopatch.20070520-3