[control-center/f20] Add a patch from upstream to fix the build
Richard Hughes
rhughes at fedoraproject.org
Wed Oct 16 10:39:41 UTC 2013
commit a6ad56eb406e7923dcf95238bf9f15aab74776df
Author: Richard Hughes <richard at hughsie.com>
Date: Wed Oct 16 11:39:24 2013 +0100
Add a patch from upstream to fix the build
control-center.spec | 8 +++++++-
fix-compile.patch | 27 +++++++++++++++++++++++++++
2 files changed, 34 insertions(+), 1 deletions(-)
---
diff --git a/control-center.spec b/control-center.spec
index 4646bba..5e9361e 100644
--- a/control-center.spec
+++ b/control-center.spec
@@ -22,6 +22,9 @@ URL: http://www.gnome.org
# https://bugzilla.gnome.org/show_bug.cgi?id=695691
Patch0: distro-logo.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=709302
+Patch1: fix-compile.patch
+
Requires: gnome-settings-daemon >= %{gsd_version}
Requires: redhat-menus >= %{redhat_menus_version}
Requires: gnome-icon-theme
@@ -93,6 +96,7 @@ BuildRequires: docbook-style-xsl
BuildRequires: systemd-devel
BuildRequires: libpwquality-devel
BuildRequires: ibus-devel
+BuildRequires: autoconf automake libtool
%ifnarch s390 s390x
BuildRequires: gnome-bluetooth-devel >= 3.9.3
BuildRequires: libwacom-devel
@@ -133,8 +137,10 @@ utilities.
%prep
%setup -q -n gnome-control-center-%{version}
%patch0 -p1 -b .distro-logo
+%patch1 -p1 -b .fix-compile
%build
+autoreconf
%configure \
--disable-static \
--disable-update-mimedb \
@@ -146,7 +152,7 @@ utilities.
# libtool doesn't make this easy, so we do it the hard way
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
%install
make install DESTDIR=$RPM_BUILD_ROOT
diff --git a/fix-compile.patch b/fix-compile.patch
new file mode 100644
index 0000000..b6b0385
--- /dev/null
+++ b/fix-compile.patch
@@ -0,0 +1,27 @@
+From accd18a1e7de2318ef10cdf8d41098f3fcb17ee8 Mon Sep 17 00:00:00 2001
+From: Kalev Lember <kalevlember at gmail.com>
+Date: Wed, 16 Oct 2013 12:01:36 +0200
+Subject: [PATCH] background: Fix test-chooser-dialog build with some linkers
+
+List missing libs for the libbackground-chooser.la convenciene library.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=709302
+---
+ panels/background/Makefile.am | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/panels/background/Makefile.am b/panels/background/Makefile.am
+index f24f8b3..2766207 100644
+--- a/panels/background/Makefile.am
++++ b/panels/background/Makefile.am
+@@ -40,6 +40,8 @@ libbackground_chooser_la_SOURCES = \
+ 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
+--
+1.8.3.1
\ No newline at end of file
More information about the scm-commits
mailing list