rpms/gnomecatalog/F-10 gnomecatalog-fstypes.patch, NONE, 1.1 gnomecatalog.spec, 1.4, 1.5 import.log, 1.1, 1.2

[Marc Wiriadisastra]

Author: mwiriadi

Update of /cvs/pkgs/rpms/gnomecatalog/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21098/F-10

Modified Files:
	gnomecatalog.spec import.log 
Added Files:
	gnomecatalog-fstypes.patch 
Log Message:
Update the spec file to take into account rel eng work
Fix bug bz 509237 which relates to permission within the /tmp directory



gnomecatalog-fstypes.patch:
 fstypes.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE gnomecatalog-fstypes.patch ---
--- gnomecatalog-0.3.4.2-orig/gnomecatalog/fstypes.py	2008-01-17 05:47:02.000000000 +0900
+++ gnomecatalog-0.3.4.2/gnomecatalog/fstypes.py	2009-10-22 07:53:01.000000000 +0800
@@ -144,8 +144,9 @@
 			self.icon = icon
 
 		if type(icon) == buffer:
-			open('/tmp/tmp_gnomecatalog_icon.png', 'wb').write(icon)
-			self.icon =  gtk.gdk.pixbuf_new_from_file_at_size("/tmp/tmp_gnomecatalog_icon.png", 24, 24)
+			tmp_icon_filename = "/tmp/tmp_gnomecatalog_icon.png."+str(os.getuid())
+                        open(tmp_icon_filename, 'wb').write(icon)
+                        self.icon =  gtk.gdk.pixbuf_new_from_file_at_size(tmp_icon_filename, 24, 24)
 
 		if not db:
 			self._data_loaded = True


Index: gnomecatalog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnomecatalog/F-10/gnomecatalog.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gnomecatalog.spec	20 Jun 2009 05:01:39 -0000	1.4
+++ gnomecatalog.spec	22 Oct 2009 10:44:00 -0000	1.5
@@ -2,24 +2,18 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 Name:           gnomecatalog
 Version:        0.3.4.2
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Catalog Software for Gnome Desktop
 
 Group:          Applications/File
 License:        GPLv3
 URL:            http://gnomecatalog.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Patch0:         gnomecatalog-fstypes.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  sqlite-devel, desktop-file-utils, python-devel, gettext
+BuildRequires:  sqlite-devel, desktop-file-utils, python-devel, gettext, python-setuptools-devel
 Requires:       gnome-desktop, python-sqlite2, pygtk2, python-vorbis, python-kaa-metadata
 Buildarch:      noarch
-# Must have setuptools to build the package
-# The build portions moved to a subpackage in F-8
-%if 0%{?fedora} >= 9
-BuildRequires: python-setuptools-devel
-%else
-BuildRequires: python-setuptools
-%endif
 
 %description
 Catalog your dvds/cds and files in your hard disk. Generate thumbnails 
@@ -28,7 +22,8 @@ and saves it in the database files. Save
 then you can search in the metatada of music and images.
 
 %prep
-%setup -q -n %{name}-%{version}/
+%setup -q 
+%patch0 -p1
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} -c 'import setuptools; execfile("setup.py")' build
@@ -62,6 +57,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/icons/hicolor/48x48/mimetypes/gnome-mime-application-x-gcatalog.png
 
 %changelog
+* Thu Oct 22 2009 Marc Wiriadisastra <marc at mwiriadi.id.au> - 0.3.4.2-3
+- Patch for permissions added thanks to Alexander Ovcharenko
+- Closes bug bz 509237
+- Clean up the spec file removing the F9 python-setuptools buildrequires
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.4.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sat Jun 20 2009 Marc Wiriadiastra <marc at mwiriadi.id.au> - 0.3.4.2-1
 - Update for new upstream which fixes bug listed below.
 - Cleaned up spec file to suit new upstream source file; tar.bz2 and


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gnomecatalog/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	20 Jun 2009 05:01:39 -0000	1.1
+++ import.log	22 Oct 2009 10:44:00 -0000	1.2
@@ -1 +1,2 @@
 gnomecatalog-0_3_4_2-1_fc11:F-10:gnomecatalog-0.3.4.2-1.fc11.src.rpm:1245473987
+gnomecatalog-0_3_4_2-3_fc12:F-10:gnomecatalog-0.3.4.2-3.fc12.src.rpm:1256208214