rpms/f-spot/devel facebook-exporter-duplicate-label-fix.patch, NONE, 1.1 f-spot.spec, 1.92, 1.93

[chkr]

Author: chkr

Update of /cvs/pkgs/rpms/f-spot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27970

Modified Files:
	f-spot.spec 
Added Files:
	facebook-exporter-duplicate-label-fix.patch 
Log Message:
* Tue Sep 22 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.2-2
- add upstream patches (
  commit b87604bc9782bf92f053aaf3ceb739a32f44ea13
  commit 807dab4344ecdadc7e46793369821de8b49692e5 )
  to fix crash in facebook exporter (BZ 524860)


facebook-exporter-duplicate-label-fix.patch:
 FacebookExport.addin.xml |    2 +-
 FacebookExport.ui        |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE facebook-exporter-duplicate-label-fix.patch ---
diff --git a/extensions/Exporters/FacebookExport/FacebookExport.addin.xml b/extensions/Exporters/FacebookExport/FacebookExport.addin.xml
index 1146e7d..e660246 100644
--- a/extensions/Exporters/FacebookExport/FacebookExport.addin.xml
+++ b/extensions/Exporters/FacebookExport/FacebookExport.addin.xml
@@ -1,6 +1,6 @@
 <Addin 	namespace="FSpot"
 	id="FacebookExport"
-	version="0.6.0.5"
+	version="0.6.0.6"
 	name="FacebookExport"
 	description="Export pictures to facebook"
 	author="George Talusan, Jim Ramsay, Stephane Delcroix"
diff --git a/extensions/Exporters/FacebookExport/FacebookExport.ui b/extensions/Exporters/FacebookExport/FacebookExport.ui
index 382ba45..ec413ae 100644
--- a/extensions/Exporters/FacebookExport/FacebookExport.ui
+++ b/extensions/Exporters/FacebookExport/FacebookExport.ui
@@ -76,7 +76,7 @@
                   <object class="GtkHBox" id="permissions_hbox">
                     <property name="visible">True</property>
                     <child>
-                      <object class="GtkLabel" id="label6">
+                      <object class="GtkLabel" id="label_permissions">
                         <property name="visible">True</property>
                         <property name="xalign">1</property>
                         <property name="xpad">2</property>


Index: f-spot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/devel/f-spot.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- f-spot.spec	17 Sep 2009 19:24:51 -0000	1.92
+++ f-spot.spec	22 Sep 2009 22:08:57 -0000	1.93
@@ -1,6 +1,6 @@
 Name:           f-spot
 Version:        0.6.1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Photo management application
 
 Group:          Applications/Multimedia
@@ -13,6 +13,10 @@ Patch1:         0001-fix-parallel-build.
 Patch2:         0001-use-system-Mono.Addins-if-available.patch
 # unmount cameras before importing
 Patch3:         0002-enhance-the-f-spot-import-script.patch
+# upstream patch to fix crash in facebook exporter:
+# commit 807dab4344ecdadc7e46793369821de8b49692e5
+# commit b87604bc9782bf92f053aaf3ceb739a32f44ea13
+Patch4:         facebook-exporter-duplicate-label-fix.patch        
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  mono-devel mono-web mono-data mono-data-sqlite lcms-devel
@@ -65,6 +69,7 @@ photo collection in a slideshow as a scr
 %patch1 -p1 -b .parallel-build
 %patch2 -p1 -b .link-system-mono-addins
 %patch3 -p1 -b .gvfs-gphoto
+%patch4 -p1 -b .faceboox-exporter-crash
 
 %build
 autoreconf -f -i
@@ -138,6 +143,12 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/applications/screensavers/f-spot-screensaver.desktop
 
 %changelog
+* Tue Sep 22 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.2-2
+- add upstream patches (
+  commit b87604bc9782bf92f053aaf3ceb739a32f44ea13
+  commit 807dab4344ecdadc7e46793369821de8b49692e5 )
+  to fix crash in facebook exporter (BZ 524860)
+
 * Thu Sep 17 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.2-1
 - update to 0.6.1.2 (BZ 519290)