packages: xfce4-settings/xfce4-settings.spec, xfce4-settings/xfce4-settings...

[baggins]

Author: baggins                      Date: Sun Nov 14 12:48:30 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 4.6.5, XFCE 4.6.2

---- Files affected:
packages/xfce4-settings:
   xfce4-settings.spec (1.11 -> 1.12) , xfce4-settings-XI2.patch (1.1 -> NONE)  (REMOVED), xfce4-settings-libxklavier4.patch (1.1 -> NONE)  (REMOVED), xfce4-settings-libxklavier5.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/xfce4-settings/xfce4-settings.spec
diff -u packages/xfce4-settings/xfce4-settings.spec:1.11 packages/xfce4-settings/xfce4-settings.spec:1.12
--- packages/xfce4-settings/xfce4-settings.spec:1.11	Sat May 22 23:05:08 2010
+++ packages/xfce4-settings/xfce4-settings.spec	Sun Nov 14 13:48:24 2010
@@ -1,17 +1,15 @@
 # $Revision$, $Date$
+%define		xfce_version	4.6.2
 Summary:	Settings manager for the Xfce desktop environment
 Summary(pl.UTF-8):	Menadżer ustawień dla środowiska Xfce
 Name:		xfce4-settings
-Version:	4.6.1
-Release:	6
+Version:	4.6.5
+Release:	1
 License:	GPL v2
 Group:		X11/Applications
-Source0:	http://www.xfce.org/archive/xfce-%{version}/src/%{name}-%{version}.tar.bz2
-# Source0-md5:	dc1c8704471c5b0104fa10c30eb60cb6
+Source0:	http://www.xfce.org/archive/xfce-%{xfce_version}/src/%{name}-%{version}.tar.bz2
+# Source0-md5:	f988cb732913b5fbc115ad7105d2231e
 Patch0:		%{name}-default-icon-theme.patch
-Patch1:		%{name}-libxklavier4.patch
-Patch2:		%{name}-libxklavier5.patch
-Patch3:		%{name}-XI2.patch
 URL:		http://www.xfce.org/projects/xfce4-settings/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake >= 1:1.8
@@ -25,13 +23,13 @@
 BuildRequires:	libnotify-devel
 BuildRequires:	libtool
 BuildRequires:	libwnck-devel >= 2.12.0
-BuildRequires:	libxfce4util-devel >= %{version}
-BuildRequires:	libxfcegui4-devel >= %{version}
+BuildRequires:	libxfce4util-devel >= %{xfce_version}
+BuildRequires:	libxfcegui4-devel >= %{xfce_version}
 BuildRequires:	libxklavier-devel
 BuildRequires:	pkgconfig
 BuildRequires:	xfce4-dev-tools >= 4.6.0
-BuildRequires:	xfconf-devel >= %{version}
-Requires:	xfconf >= %{version}
+BuildRequires:	xfconf-devel >= %{xfce_version}
+Requires:	xfconf >= %{xfce_version}
 Obsoletes:	xfce-mcs-manager
 Obsoletes:	xfce-mcs-plugins
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -47,9 +45,6 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 %{__intltoolize}
@@ -100,6 +95,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2010/11/14 12:48:24  baggins
+- 4.6.5, XFCE 4.6.2
+
 Revision 1.11  2010/05/22 21:05:08  sparky
 - BR: pkgconfig
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xfce4-settings/xfce4-settings.spec?r1=1.11&r2=1.12&f=u