packages: WindowMaker/WindowMaker.spec - s, GNUstep/Apps, GNUstep/Application...

[evil]

Author: evil                         Date: Sat Nov 28 21:41:36 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- s,GNUstep/Apps,GNUstep/Applications,
- sed rule fixing WPrefs path in 64bit builds, according to new WindowMaker.desktop

---- Files affected:
packages/WindowMaker:
   WindowMaker.spec (1.187 -> 1.188) 

---- Diffs:

================================================================
Index: packages/WindowMaker/WindowMaker.spec
diff -u packages/WindowMaker/WindowMaker.spec:1.187 packages/WindowMaker/WindowMaker.spec:1.188
--- packages/WindowMaker/WindowMaker.spec:1.187	Thu Nov 26 18:37:15 2009
+++ packages/WindowMaker/WindowMaker.spec	Sat Nov 28 22:41:31 2009
@@ -10,7 +10,7 @@
 Summary(uk.UTF-8):	WindowMaker - віконний менеджер для X11
 Name:		WindowMaker
 Version:	0.92.0
-Release:	9
+Release:	10
 License:	GPL
 Group:		X11/Window Managers
 Source0:	ftp://windowmaker.info/pub/source/release/%{name}-%{version}.tar.gz
@@ -235,10 +235,12 @@
 %patch13 -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
 done
 
+
 mv -f po/{no,nb}.po
 
 %build
@@ -270,7 +272,7 @@
 	--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 \
@@ -304,9 +306,12 @@
 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, at LIBDIR@,%{_libdir}, %{SOURCE3} > $RPM_BUILD_ROOT%{_wmpropsdir}/WindowMaker.desktop
 
 install %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/xsessions/WindowMaker.desktop
+#sed s, at LIBDIR@,%{_libdir}, %{SOURCE6} >  $RPM_BUILD_ROOT%{_datadir}/xsessions/WindowMaker.desktop
+
 
 %{__make} -C %{name}-extra-%{extraver} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -395,6 +400,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.188  2009/11/28 21:41:31  evil
+- s,GNUstep/Apps,GNUstep/Applications,
+- sed rule fixing WPrefs path in 64bit builds, according to new WindowMaker.desktop
+
 Revision 1.187  2009/11/26 17:37:15  evil
 - s/patch13\ -p0/patch13\ -p1/
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/WindowMaker/WindowMaker.spec?r1=1.187&r2=1.188&f=u