- tadaaaam... DPI autodetection can be disabled

[packages/control-center.git] / control-center.spec

diff --git a/control-center.spec b/control-center.spec
index 0167faa55705616903e3e5b5859c1a8487980357..d6edab7903213388c4ff2d8eef176dd9f054872f 100644 (file)
--- a/control-center.spec
+++ b/control-center.spec
@@ -5,21 +5,28 @@ 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.4.0
+Release:       9
 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.4/%{name}-%{version}.tar.bz2
+# Source0-md5: 44115d3174d2f603f34a336ada562bae
 Patch0:                %{name}-fontconfig.patch
 Patch1:                %{name}-am17.patch
 Patch2:                %{name}-link.patch
 Patch3:                %{name}-randr.patch
+Patch4:                %{name}-def-apps-capplet.patch
+Patch5:                %{name}-wm_properties-dir.patch
+Patch6:                %{name}-additional-metacity-keybinding.patch
+Patch7:                %{name}-pixmaps-dirs.patch
+Patch8:                %{name}-capplets-dir.patch
+Patch9:                %{name}-themus-glade.patch
+Patch10:       %{name}-font-capplet-disable-dpi.patch
 URL:           http://www.gnome.org/
 Icon:          control-center.gif
 BuildRequires: GConf2-devel >= 2.3.3
-BuildRequires: ORBit2-devel >= 2.7.6
+BuildRequires: ORBit2-devel >= 2.8.0
 BuildRequires: audiofile >= 0.2.3-3
 BuildRequires: autoconf
 BuildRequires: automake
@@ -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: gnome-desktop-devel >= 2.3.90
+BuildRequires: gnome-vfs2-devel >= 2.4.0
+BuildRequires: gtk+2-devel >= 2.2.3
 BuildRequires: intltool >= 0.25
-BuildRequires: libbonobo-devel >= 2.2.1
-BuildRequires: libbonoboui-devel >= 2.3.6
+BuildRequires: libbonobo-devel >= 2.4.0
+BuildRequires: libbonoboui-devel >= 2.4.0
 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: libgnome-devel >= 2.4.0
+BuildRequires: libgnomeui-devel >= 2.4.0
+BuildRequires: libxml2-devel >= 2.5.10
 BuildRequires: libtool
 BuildRequires: metacity-devel >= 2.5.1
-BuildRequires: nautilus-devel >= 2.3.8
+BuildRequires: nautilus-devel >= 2.3.90
 BuildRequires: scrollkeeper >= 0.3.12
 BuildRequires: startup-notification-devel
 BuildRequires: xft-devel >= 2.1.1
 PreReq:                /sbin/ldconfig
 PreReq:                scrollkeeper
 Requires(post):        GConf2
-Requires:      gnome-vfs2 >= 2.3.7
+Requires:      gnome-vfs2 >= 2.4.0
 Obsoletes:     fontilus
 Obsoletes:     gnome
 Obsoletes:     themus
@@ -120,6 +127,13 @@ Statyczne biblioteki GNOME Control-Center.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
 
 %build
 glib-gettextize --copy --force
@@ -130,7 +144,8 @@ intltoolize --copy --force
 %{__autoconf}
 %{__automake}
 %configure \
-       --disable-schemas-install
+       --disable-schemas-install \
+       X_EXTRA_LIBS="-lXext"
 
 %{__make}
 
@@ -171,10 +186,10 @@ 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/*
 %{_pixmapsdir}/gnomecc-2