updated: kdebase, xfce4-settings

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@813 ec354946-7b23-47d6-9f5a-488ba84defc7

k/kdebase/kdebase-vl.spec

@@ -1,7 +1,7 @@
 Name: kdebase
 Summary: K Desktop Environment 4 - Core Files
 Summary(ja): K デスクトップ環境 - 基本ファイル
-Version: 4.4.1
+Version: 4.4.2
 Release: 1%{?_dist_release}
 
 License: GPLv2
@@ -194,6 +194,9 @@ fi
 %{_libdir}/kde4/devel/lib*.so
 
 %changelog
+* Sun Apr 11 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.4.2-1
+- new upstream release
+
 * Sun Mar  7 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.4.1-1
 - new upstream release
 

x/xfce4-settings/xfce4-settings-vl.spec

@@ -1,5 +1,5 @@
 Name:           xfce4-settings
-Version:        4.6.3
+Version:        4.6.4
 Release:        1%{?_dist_release}
 Summary:        Settings Manager for Xfce
 Summary(ja):    Xfce の設定マネージャー
@@ -9,6 +9,9 @@ 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
+Patch0:         xfce4-settings-4.6.4-libxklavier5.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
@@ -16,7 +19,7 @@ Source0:        http://www.xfce.org/archive/src/xfce/%{name}/%{xfceversion}/%{na
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 BuildRequires: gettext
 BuildRequires: intltool
-BuildRequires: libexo-devel >= 0.3.93
+BuildRequires: libexo-devel >= 0.3.100
 BuildRequires: libxfcegui4-devel >= 4.6
 BuildRequires: libxfce4util-devel >= 4.6
 BuildRequires: xfconf-devel >= 4.6
@@ -39,6 +42,8 @@ This package includes the settings manager applications for the Xfce desktop.
 
 %prep
 %setup -q
+%patch0 -p1 -b .xklavier5
+%patch1 -p1 -b .dsofix
 
 %build
 %configure --enable-sound-settings
@@ -110,6 +115,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/xfce*.desktop
 
 %changelog
+* Mon Apr 12 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.6.4-1
+- new upstream release
+- built with libxklavier-5.0
+- added Patch0 and 1 from Fedora
+  * Sun Feb 14 2010 Kevin Fenzi <kevin@tummy.com> - 4.6.4-3
+  - Add patch to fix DSO linking. Fixes bug #564803
+  * Sat Jan 23 2010 Christoph Wickert <cwickert@fedoraproject.org> - 4.6.4-2
+  - Add patch for libxklavier 5.0. Thanks to Caolan McNamara (#558081)
+
 * Sun Nov  1 2009 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.6.3-1
 - new upstream release
 - rebuilt with libxklavier-4.0