From 700714cf59e0b6d9fb56e37d0c5cdf38ffd51026 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 18 Jul 2012 13:34:53 -0400 Subject: [PATCH] Re-add autotools build dependencies I accidentally removed them in 15f410469c704f33dd67ff9b035e32a9fb2c3cf4 While we have the patient open, just rely on the "rm configure" bit to ensure we call autogen.sh. --- gnome-shell.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gnome-shell.spec b/gnome-shell.spec index 38c2736..6f7c54e 100644 --- a/gnome-shell.spec +++ b/gnome-shell.spec @@ -19,6 +19,11 @@ Patch1: gnome-shell-favourite-apps-firefox.patch %define eds_version 2.91.6 %define json_glib_version 0.13.2 +## Needed when we re-autogen +BuildRequires: autoconf >= 2.53 +BuildRequires: automake >= 1.10 +BuildRequires: gnome-common >= 2.2.0 +BuildRequires: libtool >= 1.4.3 BuildRequires: chrpath BuildRequires: clutter-devel >= %{clutter_version} BuildRequires: dbus-glib-devel @@ -88,13 +93,12 @@ easy to use experience. %patch0 -p1 -b .avoid-redhat-menus %patch1 -p1 -b .firefox +# reautogen for Mirror-Evolution-calendar-settings-into-our-own-sche.patch rm configure %build export CFLAGS="$RPM_OPT_FLAGS -Wno-error=deprecated-declarations" -# (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; fi; -# reautogen for Mirror-Evolution-calendar-settings-into-our-own-sche.patch - (NOCONFIGURE=1 ./autogen.sh; +(if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; fi; %configure --disable-static) make V=1 %{?_smp_mflags}