- rel 12

- fix for libpng-1.4.x

Changed files:
    WindowMaker-libpng14.patch -> 1.1
    WindowMaker.spec -> 1.190

diff --git a/WindowMaker-libpng14.patch b/WindowMaker-libpng14.patch
new file mode 100644 (file)
index 0000000..d674a03
--- /dev/null
+++ b/WindowMaker-libpng14.patch
@@ -0,0 +1,11 @@
+--- WindowMaker-0.92.0/wrlib/load.c~   2004-10-12 20:21:31.000000000 +0200
++++ WindowMaker-0.92.0/wrlib/load.c    2010-02-06 02:46:45.676390539 +0100
+@@ -348,7 +348,7 @@
+ 
+ #ifdef USE_PNG
+     /* check for PNG */
+-    if (png_check_sig(buffer, 8))
++    if (png_sig_cmp(buffer, 0, 8))
+         return IM_PNG;
+ #endif
+ 

diff --git a/WindowMaker.spec b/WindowMaker.spec
index be785285b71bf2c43707536ccdd36e1e6dfe411e..fd4f71035f75aa7b03ceede6a7b6250ef2c47c64 100644 (file)
--- a/WindowMaker.spec
+++ b/WindowMaker.spec
@@ -9,7 +9,7 @@ Summary(ru.UTF-8):      WindowMaker - оконный менеджер для X11
 Summary(uk.UTF-8):     WindowMaker - віконний менеджер для X11
 Name:          WindowMaker
 Version:       0.92.0
-Release:       11
+Release:       12
 License:       GPL
 Group:         X11/Window Managers
 Source0:       ftp://windowmaker.info/pub/source/release/%{name}-%{version}.tar.gz
@@ -34,13 +34,14 @@ Patch10:    %{name}-localenames.patch
 Patch11:       %{name}-0.91.0-translucency-1.patch
 Patch12:       %{name}-gnustep.patch
 Patch13:       %{name}-wine.patch
+Patch14:       %{name}-libpng14.patch
 URL:           http://www.windowmaker.info/
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: gettext-devel
 BuildRequires: giflib-devel
 BuildRequires: libjpeg-devel >= 6b
-BuildRequires: libpng-devel >= 1.0.8
+BuildRequires: libpng-devel >= 2:1.4.0
 BuildRequires: libtiff-devel
 BuildRequires: libtool >= 1:1.4.2-9
 BuildRequires: perl-base
@@ -232,6 +233,7 @@ utilizando componentes estáticos (raramente necessário).
 %patch11 -p1
 %patch12 -p0
 %patch13 -p1
+%patch14 -p1
 
 for f in WindowMaker/*menu*; do
        sed -i s,/GNUstep/Apps,/GNUstep/Applications, $f
@@ -239,7 +241,6 @@ for f in WindowMaker/*menu*; do
        sed -i s,/usr/local/GNUstep/,%{_libdir}/GNUstep/, $f
 done
 
-
 mv -f po/{no,nb}.po
 
 %build