rpms/pydict/F-7 pydict-trans.patch,1.1,1.2 pydict.spec,1.13,1.14

[Hu Zheng (zhu)]

Author: zhu

Update of /cvs/pkgs/rpms/pydict/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18119/F-7

Modified Files:
	pydict-trans.patch pydict.spec 
Log Message:
add encoding tag

pydict-trans.patch:

Index: pydict-trans.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pydict/F-7/pydict-trans.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pydict-trans.patch	9 Sep 2004 10:57:25 -0000	1.1
+++ pydict-trans.patch	27 Jun 2007 07:01:01 -0000	1.2
@@ -0,0 +1,94 @@
+diff -ru pydict.orig/dictBackend.py pydict/dictBackend.py
+--- pydict.orig/dictBackend.py	2007-06-27 14:36:10.000000000 +0800
++++ pydict/dictBackend.py	2007-06-27 14:40:05.000000000 +0800
+@@ -1,4 +1,5 @@
+ #!/usr/bin/python
++# -*- coding: utf-8 -*-
+ 
+ import string
+ import os
+diff -ru pydict.orig/mainWindow.py pydict/mainWindow.py
+--- pydict.orig/mainWindow.py	2007-06-27 14:36:10.000000000 +0800
++++ pydict/mainWindow.py	2007-06-27 14:46:27.000000000 +0800
+@@ -22,11 +22,11 @@
+ 
+ class mainWindow:
+     def destroy(self, *args):
+-        gtk.mainquit()
++        gtk.main_quit()
+ 
+     def on_menu_about(self, *args):
+         adialog = gtk.Dialog("About pydict2", self.mainWindow, gtk.DIALOG_MODAL, (gtk.STOCK_OK, gtk.RESPONSE_OK))
+-        hbox = gtk.HBox(gtk.FALSE, 8)
++        hbox = gtk.HBox(False, 8)
+         hbox.set_border_width(8)
+         adialog.vbox.pack_start(hbox)
+ 
+@@ -83,11 +83,11 @@
+ 	self.cbutton = gtk.CheckButton(_("Smart Search"))
+ 	self.cbutton.connect("toggled", self.on_cbutton_clicked)
+         #--
+-        self.searchbar.pack_start(self.entry, gtk.TRUE)
+-        self.searchbar.pack_start(self.sbutton, gtk.FALSE)
+-        self.searchbar.pack_start(self.cbutton, gtk.FALSE)
+-	self.searchbar.pack_start(self.etocradio, gtk.FALSE)
+-	self.searchbar.pack_start(self.ctoeradio, gtk.FALSE)
++        self.searchbar.pack_start(self.entry, True)
++        self.searchbar.pack_start(self.sbutton, False)
++        self.searchbar.pack_start(self.cbutton, False)
++	self.searchbar.pack_start(self.etocradio, False)
++	self.searchbar.pack_start(self.ctoeradio, False)
+ 
+         # -- HBox for Word and Dictionary
+ 	self.dictbox = gtk.HBox()
+@@ -110,13 +110,13 @@
+         self.dicttextSW.set_shadow_type(gtk.SHADOW_IN)
+         self.dicttextSW.add(self.dicttext)
+ 	# --
+-	self.dictbox.pack_start(self.wordlistSW, gtk.TRUE)
+-	self.dictbox.pack_start(self.dicttextSW, gtk.TRUE)
++	self.dictbox.pack_start(self.wordlistSW, True)
++	self.dictbox.pack_start(self.dicttextSW, True)
+ 
+         #-------------------Packing--------------------#
+-        self.toplevelVBox.pack_start(self.menuBar, gtk.FALSE)
+-        self.toplevelVBox.pack_start(self.searchbar, gtk.FALSE)
+-        self.toplevelVBox.pack_start(self.dictbox, gtk.TRUE)
++        self.toplevelVBox.pack_start(self.menuBar, False)
++        self.toplevelVBox.pack_start(self.searchbar, False)
++        self.toplevelVBox.pack_start(self.dictbox, True)
+ 
+ 	self.mainWindow.add(self.toplevelVBox)
+         #self.mainWindow.set_size_request(600, 500)
+@@ -124,13 +124,13 @@
+ 	self.backend = dictBackend.dictBackend()
+ 
+         self.mainWindow.show_all()
+-        gtk.mainloop()
++        gtk.main()
+ 
+ 	
+     def on_select_row_wordlist(self, *args):
+         text = gtk.TextBuffer(None)
+ 	word = self.wordlist.get_text(args[1], args[2])
+-	text = self.backend.search_word(word, gtk.FALSE, 0)
++	text = self.backend.search_word(word, False, 0)
+ 	self.dicttext.set_buffer(text)
+ 	
+     def on_entry_press(self, *args):
+@@ -138,13 +138,13 @@
+ 	    self.sbutton.clicked()    
+ 
+     def on_sbutton_clicked(self, *args):
+-        search_all = gtk.FALSE
++        search_all = False
+ 
+ 	text = gtk.TextBuffer(None)
+ 	#Check if it is Chn to Eng
+ 	if self.ctoeradio.get_active():
+ 	    search_all = 1
+-        text = self.backend.search_word(self.entry.get_text(), gtk.TRUE, search_all)
++        text = self.backend.search_word(self.entry.get_text(), True, search_all)
+ 	self.dicttext.set_buffer(text)
+ 
+         #update Word List


Index: pydict.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pydict/F-7/pydict.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- pydict.spec	5 Jun 2006 22:18:29 -0000	1.13
+++ pydict.spec	27 Jun 2007 07:01:01 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: English/Chinese Dictionary written with python/gtk
 Name:      pydict
 Version:   0.3.0
-Release:   9
+Release:   10%{?dist}
 Source0:   pydict-%{version}.tar.gz
 Patch: pydict-trans.patch
 Patch1: pydict-0.3.0-python.patch
@@ -57,6 +57,9 @@
 /usr/share/icons/dict.xpm
 
 %changelog
+* Wed Jun 27 2007 Hu Zheng <zhu at redhat.com> - 0.3.0-10
+- add encoding tag
+
 * Mon Jun 05 2006 Jesse Keating <jkeating at redhat.com> - 0.3.0-9
 - Added missing BuildRequires desktop-file-utils