[control-center/f15/master] Update to 2.91.91 Disable libsocialweb support until Flickr integration is fixed upstream

Bastien Nocera hadess at fedoraproject.org
Tue Mar 8 12:29:14 UTC 2011


commit b216113ce3992a244e0ef41dc2b77d682650da74
Author: Bastien Nocera <hadess at hadess.net>
Date:   Tue Mar 8 12:29:07 2011 +0000

    Update to 2.91.91
    Disable libsocialweb support until Flickr integration is fixed upstream

 .gitignore                                         |    1 +
 ...-language-names-for-locales-with-3-letter.patch |  131 ---------
 0001-datetime-Fix-crash-when-TZ-is-an-alias.patch  |  280 --------------------
 control-center.spec                                |   14 +-
 org.gnome.control-center.defaultbackground.policy  |   21 --
 sound-fallback.patch                               |    9 -
 sources                                            |    2 +-
 7 files changed, 9 insertions(+), 449 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5ae4fca..57aa131 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ gnome-control-center-2.31.6.tar.bz2
 /gnome-control-center-2.91.5.tar.bz2
 /gnome-control-center-2.91.6.tar.bz2
 /gnome-control-center-2.91.90.tar.bz2
+/gnome-control-center-2.91.91.tar.bz2
diff --git a/control-center.spec b/control-center.spec
index ea6d758..95c828a 100644
--- a/control-center.spec
+++ b/control-center.spec
@@ -17,8 +17,8 @@
 
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
-Version: 2.91.90
-Release: 2%{?dist}
+Version: 2.91.91
+Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -26,9 +26,6 @@ Group: User Interface/Desktops
 Source: http://download.gnome.org/sources/gnome-control-center/2.91/gnome-control-center-%{version}.tar.bz2
 URL: http://www.gnome.org
 
-# upstream fix
-Patch0: sound-fallback.patch
-
 Requires: gnome-settings-daemon >= 2.21.91-3
 Requires: redhat-menus >= %{redhat_menus_version}
 Requires: gnome-icon-theme
@@ -129,7 +126,6 @@ utilities.
 
 %prep
 %setup -q -n gnome-control-center-%{version}
-%patch0 -p1 -b .sound-fallback
 
 %build
 autoreconf -f
@@ -137,7 +133,7 @@ autoreconf -f
         --disable-static \
         --disable-scrollkeeper \
         --disable-update-mimedb \
-        --with-libsocialweb=yes \
+        --with-libsocialweb=no \
         CFLAGS="$RPM_OPT_FLAGS -Wno-error"
 
 # drop unneeded direct library deps with --as-needed
@@ -235,6 +231,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 
 
 %changelog
+* Tue Mar 08 2011 Bastien Nocera <bnocera at redhat.com> 2.91.91-1
+- Update to 2.91.91
+- Disable libsocialweb support until Flickr integration is fixed upstream
+
 * Mon Feb 28 2011 Matthias Clasen <mclasen at redhat.com> - 1:2.91.90-2
 - Fix a typo in the autostart condition for the sound applet
 
diff --git a/sources b/sources
index fad1059..eaf6ed4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-410be83704567c2d1a18a3a4f123ed88  gnome-control-center-2.91.90.tar.bz2
+f65f3c3ea44b2796cc09e30d902aabeb  gnome-control-center-2.91.91.tar.bz2


More information about the scm-commits mailing list