- added patch for bug 709302 fixes upstream commit d331444591c5e7c0cc045fe2ffaad7ccbf...

- rel. 2

diff --git a/bug709302.patch b/bug709302.patch
new file mode 100644 (file)
index 0000000..d5a70fa
--- /dev/null
+++ b/bug709302.patch
@@ -0,0 +1,24 @@
+diff -uNr gnome-control-center-3.10.1.old/panels/background/Makefile.am gnome-control-center-3.10.1/panels/background/Makefile.am
+--- gnome-control-center-3.10.1.old/panels/background/Makefile.am      2013-10-11 13:19:22.000000000 +0200
++++ gnome-control-center-3.10.1/panels/background/Makefile.am  2013-10-19 15:03:01.342501393 +0200
+@@ -40,6 +40,8 @@
+       bg-colors-source.c              \
+       bg-colors-source.h
+ 
++libbackground_chooser_la_LIBADD = $(PANEL_LIBS) $(BACKGROUND_PANEL_LIBS)
++
+ libbackground_la_SOURCES =            \
+       cc-background-panel.c           \
+       cc-background-panel.h
+@@ -47,9 +49,9 @@
+ libbackground_la_LIBADD = $(PANEL_LIBS) $(BACKGROUND_PANEL_LIBS) libbackground-chooser.la
+ 
+ if WITH_LIBSOCIALWEB
+-libbackground_la_SOURCES += bg-flickr-source.c bg-flickr-source.h
++libbackground_chooser_la_SOURCES += bg-flickr-source.c bg-flickr-source.h
+ INCLUDES += $(SOCIALWEB_CFLAGS)
+-libbackground_la_LIBADD += $(SOCIALWEB_LIBS)
++libbackground_chooser_la_LIBADD += $(SOCIALWEB_LIBS)
+ endif
+ 
+ noinst_PROGRAMS = test-chooser-dialog

diff --git a/gnome-control-center.spec b/gnome-control-center.spec
index 20c5d5d6f23081985a42a113b40b0ae8c188a453..fafe7d497ed85aeea93152f180af745cac23ec35 100644 (file)
--- a/gnome-control-center.spec
+++ b/gnome-control-center.spec
@@ -1,6 +1,6 @@
 #
 # Conditional build:
-%bcond_without ibus    # ibus support need not yet released ibus 1.5 or at least devel 1.4.99 version
+%bcond_without ibus    # ibus support
 
 Summary:       GNOME Control Center
 Summary(es.UTF-8):     El centro de controle del GNOME
@@ -10,13 +10,14 @@ Summary(ru.UTF-8):  Центр управления GNOME
 Summary(uk.UTF-8):     Центр керування GNOME
 Name:          gnome-control-center
 Version:       3.10.1
-Release:       1
+Release:       2
 Epoch:         1
 License:       GPL v2+
 Group:         X11/Applications
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-control-center/3.10/%{name}-%{version}.tar.xz
 # Source0-md5: 0fc5b06af19d57d13f7f94df51a6a805
 Patch0:                krb5.patch
+Patch1:                bug709302.patch
 URL:           http://www.gnome.org/
 BuildRequires: ModemManager-devel >= 1.0.0
 # use libnm-gtk - will use correct NM version
@@ -151,6 +152,7 @@ Bashowe uzupełnianie nazw dla gnome-control-center.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__intltoolize}