[control-center] - Update to 2.91.0

Wed Oct 6 16:33:04 UTC 2010

commit 6a2403ddb6b0726b1ae11ea79dfbb3a99c928153
Author: Richard Hughes <richard at hughsie.com>
Date:   Wed Oct 6 18:33:26 2010 +0100

    - Update to 2.91.0

 .gitignore              |    1 +
 control-center.spec     |   43 +++++++++++++++++++++++++++++--------------
 fix-build.patch         |   27 +++++++++++++++++++++++++++
 port-new-gtk3-api.patch |   34 ++++++++++++++++++++++++++++++++++
 sources                 |    2 +-
 5 files changed, 92 insertions(+), 15 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index aacdb12..43f1dd1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 gnome-control-center-2.31.5.tar.bz2
 gnome-control-center-2.31.6.tar.bz2
 /gnome-control-center-2.90.1.tar.bz2
+/gnome-control-center-2.91.0.tar.bz2
diff --git a/control-center.spec b/control-center.spec
index 0cc137f..cda51c7 100644
--- a/control-center.spec
+++ b/control-center.spec
@@ -1,7 +1,7 @@
 %define gettext_package gnome-control-center-2.0
 
 %define glib2_version 2.13.0
-%define gtk3_version 2.90.2
+%define gtk3_version 2.91.0
 %define gconf2_version 1.2.0
 %define gnome_desktop_version 2.90.4
 %define desktop_file_utils_version 0.9
@@ -17,13 +17,13 @@
 
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
-Version: 2.90.1
-Release: 4%{?dist}
+Version: 2.91.0
+Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
 #VCS: git:git://git.gnome.org/gnome-control-center
-Source: http://download.gnome.org/sources/gnome-control-center/2.90/gnome-control-center-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gnome-control-center/2.91/gnome-control-center-%{version}.tar.bz2
 URL: http://www.gnome.org
 
 Requires: gnome-settings-daemon >= 2.21.91-3
@@ -62,6 +62,7 @@ BuildRequires: dbus-glib-devel >= 0.70
 BuildRequires: scrollkeeper
 BuildRequires: libcanberra-devel
 BuildRequires: libsocialweb-devel
+BuildRequires: chrpath
 
 Requires(preun): GConf2
 Requires(pre): GConf2
@@ -74,6 +75,12 @@ Requires(postun): shared-mime-info
 Provides: control-center-extra = %{epoch}:%{version}-%{release}
 Obsoletes: control-center-extra < 1:2.30.3-3
 
+# already upstream
+Patch0:    port-new-gtk3-api.patch
+
+# rewritten in master
+Patch1:    fix-build.patch
+
 %description
 This package contains configuration utilities for the GNOME desktop, which
 allow to configure accessibility options, desktop fonts, keyboard and mouse
@@ -109,8 +116,11 @@ utilities.
 
 %prep
 %setup -q -n gnome-control-center-%{version}
+%patch0 -p1 -b .new-gtk3
+%patch1 -p1 -b .fix-build
 
 %build
+autoreconf -f
 %configure \
         --disable-static \
         --disable-scrollkeeper \
@@ -147,11 +157,22 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/gnome/wm-properties
 # we don't want these
 rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome/autostart
 rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome/cursor-fonts
-rm $RPM_BUILD_ROOT%{_datadir}/applications/mimeinfo.cache
 
 # remove useless libtool archive files
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
 
+# remove rpath
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/control-center-1/panels/libdefault-applications.so
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/control-center-1/panels/libbackground.so
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/control-center-1/panels/libdate_time.so
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/control-center-1/panels/libkeyboard-properties.so
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/control-center-1/panels/libmouse-properties.so
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/control-center-1/panels/libuniversal-access.so
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/control-center-1/panels/libkeybinding-properties.so
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/control-center-1/panels/libnetwork.so
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/control-center-1/panels/libdisplay.so
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gnome-control-center
+
 %find_lang %{gettext_package} --all-name --with-gnome
 
 %post
@@ -161,12 +182,6 @@ update-desktop-database --quiet %{_datadir}/applications
 update-mime-database %{_datadir}/mime > /dev/null
 touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
 
-%pre
-%gconf_schema_prepare control-center gnome-control-center fontilus
-
-%preun
-%gconf_schema_remove control-center gnome-control-center fontilus
-
 %postun
 /sbin/ldconfig
 update-desktop-database --quiet %{_datadir}/applications
@@ -197,11 +212,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 %{_bindir}/gnome-at-visual
 %{_bindir}/gnome-control-center
 %{_bindir}/gnome-typing-monitor
-%{_bindir}/gnome-font-viewer
-%{_bindir}/gnome-thumbnail-font
 %{_libdir}/*.so.*
 %{_sysconfdir}/gconf/schemas/gnome-control-center.schemas
-%{_sysconfdir}/gconf/schemas/fontilus.schemas
 %{_sysconfdir}/xdg/menus/gnomecc.menu
 %{_sysconfdir}/xdg/autostart/gnome-at-session.desktop
 %{_libdir}/control-center-1
@@ -223,6 +235,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 
 
 %changelog
+* Wed Oct 06 2010 Richard Hughes <rhughes at redhat.com> 2.91.0-1
+- Update to 2.91.0
+
 * Wed Sep 29 2010 jkeating - 1:2.90.1-4
 - Rebuilt for gcc bug 634757
 
diff --git a/fix-build.patch b/fix-build.patch
new file mode 100644
index 0000000..3019d7f
--- /dev/null
+++ b/fix-build.patch
@@ -0,0 +1,27 @@
+diff -urNp gnome-control-center-2.91.0.old/panels/datetime/Makefile.am gnome-control-center-2.91.0/panels/datetime/Makefile.am
+--- gnome-control-center-2.91.0.old/panels/datetime/Makefile.am	2010-10-06 17:23:04.016807000 +0100
++++ gnome-control-center-2.91.0/panels/datetime/Makefile.am	2010-10-06 17:30:21.541806993 +0100
+@@ -68,17 +68,17 @@ INCLUDES = 						\
+ 	-DDATADIR="\"$(uidir)\""			\
+ 	$(NULL)
+ 
+-noinst_PROGRAMS = test-timezone
++#noinst_PROGRAMS = test-timezone
+ 
+-test_timezone_SOURCES = test-timezone.c tz.c tz.h
+-test_timezone_LDADD = $(PANEL_LIBS)
+-test_timezone_CFLAGS = $(PANEL_CFLAGS)
++#test_timezone_SOURCES = test-timezone.c tz.c tz.h
++#test_timezone_LDADD = $(PANEL_LIBS)
++#test_timezone_CFLAGS = $(PANEL_CFLAGS)
+ 
+ all: check
+ 
+ # FIXME remove "|| :" when we have all the necessary pixmaps
+-check: test-timezone
+-	$(builddir)/test-timezone $(srcdir)/data || :
++#check: test-timezone
++#	$(builddir)/test-timezone $(srcdir)/data || :
+ 
+ ccpanelsdir = $(PANELS_DIR)
+ ccpanels_LTLIBRARIES = libdate_time.la
diff --git a/port-new-gtk3-api.patch b/port-new-gtk3-api.patch
new file mode 100644
index 0000000..3fd20ae
--- /dev/null
+++ b/port-new-gtk3-api.patch
@@ -0,0 +1,34 @@
+commit cdffa4f46b52b53fe04b960f2ab3d034e8be82d4
+Author: Bastien Nocera <hadess at hadess.net>
+Date:   Wed Oct 6 10:37:08 2010 +0100
+
+    shell: handle GtkSizeRequest removal
+
+diff --git a/shell/gnome-control-center.c b/shell/gnome-control-center.c
+index e9d598a..5f4d3e3 100644
+--- a/shell/gnome-control-center.c
++++ b/shell/gnome-control-center.c
+@@ -126,7 +126,7 @@ activate_panel (GnomeControlCenter *shell,
+           GtkWidget *panel;
+           GtkWidget *box;
+           gint i, old_page;
+-          GtkRequisition min, nat;
++          int nat_height;
+ 
+           /* create the panel plugin */
+           panel = g_object_new (panel_type, "shell", shell, NULL);
+@@ -162,11 +162,10 @@ activate_panel (GnomeControlCenter *shell,
+ 
+           /* resize to the preferred size of the panel */
+           gtk_widget_set_size_request (priv->window, FIXED_WIDTH, -1);
+-
+-          gtk_widget_get_preferred_size (priv->window,
+-                                         &min, &nat);
++          gtk_widget_get_preferred_height (GTK_WIDGET (priv->window),
++                                           NULL, &nat_height);
+           gtk_window_resize (GTK_WINDOW (priv->window), FIXED_WIDTH,
+-                             nat.height);
++                             nat_height);
+           return;
+         }
+     }
diff --git a/sources b/sources
index c6e4738..1e5c280 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3215d4193d7b1a5d28a1106b3e9985fe  gnome-control-center-2.90.1.tar.bz2
+1ab3c84716cc2da63f573b4ae24f76bf  gnome-control-center-2.91.0.tar.bz2
