rpms/fmtools/F-12 fmtools.spec, 1.7, 1.8 import.log, 1.2, 1.3 tkradio.py, 1.1, 1.2

[Paulo Roma Cavalcanti]

Author: roma

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

Modified Files:
	fmtools.spec import.log tkradio.py 
Log Message:
fixed dependencies


Index: fmtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fmtools/F-12/fmtools.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- fmtools.spec	24 Dec 2009 10:26:36 -0000	1.7
+++ fmtools.spec	24 Dec 2009 11:55:00 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: Simple Video for Linux radio card programs
 Name:    fmtools
 Version: 2.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group:   Applications/Multimedia
 URL:     http://www.stanford.edu/~blp/fmtools/
@@ -40,7 +40,7 @@ Summary:       Python/Tk wrapper for fmt
 Group:         Applications/Multimedia
 BuildRequires: desktop-file-utils
 Requires:      %{name} = %{version}
-Requires:      python, tk, alsa-utils
+Requires:      python, tkinter, alsa-utils
 BuildArch:     noarch
 
 %description tkradio
@@ -95,6 +95,9 @@ rm -rf %{buildroot}
 
 %changelog
 
+* Sun Dec 23 2009 Paulo Roma <roma at lcg.ufrj.br> 2.0-5
+- Replaced BR tk for tkinter.
+
 * Sun Dec 23 2009 Paulo Roma <roma at lcg.ufrj.br> 2.0-4
 - Include tkradio.py
 - Fixed fmtools.desktop


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fmtools/F-12/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	24 Dec 2009 10:26:36 -0000	1.2
+++ import.log	24 Dec 2009 11:55:00 -0000	1.3
@@ -1,2 +1,3 @@
 fmtools-2_0-3_fc12:F-12:fmtools-2.0-3.fc12.src.rpm:1261394532
 fmtools-2_0-4_fc12:F-12:fmtools-2.0-4.fc12.src.rpm:1261650364
+fmtools-2_0-5_fc12:F-12:fmtools-2.0-5.fc12.src.rpm:1261655654


Index: tkradio.py
===================================================================
RCS file: /cvs/pkgs/rpms/fmtools/F-12/tkradio.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- tkradio.py	24 Dec 2009 10:26:36 -0000	1.1
+++ tkradio.py	24 Dec 2009 11:55:00 -0000	1.2
@@ -78,11 +78,11 @@ def readStations ( ):
 
     path = os.environ.get("HOME")
     fname = path+"/.radiostations"
-    if ( not fname ):
+    if ( not os.path.exists (fname) ):
          fname = path+"/.fmrc"
 
     lst = []
-    if ( fname ):
+    if ( os.path.exists (fname) ):
        textf = open(fname, 'r')
 
        for line in textf:
@@ -115,11 +115,11 @@ def main (argv=None):
     mw.title ("tkradio")
 
     s = readStations ( )
-    if ( s ):
-         stations = s
+    if ( not s ):
+         s = stations
 
     # make tuner buttons
-    for st in stations:
+    for st in s:
         Radiobutton(bot,text=st[0],value=st[1],variable=station,command=setstation).pack(anchor=W)
 
     scale = Scale(top, from_=0, to=100, orient=HORIZONTAL, command=on_move, bd=0,
@@ -147,6 +147,6 @@ def main (argv=None):
 try:
   if __name__=="__main__":
      sys.exit(main())
-except:
+except KeyboardInterrupt:
      radio ("off")
-     sys.exit(1)
+     sys.exit('Bye, bye')