Author: lisu Date: Wed Apr 13 09:40:35 2011 GMT Module: packages Tag: HEAD ---- Log message: - BR: sed >= 4.0, use __sed macro - R: Esetroot - rel 13
---- Files affected: packages/WindowMaker: WindowMaker.spec (1.191 -> 1.192) ---- Diffs: ================================================================ Index: packages/WindowMaker/WindowMaker.spec diff -u packages/WindowMaker/WindowMaker.spec:1.191 packages/WindowMaker/WindowMaker.spec:1.192 --- packages/WindowMaker/WindowMaker.spec:1.191 Sat Feb 6 03:03:45 2010 +++ packages/WindowMaker/WindowMaker.spec Wed Apr 13 11:40:29 2011 @@ -10,7 +10,7 @@ Summary(uk.UTF-8): WindowMaker - віконний менеджер для X11 Name: WindowMaker Version: 0.92.0 -Release: 12 +Release: 13 License: GPL Group: X11/Window Managers Source0: ftp://windowmaker.info/pub/source/release/%{name}-%{version}.tar.gz @@ -47,10 +47,12 @@ 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 @@ -238,9 +240,9 @@ %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 @@ -309,10 +311,10 @@ 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 \ @@ -402,6 +404,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.192 2011/04/13 09:40:29 lisu +- BR: sed >= 4.0, use __sed macro +- R: Esetroot +- rel 13 + Revision 1.191 2010/02/06 02:03:45 sparky - BR: pkgconfig ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/WindowMaker/WindowMaker.spec?r1=1.191&r2=1.192&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
