From 4b52876793c96cc2282f72119818856bac6c6d19 Mon Sep 17 00:00:00 2001
From: dmalcolm <dmalcolm@fedoraproject.org>
Date: Jan 26 2005 18:35:17 +0000
Subject: - Make the evolution-data-server dependency optional at packaging time.

- Disable it for now to ease transition to Evolution 2.2 (bug #146283)

---

diff --git a/gnome-panel.spec b/gnome-panel.spec
index 292fca6..45dece1 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -13,10 +13,12 @@
 %define startup_notification_version 0.5
 %define redhat_menus_version 0.32
 
+%define use_evolution_data_server 0
+
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.8.1
-Release: 6
+Release: 7
 URL: http://www.gnome.org
 Source0: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/gnome-panel/%{name}-%{version}.tar.bz2
 Source1: %{name}-%{version}-extrapo.tar.bz2
@@ -32,7 +34,9 @@ Requires: gnome-desktop >= %{gnome_desktop_version}
 Requires: libwnck >= %{libwnck_version}
 Requires: redhat-menus >= %{redhat_menus_version}
 Requires: gnome-keyring
+%if %{use_evolution_data_server}
 Requires: evolution-data-server
+%endif
 
 Prereq: /bin/awk, /bin/cat, /bin/ln, /bin/rm
 Prereq: GConf2 >= 2.6.0-2
@@ -56,7 +60,9 @@ BuildRequires: fontconfig-devel
 BuildRequires: startup-notification-devel >= %{startup_notification_version}
 BuildRequires: libtool automake autoconf
 BuildRequires: gnome-keyring-devel
+%if %{use_evolution_data_server}
 BuildRequires: evolution-data-server-devel
+%endif
 
 Patch0: gnome-panel-2.8.1-use-new-config-location.patch
 Patch1: gnome-panel-2.6.0-use-correct-applications-uri.patch
@@ -105,7 +111,12 @@ cp -f %{SOURCE4} gnome-panel/panel-compatibility.schemas
 perl -pi -e 's/PANEL_STOCK_GNOME_LOGO/PANEL_STOCK_MAIN_MENU/g' gnome-panel/menu.c gnome-panel/panel-menu-bar.c
 
 %build
-%configure --disable-gtk-doc --enable-eds
+%configure \
+   --disable-gtk-doc \
+%if %{use_evolution_data_server}
+   --enable-eds
+%endif
+
 make
 
 # Add GIMLET to the default panel in CJK
@@ -216,6 +227,10 @@ fi
 %{_datadir}/gtk-doc
 
 %changelog
+* Wed Jan 26 2005 David Malcolm <dmalcolm@redhat.com> - 2.8.1-7
+- Make the evolution-data-server dependency optional at packaging time.
+- Disable it for now to ease transition to Evolution 2.2 (bug #146283)
+
 * Fri Nov 26 2004 Mark McLoughlin <markmc@redhat.com> - 2.8.1-6
 - Add patch to fix launcher animation artifact (bug #136938)