X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=control-center.spec;h=8f7b921032c4368a08e5aaa850dd35f25534ed0b;hb=8f9218f346c1b2785ff3e72a733e7137465904b9;hp=249828d284891fcccf5fc1bd7c26ac2568740b08;hpb=24e9f28cf15a1a83dfe0d8af000210ae3a51ba38;p=packages%2Fcontrol-center.git

diff --git a/control-center.spec b/control-center.spec
index 249828d..8f7b921 100644
--- a/control-center.spec
+++ b/control-center.spec
@@ -5,27 +5,28 @@ Summary(pt_BR):	O Centro de Controle do GNOME
 Summary(uk):	ãÅÎÔÒ ËÅÒÕ×ÁÎÎÑ GNOME
 Summary(ru):	ãÅÎÔÒ ÕÐÒÁ×ÌÅÎÉÑ GNOME
 Name:		control-center
-Version:	2.6.1
-Release:	3
+Version:	2.8.0
+Release:	2.6
 Epoch:		1
 License:	GPL
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/gnome/sources/%{name}/2.6/%{name}-%{version}.tar.bz2
-# Source0-md5:	da02f983fbf2e94cd5f09fc8f9d1d143
+Source0:	http://ftp.gnome.org/pub/gnome/sources/%{name}/2.8/%{name}-%{version}.tar.bz2
+# Source0-md5:	300fb361af4645dd9b0154ecd18b2256
 Patch0:		%{name}-fontconfig.patch
 Patch1:		%{name}-randr.patch
-Patch2:		%{name}-def-apps-capplet.patch
+#Patch2:		%{name}-def-apps-capplet.patch
 Patch3:		%{name}-wm_properties-dir.patch
 Patch4:		%{name}-additional-metacity-keybinding.patch
 Patch5:		%{name}-capplets-dir.patch
 Patch6:		%{name}-dpi.patch
-Patch7:		%{name}-locale-names.patch
-Patch8:		%{name}-reduced_resources.patch
-Patch9:		%{name}-def-apps-capplet-browsers.patch
+Patch7:		%{name}-reduced_resources.patch
+Patch8:		%{name}-def-apps-capplet-browsers.patch
+Patch9:		%{name}-evolution.patch
+Patch10:	%{name}-capplet.patch
 URL:		http://www.gnome.org/
 Icon:		control-center.gif
-BuildRequires:	GConf2-devel >= 2.6.0
-BuildRequires:	ORBit2-devel >= 1:2.10.0
+BuildRequires:	GConf2-devel >= 2.8.0
+BuildRequires:	ORBit2-devel >= 1:2.12.0
 BuildRequires:	audiofile >= 1:0.2.6
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -34,28 +35,25 @@ BuildRequires:	flex
 BuildRequires:	esound-devel
 BuildRequires:	findutils
 BuildRequires:	gettext-devel
-BuildRequires:	gnome-desktop-devel >= 2.6.0
-BuildRequires:	gnome-vfs2-devel >= 2.6.0
-BuildRequires:	gstreamer-plugins-devel >= 0.8.0
-BuildRequires:	gtk+2-devel >= 2:2.4.0
+BuildRequires:	gnome-desktop-devel >= 2.8.0
+BuildRequires:	gnome-vfs2-devel >= 2.8.0
+BuildRequires:	gstreamer-plugins-devel >= 0.8.4
+BuildRequires:	gtk+2-devel >= 2:2.4.4
 BuildRequires:	intltool >= 0.30
-BuildRequires:	libbonobo-devel >= 2.6.0
-BuildRequires:	libbonoboui-devel >= 2.6.0
-BuildRequires:	libglade2-devel >= 1:2.3.6
-BuildRequires:	libgnome-devel >= 2.6.0
-BuildRequires:	libgnomeui-devel >= 2.6.0
-BuildRequires:	libxml2-devel >= 2.6.7
-BuildRequires:	libxklavier-devel >= 1.02
+BuildRequires:	libglade2-devel >= 1:2.4.0
+BuildRequires:	libgnomeui-devel >= 2.8.0
+BuildRequires:	libxml2-devel >= 2.6.13
+BuildRequires:	libxklavier-devel >= 1.03
 BuildRequires:	libtool
-BuildRequires:	metacity-devel >= 2.8.0
-BuildRequires:	nautilus-devel >= 2.6.0
+BuildRequires:	metacity-devel >= 2:2.8.5
+BuildRequires:	nautilus-devel >= 2.8.0
 BuildRequires:	scrollkeeper >= 0.3.12
-BuildRequires:	startup-notification-devel >= 0.5
+BuildRequires:	startup-notification-devel >= 0.7
 BuildRequires:	xft-devel >= 2.1.1
 PreReq:		/sbin/ldconfig
 PreReq:		scrollkeeper
 Requires(post):	GConf2
-Requires:	gnome-vfs2 >= 2.6.0
+Requires:	gnome-vfs2 >= 2.8.0
 Obsoletes:	acme
 Obsoletes:	fontilus
 Obsoletes:	gnome
@@ -127,16 +125,15 @@ Statyczne biblioteki GNOME Control-Center.
 %setup -q
 %patch0 -p1 -b .wiget
 %patch1 -p1
-%patch2 -p1
+##%patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p1
-%patch9 -p0
-
-mv po/{no,nb}.po
+%patch8 -p0
+%patch9 -p1
+%patch10 -p1
 
 %build
 glib-gettextize --copy --force
@@ -164,6 +161,8 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/window-manager-settings/*.{a,la}
 rm -f $RPM_BUILD_ROOT%{_libdir}/bonobo/*.{a,la}
 rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-vfs-2.0/modules/*.{a,la}
 
+rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
+
 %find_lang %{name} --with-gnome --all-name
 
 %clean