From 7888d8c5c416882e0395ec6dfbe5ce86a8598a823a69bb88e84d2ef3558b4309 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 14 Feb 2011 00:30:21 +0000 Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/gnome-shell revision 25.0 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-shell?expand=0&rev=3aefd3baf9fef0082d95f63acf3f3934 --- gnome-shell.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/gnome-shell.spec b/gnome-shell.spec index ca93c9b..f5dbde7 100644 --- a/gnome-shell.spec +++ b/gnome-shell.spec @@ -16,8 +16,6 @@ # -# set this in prjconf or here -#define BUILD_AGAINST_GNOME3 0 Name: gnome-shell Version: 2.91.6 From a3f383e767faf4274330a2838139c04fa891f7a0136543d4f7e3e9a5ded99c9e Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Tue, 15 Feb 2011 11:05:19 +0000 Subject: [PATCH 2/2] Accepting request 61222 from home:vuntz:branches:GNOME:Factory Forwarding to openSUSE:Factory OBS-URL: https://build.opensuse.org/request/show/61222 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-shell?expand=0&rev=48 --- gnome-shell.changes | 6 ++++++ gnome-shell.spec | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/gnome-shell.changes b/gnome-shell.changes index a88c2fd..e99b884 100644 --- a/gnome-shell.changes +++ b/gnome-shell.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Feb 15 09:59:51 CET 2011 - vuntz@opensuse.org + +- Fix build: BUILD_AGAINST_GNOME3 is not necessarily defined, so + use %{?BUILD_AGAINST_GNOME3}. + ------------------------------------------------------------------- Sun Feb 13 16:16:33 CET 2011 - vuntz@opensuse.org diff --git a/gnome-shell.spec b/gnome-shell.spec index f5dbde7..969fc99 100644 --- a/gnome-shell.spec +++ b/gnome-shell.spec @@ -57,7 +57,7 @@ Requires: gdk-pixbuf-loader-rsvg Requires: gjs Requires: gnome-icon-theme-symbolic Requires: gnome-session -%if 0%BUILD_AGAINST_GNOME3 +%if 0%{?BUILD_AGAINST_GNOME3} # For a GSettings schema Requires: gnome-settings-daemon %endif @@ -79,7 +79,7 @@ documents, and organizing open windows in GNOME. %lang_package %prep %setup -q -%if ! 0%BUILD_AGAINST_GNOME3 +%if ! 0%{?BUILD_AGAINST_GNOME3} %patch0 -p1 %endif