rpms/beryl-manager/devel beryl-manager-0.1.4-pidof.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 beryl-manager.spec, 1.5, 1.6 sources, 1.3, 1.4 beryl-manager-0.1.1-pidof.patch, 1.1, NONE

[Jarod Wilson (jwilson)]

Author: jwilson

Update of /cvs/extras/rpms/beryl-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv645

Modified Files:
	.cvsignore beryl-manager.spec sources 
Added Files:
	beryl-manager-0.1.4-pidof.patch 
Removed Files:
	beryl-manager-0.1.1-pidof.patch 
Log Message:
New upstream release v0.1.4

beryl-manager-0.1.4-pidof.patch:

--- NEW FILE beryl-manager-0.1.4-pidof.patch ---
diff -urp beryl-manager-0.1.4.orig/src/main.c beryl-manager-0.1.4/src/main.c
--- beryl-manager-0.1.4.orig/src/main.c	2006-12-25 11:02:25.000000000 -0500
+++ beryl-manager-0.1.4/src/main.c	2007-01-02 13:45:52.000000000 -0500
@@ -379,7 +379,7 @@ void save_settings()
 }
 gboolean is_running(const gchar * command)
 {
-	gchar *cmd = g_strconcat("pidof ", command, NULL);
+	gchar *cmd = g_strconcat("/sbin/pidof ", command, NULL);
 	gchar *pret;
 	gint i;
 
@@ -595,7 +595,7 @@ void killWM()
 				if (WMs[i].Kill)
 				{
 					gchar *pret;
-					gchar *cm = g_strconcat("pidof ", WMs[i].Grep, NULL);
+					gchar *cm = g_strconcat("/sbin/pidof ", WMs[i].Grep, NULL);
 
 					if (!g_spawn_command_line_sync
 						(cm, &pret, NULL, NULL, NULL))


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/beryl-manager/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Dec 2006 04:25:27 -0000	1.3
+++ .cvsignore	2 Jan 2007 18:48:28 -0000	1.4
@@ -1,2 +1,3 @@
 beryl-manager-0.1.2.tar.bz2
 beryl-manager-0.1.3.tar.bz2
+beryl-manager-0.1.4.tar.bz2


Index: beryl-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/beryl-manager/devel/beryl-manager.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- beryl-manager.spec	13 Dec 2006 04:25:27 -0000	1.5
+++ beryl-manager.spec	2 Jan 2007 18:48:28 -0000	1.6
@@ -2,14 +2,14 @@
 Url:            http://www.beryl-project.org/
 License:        GPL
 Group:          User Interface/Desktops
-Version:        0.1.3
+Version:        0.1.4
 Release:        1%{?dist}
 
 Summary:        Beryl window decorator and theme management utility
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0:        http://releases.beryl-project.org/%{version}/%{name}-%{version}.tar.bz2
 Source1:        beryl-manager.desktop
-Patch0:         beryl-manager-0.1.1-pidof.patch
+Patch0:         beryl-manager-0.1.4-pidof.patch
 
 # libdrm is not available on these arches
 ExcludeArch:    s390 s390x ppc64
@@ -54,7 +54,7 @@
 do
   dest=$(echo ${lang} | cut -d_ -f1)
   mv $RPM_BUILD_ROOT%{_datadir}/locale/${lang} \
-    $RPM_BUILD_ROOT%{_datadir}/locale/${dest}
+    $RPM_BUILD_ROOT%{_datadir}/locale/${dest} 2>&1 > /dev/null
 done 
 %find_lang %{name}
 
@@ -85,6 +85,9 @@
 
 
 %changelog
+* Tue Jan 02 2007 Jarod Wilson <jwilson at redhat.com> 0.1.4-1
+- New upstream release
+
 * Tue Dec 12 2006 Jarod Wilson <jwilson at redhat.com> 0.1.3-1
 - New upstream release
 - Fix up a bunch of locale files (others should get added


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/beryl-manager/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Dec 2006 04:25:27 -0000	1.3
+++ sources	2 Jan 2007 18:48:28 -0000	1.4
@@ -1 +1 @@
-c9559154c20db1bb41d3d480cfdf0299  beryl-manager-0.1.3.tar.bz2
+777359955c1d57f6da11b5ce67ebb37e  beryl-manager-0.1.4.tar.bz2


--- beryl-manager-0.1.1-pidof.patch DELETED ---