- tadaaaam... DPI autodetection can be disabled

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

diff --git a/control-center.spec b/control-center.spec
index 455e33038321583ee558eab741804aa9cc6709cd..d6edab7903213388c4ff2d8eef176dd9f054872f 100644 (file)
--- a/control-center.spec
+++ b/control-center.spec
@@ -6,7 +6,7 @@ Summary(uk):    
 Summary(ru):   ãÅÎÔÒ ÕÐÒÁ×ÌÅÎÉÑ GNOME
 Name:          control-center
 Version:       2.4.0
-Release:       6
+Release:       9
 Epoch:         1
 License:       GPL
 Group:         X11/Applications
@@ -17,11 +17,12 @@ Patch1:             %{name}-am17.patch
 Patch2:                %{name}-link.patch
 Patch3:                %{name}-randr.patch
 Patch4:                %{name}-def-apps-capplet.patch
-Patch5:                %{name}-gnome-terminal.patch
-Patch6:                %{name}-wm_properties-dir.patch
-Patch7:                %{name}-additional-metacity-keybinding.patch
-Patch8:                %{name}-pixmaps-dirs.patch
-Patch9:                %{name}-capplets-dir.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
@@ -132,6 +133,7 @@ Statyczne biblioteki GNOME Control-Center.
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 
 %build
 glib-gettextize --copy --force
@@ -142,7 +144,8 @@ intltoolize --copy --force
 %{__autoconf}
 %{__automake}
 %configure \
-       --disable-schemas-install
+       --disable-schemas-install \
+       X_EXTRA_LIBS="-lXext"
 
 %{__make}
 
@@ -183,7 +186,6 @@ 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/*