SPECS: lkmonitor.spec - add patch, conflict with gnome-desktop

wolvverine wolvverine at pld-linux.org
Mon Jan 21 13:00:14 CET 2008


Author: wolvverine                   Date: Mon Jan 21 12:00:14 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- add patch, conflict with gnome-desktop

---- Files affected:
SPECS:
   lkmonitor.spec (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: SPECS/lkmonitor.spec
diff -u SPECS/lkmonitor.spec:1.12 SPECS/lkmonitor.spec:1.13
--- SPECS/lkmonitor.spec:1.12	Mon Jan 21 12:29:55 2008
+++ SPECS/lkmonitor.spec	Mon Jan 21 13:00:09 2008
@@ -11,6 +11,7 @@
 URL:		http://lkmonitor.sourceforge.net/
 Patch0:		%{name}-pixmapsdir.patch
 Patch1:		%{name}-locale.patch
+Patch2:		%{name}-pixmaps.patch
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	libgnomeui-devel >= 2.0
@@ -35,8 +36,10 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 for i in po/es_ES.*; do mv "$i" `echo "$i" | sed 's/es_ES\./es\./'`; done
 for i in po/zh.*; do mv "$i" `echo "$i" | sed 's/zh\./zh_CN\./'`; done
+mv pixmaps/gnome-computer.png pixmaps/gnome-workstation.png
 
 %build
 %{__aclocal}
@@ -76,6 +79,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2008-01-21 12:00:09  wolvverine
+- add patch, conflict with gnome-desktop
+
 Revision 1.12  2008-01-21 11:29:55  wolvverine
 - correct locales patch
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/lkmonitor.spec?r1=1.12&r2=1.13&f=u



More information about the pld-cvs-commit mailing list