rpms/xfce4-settings/F-11 xfce4-settings.spec,1.12,1.13

[Christoph Wickert]

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-settings/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19827

Modified Files:
	xfce4-settings.spec 
Log Message:
* Wed Sep 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.1-4
- Fix xfconf channel for keyboard repeat rate setting
- Avoid timing out xfce4-session on startup (bugzilla.xfce.org #5040)
- Make sure xfce4-settings-helper only gets started in Xfce
- Fix directory ownership issue



Index: xfce4-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-settings/F-11/xfce4-settings.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- xfce4-settings.spec	21 Apr 2009 02:26:52 -0000	1.12
+++ xfce4-settings.spec	10 Sep 2009 02:35:08 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           xfce4-settings
 Version:        4.6.1
-Release:        1%{?dist}
+Release:        4%{?dist}
 Summary:        Settings Manager for Xfce
 
 Group:          User Interface/Desktops
@@ -8,6 +8,12 @@ Group:          User Interface/Desktops
 License:        GPLv2+ and GPLv2
 URL:            http://www.xfce.org/
 Source0:        http://www.xfce.org/archive/xfce-%{version}/src/xfce4-settings-%{version}.tar.bz2
+# mew libxklavier 4 API in Fedora 12
+Patch1:         xfce4-settings-4.6.1-xkl.patch
+# http://svn.xfce.org/svn/xfce/xfce4-settings/trunk@29991 a0aa69c2-05f4-0310-b83c-d5d913b14636
+Patch2:         xfce4-settings-4.6.1-fix-timeout-startup.patch
+# Fix typo in xfce-keyboard-settings
+Patch3:         xfce4-settings-4.6.1-fix-keyrepeat-typo-1.patch
 # use vendor's artwork
 Patch10:        xfce4-settings-4.6.0-fedora.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -37,6 +43,11 @@ This package includes the settings manag
 
 %prep
 %setup -q
+%if 0%{?fedora} >= 12
+%patch1 -p1 -b .xkl
+%endif
+%patch2 -p1 -b .timeout
+%patch3 -p1 -b .keyrepeat
 %patch10 -p1 -b .vendor
 
 %build
@@ -48,41 +59,48 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-desktop-file-install --vendor ""                                \
+desktop-file-install                                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/        \
         --delete-original                                       \
         ${RPM_BUILD_ROOT}%{_datadir}/applications/xfce-display-settings.desktop
 
-desktop-file-install --vendor ""                                \
+desktop-file-install                                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/        \
         --delete-original                                       \
         ${RPM_BUILD_ROOT}%{_datadir}/applications/xfce-keyboard-settings.desktop
 
-desktop-file-install --vendor ""                                \
+desktop-file-install                                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/        \
         --delete-original                                       \
         ${RPM_BUILD_ROOT}%{_datadir}/applications/xfce-mouse-settings.desktop
 
-desktop-file-install --vendor ""                                \
+desktop-file-install                                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/        \
         --delete-original                                       \
         ${RPM_BUILD_ROOT}%{_datadir}/applications/xfce-settings-manager.desktop
 
-desktop-file-install --vendor ""                                \
+desktop-file-install                                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/        \
         --delete-original                                       \
         ${RPM_BUILD_ROOT}%{_datadir}/applications/xfce-ui-settings.desktop
 
-desktop-file-install --vendor ""                                \
+desktop-file-install                                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/        \
         --delete-original                                       \
         ${RPM_BUILD_ROOT}%{_datadir}/applications/xfce4-accessibility-settings.desktop
 
-desktop-file-install --vendor ""                                \
+desktop-file-install                                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/        \
         --delete-original                                       \
         ${RPM_BUILD_ROOT}%{_datadir}/applications/xfce4-settings-editor.desktop
 
+desktop-file-install                                            \
+        --dir ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart/    \
+        --delete-original                                       \
+        --add-only-show-in=XFCE                                 \
+        --remove-key=Terminal                                   \
+        ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart/xfce4-settings-helper-autostart.desktop
+
 %find_lang %{name}
 
 %clean
@@ -93,9 +111,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog NEWS TODO COPYING
 %config(noreplace) %{_sysconfdir}/xdg/autostart/xfce4-settings-helper-autostart.desktop
-%dir %{_sysconfdir}/xdg/xfce4
-%dir %{_sysconfdir}/xdg/xfce4/xfconf/
-%dir %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml
 %config(noreplace) %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
 %{_bindir}/xfce4-accessibility-settings
 %{_bindir}/xfce4-appearance-settings
@@ -109,6 +124,18 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/xfce*.desktop
 
 %changelog
+* Wed Sep 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.1-4
+- Fix xfconf channel for keyboard repeat rate setting
+- Avoid timing out xfce4-session on startup (bugzilla.xfce.org #5040)
+- Make sure xfce4-settings-helper only gets started in Xfce
+- Fix directory ownership issue
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.6.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri Jul 03 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.1-2
+- Update for new libxklavier
+
 * Sun Apr 19 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.1-1
 - Update to 4.6.1