From f2febfb4b8406b449f2b065c5d8ab675c33d4d5f Mon Sep 17 00:00:00 2001
From: Thorsten Leemhuis <thl@fedoraproject.org>
Date: Aug 14 2005 18:03:09 +0000
Subject: Update to 2.0 (without evo for now); Use dist; new BR gob2


---

diff --git a/.cvsignore b/.cvsignore
index db1de9a..2d098dc 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,3 @@
-mail-notification-1.1.tar.gz
+mail-notification-2.0.tar.gz
+mail-notification-2.0-buildfix.diff
+mail-notification-2.0-gmail-properties-fix.diff
diff --git a/mail-notification.spec b/mail-notification.spec
index 2f55f9b..c83c51c 100644
--- a/mail-notification.spec
+++ b/mail-notification.spec
@@ -1,13 +1,15 @@
 Name:           mail-notification
-Version:        1.1
-Release:        3
+Version:        2.0
+Release:        1%{?dist}
 Summary:        Status icon that informs you if you have new mail
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://www.nongnu.org/mailnotify/
-Source0:        http://savannah.nongnu.org/download/mailnotify/mail-notification-1.1.tar.gz
+Source0:        http://savannah.nongnu.org/download/mailnotify/mail-notification-2.0.tar.gz
 Source1:        mail-notification-README.FEDORA
+Patch0:		http://savannah.nongnu.org/download/mailnotify/mail-notification-2.0-buildfix.diff
+Patch1:		http://savannah.nongnu.org/download/mailnotify/mail-notification-2.0-gmail-properties-fix.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gettext >= 0.14.1
@@ -21,6 +23,8 @@ BuildRequires:  libsoup-devel >= 2.2.1
 BuildRequires:  gnutls-devel >= 1.0.20
 BuildRequires:  libgcrypt-devel >= 1.2.0
 BuildRequires:  libicu-devel >= 2.6
+BuildRequires:  gob2
+
 
 Requires(post):   GConf2
 Requires(post):   scrollkeeper
@@ -37,11 +41,12 @@ Xfce Notification Area and the KDE System Tray.
 %prep
 %setup -q
 cp %{SOURCE1} ./README.FEDORA
-
+%patch0 -b .patch0
+%patch1 -b .patch1
 
 
 %build
-%configure
+%configure --disable-evolution
 make %{?_smp_mflags}
 
 
@@ -61,6 +66,11 @@ desktop-file-install --vendor fedora                   \
   --add-category X-Fedora                              \
   ${RPM_BUILD_ROOT}%{_datadir}/applications/mail-notification.desktop
 
+desktop-file-install --vendor fedora                   \
+  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications      \
+  --delete-original                                    \
+  --add-category X-Fedora                              \
+  ${RPM_BUILD_ROOT}%{_datadir}/applications/mail-notification-properties.desktop
 
 
 %clean
@@ -91,9 +101,10 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 %{_sysconfdir}/gconf/schemas/mail-notification.schemas
 %{_sysconfdir}/sound/events/mail-notification.soundlist
 %{_bindir}/*
-%{_libdir}/bonobo/servers/GNOME_MailNotification_Automation.server
+%{_libdir}/bonobo/servers/GNOME_MailNotification.server
 %{_datadir}/%{name}
-%{_datadir}/control-center-2.0/capplets/mail-notification-properties.desktop
+%{_datadir}/applications/fedora-mail-notification.desktop
+%{_datadir}/applications/fedora-mail-notification-properties.desktop
 %{_datadir}/gnome/help/mail-notification/
 %dir %{_datadir}/omf/mail-notification/
 %{_datadir}/omf/mail-notification/mail-notification-C.omf
@@ -102,6 +113,13 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 
 
 %changelog
+* Wed Aug 10 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.0-1
+- Update to 2.0 -- build without evolution support for now (seems it
+  needs the whole evo-source)
+- Use dist
+- Add two patches
+- New BR gob2
+
 * Wed May 18 2005 Colin Charles <colin@fedoraproject.org> - 1.1.-3
 - bump release, request build for ppc
 
diff --git a/sources b/sources
index 6152bb1..602bc44 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
-2359fb53128b12cf295bdf8553e5869b  mail-notification-1.1.tar.gz
+56ef7401aba1cb27d881fb0f33a3248d  mail-notification-2.0.tar.gz
+9b632ffa3d886c3829752ea656adf8f1  mail-notification-2.0-buildfix.diff
+7e2243b625802214a46bce8d633b94dc  mail-notification-2.0-gmail-properties-fix.diff