rpms/xfce4-settings/F-12 xfce4-settings-4.6.4-dsofix.patch, NONE, 1.1 xfce4-settings.spec, 1.20, 1.21 sources, 1.7, 1.8 .cvsignore, 1.7, 1.8 xfce4-settings-4.6.3-xi2.patch, 1.1, NONE

[Kevin Fenzi]

Author: kevin

Update of /cvs/pkgs/rpms/xfce4-settings/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv26145

Modified Files:
	xfce4-settings.spec sources .cvsignore 
Added Files:
	xfce4-settings-4.6.4-dsofix.patch 
Removed Files:
	xfce4-settings-4.6.3-xi2.patch 
Log Message:
Update to 4.6.5


xfce4-settings-4.6.4-dsofix.patch:
 dialogs/mouse-settings/Makefile.in |    2 +-
 xfsettingsd/Makefile.in            |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE xfce4-settings-4.6.4-dsofix.patch ---
diff -Nur xfce4-settings-4.6.4.orig/dialogs/mouse-settings/Makefile.in xfce4-settings-4.6.4/dialogs/mouse-settings/Makefile.in
--- xfce4-settings-4.6.4.orig/dialogs/mouse-settings/Makefile.in	2010-01-02 06:31:10.000000000 -0700
+++ xfce4-settings-4.6.4/dialogs/mouse-settings/Makefile.in	2010-02-14 11:52:59.000000000 -0700
@@ -177,7 +177,7 @@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 LD = @LD@
-LDFLAGS = @LDFLAGS@
+LDFLAGS = @LDFLAGS@ -lm
 LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@
 LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@
 LIBNOTIFY_REQUIRED_VERSION = @LIBNOTIFY_REQUIRED_VERSION@
diff -Nur xfce4-settings-4.6.4.orig/xfsettingsd/Makefile.in xfce4-settings-4.6.4/xfsettingsd/Makefile.in
--- xfce4-settings-4.6.4.orig/xfsettingsd/Makefile.in	2010-01-02 06:31:11.000000000 -0700
+++ xfce4-settings-4.6.4/xfsettingsd/Makefile.in	2010-02-14 11:54:03.000000000 -0700
@@ -173,7 +173,7 @@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 LD = @LD@
-LDFLAGS = @LDFLAGS@
+LDFLAGS = @LDFLAGS@ -lX11
 LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@
 LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@
 LIBNOTIFY_REQUIRED_VERSION = @LIBNOTIFY_REQUIRED_VERSION@


Index: xfce4-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-settings/F-12/xfce4-settings.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- xfce4-settings.spec	10 Nov 2009 00:10:46 -0000	1.20
+++ xfce4-settings.spec	10 Jun 2010 04:04:05 -0000	1.21
@@ -1,8 +1,8 @@
 %global xfceversion 4.6
 
 Name:           xfce4-settings
-Version:        4.6.3
-Release:        2%{?dist}
+Version:        4.6.5
+Release:        1%{?dist}
 Summary:        Settings Manager for Xfce
 
 Group:          User Interface/Desktops
@@ -10,8 +10,8 @@ Group:          User Interface/Desktops
 License:        GPLv2+ and GPLv2
 URL:            http://www.xfce.org/
 Source0:        http://www.xfce.org/archive/src/xfce/%{name}/%{xfceversion}/%{name}-%{version}.tar.bz2
-# http://bugzilla.xfce.org/show_bug.cgi?id=4929
-Patch0:         xfce4-settings-4.6.3-xi2.patch
+# Upstream bug: http://bugzilla.xfce.org/show_bug.cgi?id=6236
+Patch1: 	xfce4-settings-4.6.4-dsofix.patch
 # use vendor's artwork
 Patch10:        xfce4-settings-4.6.0-fedora.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -41,7 +41,7 @@ This package includes the settings manag
 
 %prep
 %setup -q
-%patch0 -p0 -b .xi
+%patch1 -p1 -b .dsofix
 %patch10 -p1 -b .vendor
 
 %build
@@ -120,6 +120,20 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/xfce*.desktop
 
 %changelog
+* Fri May 21 2010 Kevin Fenzi <kevin at tummy.com> - 4.6.5-1
+- Update to 4.6.5
+
+* Sun Feb 14 2010 Kevin Fenzi <kevin at tummy.com> - 4.6.4-3
+- Add patch to fix DSO linking. Fixes bug #564803
+
+* Sat Jan 23 2010 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.4-2
+- Add patch for libxklavier 5.0. Thanks to Caolan McNamara (#558081)
+- Use Clearlooks theme by default
+
+* Sat Jan 02 2010 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.4-1
+- Update to 4.6.4
+- Drop xi2 patch, fixed upstream
+
 * Tue Nov 10 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.3-2
 - Patch xfce4-mouse-settings for newer libXi (#525501)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-settings/F-12/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	29 Sep 2009 23:16:28 -0000	1.7
+++ sources	10 Jun 2010 04:04:05 -0000	1.8
@@ -1 +1 @@
-60e726143baf0605f6ee8b158d536ed0  xfce4-settings-4.6.3.tar.bz2
+f988cb732913b5fbc115ad7105d2231e  xfce4-settings-4.6.5.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-settings/F-12/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	29 Sep 2009 23:16:28 -0000	1.7
+++ .cvsignore	10 Jun 2010 04:04:05 -0000	1.8
@@ -1 +1 @@
-xfce4-settings-4.6.3.tar.bz2
+xfce4-settings-4.6.5.tar.bz2


--- xfce4-settings-4.6.3-xi2.patch DELETED ---