X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=blobdiff_plain;f=WindowMaker.spec;h=96980cd624ecbed3db9e4fa1725dfa6b45968f16;hb=ddd784990b2cd63a3d05527e931debe6d1295ff5;hp=c920dbfc6220e6357fdf25080864b7360ff575bc;hpb=4b57c242f018ba97306bb176dbbfb1e17ca54c00;p=packages%2FWindowMaker.git

diff --git a/WindowMaker.spec b/WindowMaker.spec
index c920dbf..96980cd 100644
--- 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:	10
+Release:	13
 License:	GPL
 Group:		X11/Window Managers
 Source0:	ftp://windowmaker.info/pub/source/release/%{name}-%{version}.tar.gz
@@ -34,20 +34,24 @@ 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
+BuildRequires:	pkgconfig
+BuildRequires:	sed >= 4.0
 BuildRequires:	xorg-lib-libXext-devel
 BuildRequires:	xorg-lib-libXft-devel
 BuildRequires:	xorg-lib-libXpm-devel
 Requires:	%{name}-libs = %{version}-%{release}
+Requires:	Esetroot
 Requires:	cpp >= 6:4.0.0
 Requires:	gnustep-dirs
 Requires:	tk
@@ -232,14 +236,14 @@ 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
-	sed -i s,/usr/lib/GNUstep/,%{_libdir}/GNUstep/, $f
-	sed -i s,/usr/local/GNUstep/,%{_libdir}/GNUstep/, $f
+	%{__sed} -i s,/GNUstep/Apps,/GNUstep/Applications, $f
+	%{__sed} -i s,%{_libdir}/GNUstep/,%{_libdir}/GNUstep/, $f
+	%{__sed} -i s,%{_prefix}/local/GNUstep/,%{_libdir}/GNUstep/, $f
 done
 
-
 mv -f po/{no,nb}.po
 
 %build
@@ -306,10 +310,10 @@ install contrib/dockit.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
 install WindowMaker-data/pixmaps/* $RPM_BUILD_ROOT%{_pixmapsdir}
 #install %{SOURCE3} $RPM_BUILD_ROOT%{_wmpropsdir}
-sed s,@LIBDIR@,%{_libdir}, %{SOURCE3} > $RPM_BUILD_ROOT%{_wmpropsdir}/WindowMaker.desktop
+%{__sed} s,@LIBDIR@,%{_libdir}, %{SOURCE3} > $RPM_BUILD_ROOT%{_wmpropsdir}/WindowMaker.desktop
 
 install %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/xsessions/WindowMaker.desktop
-#sed s,@LIBDIR@,%{_libdir}, %{SOURCE6} >  $RPM_BUILD_ROOT%{_datadir}/xsessions/WindowMaker.desktop
+#%{__sed} s,@LIBDIR@,%{_libdir}, %{SOURCE6} >  $RPM_BUILD_ROOT%{_datadir}/xsessions/WindowMaker.desktop
 
 
 %{__make} -C %{name}-extra-%{extraver} install \