rpms/Thunar/devel Thunar-1.0.1-dsofix.patch, NONE, 1.1 Thunar.spec, 1.28, 1.29

[Kevin Fenzi]

Author: kevin

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

Modified Files:
	Thunar.spec 
Added Files:
	Thunar-1.0.1-dsofix.patch 
Log Message:
Add patch for DSO linking. Fixes bug #564714


Thunar-1.0.1-dsofix.patch:
 thunar-vfs/Makefile.in |    2 +-
 thunar/Makefile.in     |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE Thunar-1.0.1-dsofix.patch ---
diff -Nur Thunar-1.0.1.orig/thunar/Makefile.in Thunar-1.0.1/thunar/Makefile.in
--- Thunar-1.0.1.orig/thunar/Makefile.in	2009-04-18 08:41:06.000000000 -0600
+++ Thunar-1.0.1/thunar/Makefile.in	2010-02-13 18:06:06.000000000 -0700
@@ -372,7 +372,7 @@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 LD = @LD@
-LDFLAGS = @LDFLAGS@
+LDFLAGS = @LDFLAGS@ -lX11
 LIBFAM_CFLAGS = @LIBFAM_CFLAGS@
 LIBFAM_LIBS = @LIBFAM_LIBS@
 LIBFAM_REQUIRED_VERSION = @LIBFAM_REQUIRED_VERSION@
diff -Nur Thunar-1.0.1.orig/thunar-vfs/Makefile.in Thunar-1.0.1/thunar-vfs/Makefile.in
--- Thunar-1.0.1.orig/thunar-vfs/Makefile.in	2009-04-18 08:41:03.000000000 -0600
+++ Thunar-1.0.1/thunar-vfs/Makefile.in	2010-02-13 16:51:16.000000000 -0700
@@ -202,7 +202,7 @@
 thunar_vfs_font_thumbnailer_1_LINK = $(LIBTOOL) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(thunar_vfs_font_thumbnailer_1_CFLAGS) $(CFLAGS) \
-	$(thunar_vfs_font_thumbnailer_1_LDFLAGS) $(LDFLAGS) -o $@
+	$(thunar_vfs_font_thumbnailer_1_LDFLAGS) $(LDFLAGS) -lm -o $@
 am_thunar_vfs_mime_cleaner_1_OBJECTS =  \
 	thunar_vfs_mime_cleaner_1-thunar-vfs-mime-cleaner.$(OBJEXT)
 thunar_vfs_mime_cleaner_1_OBJECTS =  \


Index: Thunar.spec
===================================================================
RCS file: /cvs/extras/rpms/Thunar/devel/Thunar.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- Thunar.spec	26 Oct 2009 18:13:18 -0000	1.28
+++ Thunar.spec	14 Feb 2010 02:23:05 -0000	1.29
@@ -3,12 +3,14 @@
 Summary: Thunar File Manager
 Name: Thunar
 Version: 1.0.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 URL: http://thunar.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.6.1/src/Thunar-%{version}.tar.bz2
 Source1: thunar-sendto-bluetooth.desktop
 Source2: thunar-sendto-audacious-playlist.desktop
+# Upstream bug: http://bugzilla.xfce.org/show_bug.cgi?id=6232
+Patch0: Thunar-1.0.1-dsofix.patch
 Group: User Interface/Desktops
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: fam-devel
@@ -59,6 +61,8 @@ libraries and header files for the Thuna
 %prep
 %setup -q
 
+%patch0 -p1 
+
 # fix icon in thunar-sendto-email.desktop
 sed -i 's!internet-mail!mail-message-new!' \
         plugins/thunar-sendto-email/thunar-sendto-email.desktop.in.in
@@ -201,6 +205,9 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Sat Feb 13 2010 Kevin Fenzi <kevin at tummy.com> - 1.0.1-4
+- Add patch for DSO linking. Fixes bug #564714
+
 * Thu Sep 10 2009 Kevin Fenzi <kevin at tummy.com> - 1.0.1-3
 - Require dbus-x11 (#505499)