rpms/xfce4-settings/devel xfce4-settings.spec,1.18,1.19

[Christoph Wickert]

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-settings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31314

Modified Files:
	xfce4-settings.spec 
Log Message:
* Tue Sep 29 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.3-1
- Update to 4.6.3
- Drop patches that were upstreamed



Index: xfce4-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-settings/devel/xfce4-settings.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- xfce4-settings.spec	26 Sep 2009 20:42:17 -0000	1.18
+++ xfce4-settings.spec	29 Sep 2009 22:35:04 -0000	1.19
@@ -1,22 +1,17 @@
+%global xfceversion 4.6
+
 Name:           xfce4-settings
-Version:        4.6.1
-Release:        5%{?dist}
+Version:        4.6.3
+Release:        1%{?dist}
 Summary:        Settings Manager for Xfce
 
 Group:          User Interface/Desktops
 # xfce4-settings-helper is GPLv2 only. 
 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
+Source0:        http://www.xfce.org/archive/src/xfce/%{name}/%{xfceversion}/%{name}-%{version}.tar.bz2
+# new 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
-# Always restore the display on login: 
-# http://git.xfce.org/xfce/xfce4-settings/commit/?h=xfce-4.6&id=837281a333935d022621841155207bd4c75f1731
-Patch4:         xfce4-settings-4.6.1-restore-display-settings.patch
 # use vendor's artwork
 Patch10:        xfce4-settings-4.6.0-fedora.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -24,9 +19,9 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires: gettext
 BuildRequires: intltool
 BuildRequires: exo-devel >= 0.3.93
-BuildRequires: libxfcegui4-devel >= %{version}
-BuildRequires: libxfce4util-devel >= %{version}
-BuildRequires: xfconf-devel >= %{version}
+BuildRequires: libxfcegui4-devel >= %{xfceversion}
+BuildRequires: libxfce4util-devel >= %{xfceversion}
+BuildRequires: xfconf-devel >= %{xfceversion}
 BuildRequires: libglade2-devel
 BuildRequires: libwnck-devel
 BuildRequires: desktop-file-utils >= 0.7
@@ -49,9 +44,6 @@ This package includes the settings manag
 %if 0%{?fedora} >= 12
 %patch1 -p1 -b .xkl
 %endif
-%patch2 -p1 -b .timeout
-%patch3 -p1 -b .keyrepeat
-%patch4 -p1 -b .restore-display
 %patch10 -p1 -b .vendor
 
 %build
@@ -81,6 +73,7 @@ desktop-file-install                    
 desktop-file-install                                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/        \
         --delete-original                                       \
+        --remove-key="Encoding"                                 \
         ${RPM_BUILD_ROOT}%{_datadir}/applications/xfce-settings-manager.desktop
 
 desktop-file-install                                            \
@@ -96,6 +89,7 @@ desktop-file-install                    
 desktop-file-install                                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/        \
         --delete-original                                       \
+        --remove-key="Encoding"                                 \
         ${RPM_BUILD_ROOT}%{_datadir}/applications/xfce4-settings-editor.desktop
 
 desktop-file-install                                            \
@@ -128,6 +122,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/xfce*.desktop
 
 %changelog
+* Tue Sep 29 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.3-1
+- Update to 4.6.3
+- Drop patches that were upstreamed
+
 * Sat Sep 26 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.1-5
 - Add patch for restoring display resolution on login (bug #504908)