rpms/fmtools/F-12 fmtools.spec, 1.12, 1.13 import.log, 1.7, 1.8 tkradio.py, 1.4, 1.5

[Paulo Roma Cavalcanti]

Author: roma

Update of /cvs/pkgs/rpms/fmtools/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2419/F-12

Modified Files:
	fmtools.spec import.log tkradio.py 
Log Message:
fix grep usage


Index: fmtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fmtools/F-12/fmtools.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- fmtools.spec	6 Jan 2010 07:41:40 -0000	1.12
+++ fmtools.spec	8 Jan 2010 13:43:25 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: Simple Video for Linux radio card programs
 Name:    fmtools
 Version: 2.0
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2+
 Group:   Applications/Multimedia
 URL:     http://www.stanford.edu/~blp/fmtools/
@@ -94,6 +94,9 @@ rm -rf %{buildroot}
 
 %changelog
 
+* Thu Jan 07 2010 Paulo Roma <roma at lcg.ufrj.br> 2.0-10
+- Fixed grep expression in tkradio.py
+
 * Sat Jan 02 2010 Paulo Roma <roma at lcg.ufrj.br> 2.0-9
 - Added libnotify support.
 - Addded compression using oggenc.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fmtools/F-12/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- import.log	6 Jan 2010 07:41:40 -0000	1.7
+++ import.log	8 Jan 2010 13:43:25 -0000	1.8
@@ -5,3 +5,4 @@ fmtools-2_0-6_fc12:F-12:fmtools-2.0-6.fc
 fmtools-2_0-7_fc12:F-12:fmtools-2.0-7.fc12.src.rpm:1261945933
 fmtools-2_0-8_fc12:F-12:fmtools-2.0-8.fc12.src.rpm:1262270955
 fmtools-2_0-9_fc12:F-12:fmtools-2.0-9.fc12.src.rpm:1262763571
+fmtools-2_0-10_fc12:F-12:fmtools-2.0-10.fc12.src.rpm:1262958097


Index: tkradio.py
===================================================================
RCS file: /cvs/pkgs/rpms/fmtools/F-12/tkradio.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- tkradio.py	6 Jan 2010 07:41:40 -0000	1.4
+++ tkradio.py	8 Jan 2010 13:43:25 -0000	1.5
@@ -401,7 +401,7 @@ def main (argv=None):
     print "Python Version: ", pyversion
 
     # check whether tkradio is already running
-    stat = os.popen ( "/bin/ps aux | /bin/grep \"python" + pyversion[0:3] + " " + argv[0] + "\"" ).readline()
+    stat = os.popen ("/bin/ps aux | /bin/grep -E \"python(" + pyversion[0:3] + ")? " + argv[0] + "\"").readline()
     cid = os.getpid()
     if ( stat ): 
          pid = stat.split()[1]