rpms/comix/devel comix-4.0.3-filechooser.patch, NONE, 1.1 .cvsignore, 1.13, 1.14 comix.spec, 1.22, 1.23 sources, 1.13, 1.14

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/comix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27707

Modified Files:
	.cvsignore comix.spec sources 
Added Files:
	comix-4.0.3-filechooser.patch 
Log Message:
* Mon Feb 23 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.0.3-1
- 4.0.3
- Modify icon cache updating scriptlets to follow latest guidelines
- Patch for filechooser.py to prevent file choice failure


comix-4.0.3-filechooser.patch:

--- NEW FILE comix-4.0.3-filechooser.patch ---
--- src/filechooser.py.debug	2009-02-16 01:44:39.000000000 +0900
+++ src/filechooser.py	2009-02-23 15:29:36.000000000 +0900
@@ -195,9 +195,12 @@
 
     def files_chosen(self, paths):
         if paths:
-            current_filter_index = self.filechooser.list_filters().index(
-                self.filechooser.get_filter())
-            prefs['last filter in main filechooser'] = current_filter_index
+            try:
+                current_filter_index = self.filechooser.list_filters().index(
+                    self.filechooser.get_filter())
+                prefs['last filter in main filechooser'] = current_filter_index
+            except:
+                pass
             _close_main_filechooser_dialog()
             self._window.file_handler.open_file(paths[0])
         else:
@@ -255,9 +258,12 @@
             else:
                 prefs['auto add books into collections'] = False
                 collection_name = None
-            current_filter_index = self.filechooser.list_filters().index(
-                self.filechooser.get_filter())
-            prefs['last filter in library filechooser'] = current_filter_index
+            try:
+                current_filter_index = self.filechooser.list_filters().index(
+                    self.filechooser.get_filter())
+                prefs['last filter in library filechooser'] = current_filter_index
+            except:
+                pass
             close_library_filechooser_dialog()
             self._library.add_books(paths, collection_name)
         else:


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/comix/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	26 Jan 2009 17:07:39 -0000	1.13
+++ .cvsignore	23 Feb 2009 06:54:54 -0000	1.14
@@ -1,2 +1 @@
-comix-4.0.3-rc1.tar.gz
-comix-ja.po.gz
+comix-4.0.3.tar.gz


Index: comix.spec
===================================================================
RCS file: /cvs/extras/rpms/comix/devel/comix.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- comix.spec	26 Jan 2009 17:07:39 -0000	1.22
+++ comix.spec	23 Feb 2009 06:54:55 -0000	1.23
@@ -4,10 +4,10 @@
 # tar czf comix-%%mainver-%%alphatag.tar.gz comix-%%mainver
 
 %define		mainver		4.0.3
-%define		alphatag	rc1
+%undefine		alphatag	
 %define		comix4		1
 
-%define		ifalpha		1
+%undefine		ifalpha		
 %define		fedorarel	1
 
 Name:		comix
@@ -23,7 +23,8 @@
 %else
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 %endif
-Source1:	comix-ja.po.gz
+# Need contact with upstream
+Patch0:		comix-4.0.3-filechooser.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
@@ -49,7 +50,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}%{?ifalpha:-%alphatag}
-gzip -dc %SOURCE1 > messages/ja/LC_MESSAGES/comix.po
+%patch0 -p0 -b .filechooser
 
 %{__mkdir_p} TMPBIN
 cd TMPBIN
@@ -122,7 +123,6 @@
 	%{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null
 
 touch --no-create %{_datadir}/icons/hicolor
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
 
 update-desktop-database &> /dev/null
 update-mime-database %{_datadir}/mime &> /dev/null
@@ -139,12 +139,17 @@
 exit 0
 
 %postun
+update-desktop-database &> /dev/null
+update-mime-database %{_datadir}/mime &> /dev/null
+
+[ $1 -eq 0 ] || exit 0
 touch --no-create %{_datadir}/icons/hicolor
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
 
-update-desktop-database &> /dev/null
-update-mime-database %{_datadir}/mime &> /dev/null
+exit 0
 
+%posttrans
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
 exit 0
 
 %files -f %{name}.lang
@@ -177,6 +182,11 @@
 
 
 %changelog
+* Mon Feb 23 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.0.3-1
+- 4.0.3
+- Modify icon cache updating scriptlets to follow latest guidelines
+- Patch for filechooser.py to prevent file choice failure
+
 * Tue Jan 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.0.3-0.1.rc1
 - 4.0.3 rc1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/comix/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	26 Jan 2009 17:07:39 -0000	1.13
+++ sources	23 Feb 2009 06:54:55 -0000	1.14
@@ -1,2 +1 @@
-ceafa1334e0f0f9f091a1a8704d2262f  comix-4.0.3-rc1.tar.gz
-ab1b42af115291a39b09a9d9f33ed383  comix-ja.po.gz
+e5bd7acefe3950c2fdaf8785edd27b7e  comix-4.0.3.tar.gz