rpms/f-spot/F-10 0001-gtk-version.patch, NONE, 1.1 f-spot.spec, 1.84, 1.85

[chkr]

Author: chkr

Update of /cvs/pkgs/rpms/f-spot/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6715

Modified Files:
	f-spot.spec 
Added Files:
	0001-gtk-version.patch 
Log Message:
* Tue Sep 15 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.0.0-1.1
- Fix crash due to incorrect GTK+ version (BZ #523236)


0001-gtk-version.patch:
 EditTagDialog.ui |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0001-gtk-version.patch ---
diff --git a/src/UI.Dialog/ui/EditTagDialog.ui b/src/UI.Dialog/ui/EditTagDialog.ui
index 1a34a0f..5639d0b 100644
--- a/src/UI.Dialog/ui/EditTagDialog.ui
+++ b/src/UI.Dialog/ui/EditTagDialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <requires lib="gtk+" version="2.14"/>
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkDialog" id="edit_tag_dialog">
     <property name="border_width">6</property>
-- 
1.6.0.6



Index: f-spot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/F-10/f-spot.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- f-spot.spec	9 Aug 2009 17:49:05 -0000	1.84
+++ f-spot.spec	15 Sep 2009 19:54:19 -0000	1.85
@@ -1,6 +1,6 @@
 Name:           f-spot
 Version:        0.6.0.0
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        Photo management application
 
 Group:          Applications/Multimedia
@@ -16,6 +16,8 @@ Patch2:         0001-use-system-Mono.Add
 Patch3:         0002-enhance-the-f-spot-import-script.patch
 # I'm told this is fixed in SVN
 Patch4:         f-spot-0.6.0.0-gtk-deprecated.patch
+# Patch for gtk+-2.14 compatibility already applied upstream (f-spot > 0.6.1.1)
+Patch5:         0001-gtk-version.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -61,6 +63,7 @@ sorting and tagging of digital images. 
 %patch2 -p1 -b .link-system-mono-addins
 %patch3 -p1 -b .gvfs-gphoto
 %patch4 -p1 -F 2 -b .gtk-deprecated
+%patch5 -p1 -b .gtk-api-version
 
 %build
 autoreconf -f -i
@@ -122,6 +125,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/omf/f-spot/
 
 %changelog
+* Tue Sep 15 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.0.0-1.1
+- Fix crash due to incorrect GTK+ version (BZ #523236)
+
 * Sun Aug 09 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.0.0-1
 - Update to new upstream version 0.6.0.0
 - Cleanup spec file