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

diff --git a/control-center.spec b/control-center.spec
index 0167faa..8f7b921 100644
--- a/control-center.spec
+++ b/control-center.spec
@@ -5,22 +5,29 @@ Summary(pt_BR):	O Centro de Controle do GNOME
 Summary(uk):	ãÅÎÔÒ ËÅÒÕ×ÁÎÎÑ GNOME
 Summary(ru):	ãÅÎÔÒ ÕÐÒÁ×ÌÅÎÉÑ GNOME
 Name:		control-center
-Version:	2.3.6
-Release:	1
+Version:	2.8.0
+Release:	2.6
 Epoch:		1
 License:	GPL
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/gnome/sources/%{name}/2.3/%{name}-%{version}.tar.bz2
-# Source0-md5:	c9fce7ede99b4396c771ace7b1af132b
+Source0:	http://ftp.gnome.org/pub/gnome/sources/%{name}/2.8/%{name}-%{version}.tar.bz2
+# Source0-md5:	300fb361af4645dd9b0154ecd18b2256
 Patch0:		%{name}-fontconfig.patch
-Patch1:		%{name}-am17.patch
-Patch2:		%{name}-link.patch
-Patch3:		%{name}-randr.patch
+Patch1:		%{name}-randr.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}-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.3.3
-BuildRequires:	ORBit2-devel >= 2.7.6
-BuildRequires:	audiofile >= 0.2.3-3
+BuildRequires:	GConf2-devel >= 2.8.0
+BuildRequires:	ORBit2-devel >= 1:2.12.0
+BuildRequires:	audiofile >= 1:0.2.6
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	bison
@@ -28,26 +35,26 @@ BuildRequires:	flex
 BuildRequires:	esound-devel
 BuildRequires:	findutils
 BuildRequires:	gettext-devel
-BuildRequires:	gnome-desktop-devel >= 2.3.6
-BuildRequires:	gnome-vfs2-devel >= 2.3.7
-BuildRequires:	gtk+2-devel >= 2.2.1
-BuildRequires:	intltool >= 0.25
-BuildRequires:	libbonobo-devel >= 2.2.1
-BuildRequires:	libbonoboui-devel >= 2.3.6
-BuildRequires:	libglade2-devel >= 2.0.1
-BuildRequires:	libgnome-devel >= 2.3.0
-BuildRequires:	libgnomeui-devel >= 2.3.3.1-2
-BuildRequires:	libxml2-devel >= 2.5.7
+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:	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.5.1
-BuildRequires:	nautilus-devel >= 2.3.8
+BuildRequires:	metacity-devel >= 2:2.8.5
+BuildRequires:	nautilus-devel >= 2.8.0
 BuildRequires:	scrollkeeper >= 0.3.12
-BuildRequires:	startup-notification-devel
+BuildRequires:	startup-notification-devel >= 0.7
 BuildRequires:	xft-devel >= 2.1.1
 PreReq:		/sbin/ldconfig
 PreReq:		scrollkeeper
 Requires(post):	GConf2
-Requires:	gnome-vfs2 >= 2.3.7
+Requires:	gnome-vfs2 >= 2.8.0
+Obsoletes:	acme
 Obsoletes:	fontilus
 Obsoletes:	gnome
 Obsoletes:	themus
@@ -94,7 +101,7 @@ GNOME 
 Summary:	GNOME Control-Center header files
 Summary(pl):	Pliki nag³ówkowe bibliotek GNOME Control-Center
 Group:		X11/Development/Libraries
-Requires:	%{name} = %{epoch}:%{version}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description devel
 GNOME Control-Center header files.
@@ -106,7 +113,7 @@ Pliki nag
 Summary:	GNOME Control-Center static libraries
 Summary(pl):	Statyczne biblioteki GNOME Control-Center
 Group:		X11/Development/Libraries
-Requires:	%{name}-devel = %{epoch}:%{version}
+Requires:	%{name}-devel = %{epoch}:%{version}-%{release}
 
 %description static
 GNOME Control-Center static libraries.
@@ -116,10 +123,17 @@ Statyczne biblioteki GNOME Control-Center.
 
 %prep
 %setup -q
-%patch0 -p1
+%patch0 -p1 -b .wiget
 %patch1 -p1
-%patch2 -p1
+##%patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p0
+%patch9 -p1
+%patch10 -p1
 
 %build
 glib-gettextize --copy --force
@@ -130,7 +144,9 @@ intltoolize --copy --force
 %{__autoconf}
 %{__automake}
 %configure \
-	--disable-schemas-install
+	--disable-schemas-install \
+	--enable-gstreamer \
+	X_EXTRA_LIBS="-lXext"
 
 %{__make}
 
@@ -145,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
@@ -163,6 +181,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/gnome-vfs-2.0/modules/*
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_libdir}/fontilus-context-menu
+%attr(755,root,root) %{_libdir}/gnome-settings-daemon
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
 %attr(755,root,root) %{_libdir}/bonobo/*.so
 %attr(755,root,root) %{_libdir}/gnome-vfs-2.0/modules/lib*.so
@@ -171,12 +190,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/bonobo/servers/*
 %{_datadir}/application-registry/*
 %{_datadir}/control-center-2.0
-%{_datadir}/control-center
 %{_datadir}/gnome/cursor-fonts
 %{_datadir}/gnome/vfolders/*
 %{_datadir}/gnome-2.0/ui/*
+%{_datadir}/gnome/capplets
 %{_datadir}/idl/*
 %{_datadir}/mime-info/*
+%{_iconsdir}/*
 %{_pixmapsdir}/gnomecc-2
 %{_pixmapsdir}/*.png
 %{_desktopdir}/*