- BR: sed >= 4.0, use __sed macro

[packages/WindowMaker.git] / WindowMaker.spec

diff --git a/WindowMaker.spec b/WindowMaker.spec
index 747956845bcb0060ca32a8296d3bd5df999af929..96980cd624ecbed3db9e4fa1725dfa6b45968f16 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:       9
+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
@@ -231,11 +235,13 @@ utilizando componentes estáticos (raramente necessário).
 %patch10 -p1
 %patch11 -p1
 %patch12 -p0
-%patch13 -p0
+%patch13 -p1
+%patch14 -p1
 
 for f in WindowMaker/*menu*; do
-       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
@@ -269,7 +275,7 @@ cd ..
        --enable-shared \
        --enable-static \
        --enable-usermenu \
-       --with-appspath=%{_libdir}/GNUstep/Apps \
+       --with-appspath=%{_libdir}/GNUstep/Applications \
        --with-nlsdir=%{_datadir}/locale \
        --with-gnustepdir=%{_libdir}/GNUstep \
        --enable-sound \
@@ -303,9 +309,12 @@ install contrib/dockit   $RPM_BUILD_ROOT%{_bindir}
 install contrib/dockit.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
 install WindowMaker-data/pixmaps/* $RPM_BUILD_ROOT%{_pixmapsdir}
-install %{SOURCE3} $RPM_BUILD_ROOT%{_wmpropsdir}
+#install %{SOURCE3} $RPM_BUILD_ROOT%{_wmpropsdir}
+%{__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
+
 
 %{__make} -C %{name}-extra-%{extraver} install \
        DESTDIR=$RPM_BUILD_ROOT