- rel 19; fix build

diff --git a/WindowMaker-format.patch b/WindowMaker-format.patch
new file mode 100644 (file)
index 0000000..a6ac461
--- /dev/null
+++ b/WindowMaker-format.patch
@@ -0,0 +1,14 @@
+--- WindowMaker-0.92.0/wrlib/nxpm.c~   2004-10-12 20:21:53.000000000 +0200
++++ WindowMaker-0.92.0/wrlib/nxpm.c    2013-11-07 13:40:23.762829654 +0100
+@@ -644,9 +644,9 @@
+             if (!a || *a>127) {
+                 tmpc = lookfor(colormap, (unsigned)*r<<16|(unsigned)*g<<8|(unsigned)*b);
+ 
+-                fprintf(file, index2str(buf, tmpc->index, charsPerPixel));
++                fprintf(file, "%s", index2str(buf, tmpc->index, charsPerPixel));
+             } else {
+-                fprintf(file, transp);
++                fprintf(file, "%s", transp);
+             }
+ 
+             if (a) {

diff --git a/WindowMaker.spec b/WindowMaker.spec
index d760a7cdb304452fc41fbf7d83e2df0d98ee0d0f..da5ecfda6dc3665ed9f5b5226bc5a3fa35eab102 100644 (file)
--- a/WindowMaker.spec
+++ b/WindowMaker.spec
@@ -12,7 +12,7 @@ Summary(ru.UTF-8):    WindowMaker - оконный менеджер для X11
 Summary(uk.UTF-8):     WindowMaker - віконний менеджер для X11
 Name:          WindowMaker
 Version:       0.92.0
-Release:       18
+Release:       19
 License:       GPL
 Group:         X11/Window Managers
 Source0:       ftp://windowmaker.info/pub/source/release/%{name}-%{version}.tar.gz
@@ -39,6 +39,7 @@ Patch12:      %{name}-gnustep.patch
 Patch13:       %{name}-wine.patch
 Patch14:       %{name}-libpng14.patch
 Patch15:       %{name}-libpng15.patch
+Patch16:       %{name}-format.patch
 URL:           http://www.windowmaker.info/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -243,6 +244,7 @@ utilizando componentes estáticos (raramente necessário).
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
 
 for f in WindowMaker/*menu*; do
        %{__sed} -i s,/GNUstep/Apps,/GNUstep/Applications, $f
@@ -369,7 +371,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/GNUstep/Applications/WPrefs.app/WPrefs
 
 %{_libdir}/GNUstep/Applications/WPrefs.app/tiff
-%{_libdir}/GNUstep/Applications/WPrefs.app/xpm
 %{_libdir}/GNUstep/Applications/WPrefs.app/WPrefs.tiff
 %{_libdir}/GNUstep/Applications/WPrefs.app/WPrefs.xpm