From df2d2ce82141173bb87c7c56a1888584123dd37a Mon Sep 17 00:00:00 2001
From: Thorsten Leemhuis <thl@fedoraproject.org>
Date: Nov 28 2006 06:56:57 +0000
Subject: 4.0-0.1.rc1 -- Update to 4.0rc1


---

diff --git a/.cvsignore b/.cvsignore
index aa3ff41..51669ba 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-mail-notification-3.0.tar.gz
+mail-notification-4.0-rc1.tar.gz
diff --git a/mail-notification-README.FEDORA b/mail-notification-README.FEDORA
deleted file mode 100644
index 6721ed0..0000000
--- a/mail-notification-README.FEDORA
+++ /dev/null
@@ -1,4 +0,0 @@
-Note: due to a bug in bonobo-activation, your session must be restarted after installing Mail Notification.
-
-For Details see:
-http://bugzilla.gnome.org/show_bug.cgi?id=151082
diff --git a/mail-notification-mail-reader-launch.patch b/mail-notification-mail-reader-launch.patch
deleted file mode 100644
index e41b5b3..0000000
--- a/mail-notification-mail-reader-launch.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- mail-notification-3.0.org/src/mn-conf.c	2006-05-18 09:23:42.000000000 -0400
-+++ mail-notification-3.0/src/mn-conf.c	2006-11-11 07:58:01.000000000 -0500
-@@ -1119,14 +1119,15 @@
-   if (strip_format)
-     {
-       GString *stripped;
--      char *start;
--      char *p;
- 
-       stripped = g_string_new(NULL);
-+      g_string_append_len(stripped, command, strstr(command, " ") - command);
- 
--      for (start = command; (p = strstr(start, "%s")); start = p + 2)
--	g_string_append_len(stripped, start, p - start);
--      g_string_append(stripped, start);
-+      if (!strcmp(stripped->str, "mozilla"))
-+        g_string_append(stripped, " -mail");
-+
-+      if (!strcmp(stripped->str, "evolution"))
-+        g_string_append(stripped, " --component=mail");
- 
-       g_free(command);
-       command = g_string_free(stripped, FALSE);
diff --git a/mail-notification.spec b/mail-notification.spec
index db55313..cff8fec 100644
--- a/mail-notification.spec
+++ b/mail-notification.spec
@@ -1,17 +1,13 @@
-# FIXME -- remove evo 2.10 workaround
-
 Name:           mail-notification
-Version:        3.0
-Release:        11%{?dist}
+Version:        4.0
+Release:        0.1%{?dist}.rc1
 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-3.0.tar.gz
-Source1:        mail-notification-README.FEDORA
+Source0:        http://savannah.nongnu.org/download/mailnotify/mail-notification-4.0-rc1.tar.gz
 Patch0:         mail-notification-fedora-plugin-hint.patch
-Patch1:         mail-notification-mail-reader-launch.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gettext >= 0.14.1
@@ -29,8 +25,9 @@ BuildRequires:  perl-XML-Parser
 BuildRequires:  gob2
 BuildRequires:  evolution-devel 
 BuildRequires:  evolution-data-server-devel >= 1.5
+BuildRequires:  libnotify-devel
 
-
+Requires:         hicolor-icon-theme
 Requires(post):   GConf2
 Requires(post):   scrollkeeper
 Requires(preun):  GConf2
@@ -56,12 +53,8 @@ Obsoletes:	mail-notification < 3.0-4
 Evolution support for Mail Notification.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}-%{version}-rc1
 %patch0 -p1 -b .patch0
-%patch1 -p1 -b .patch1
-cp %{SOURCE1} ./README.FEDORA
-# FIXME -- quick workaround for now
-sed -i 's/evolution_branch=2.8/evolution_branch=2.10/' configure
 
 %build
 %configure --disable-schemas-install  --enable-evolution
@@ -101,6 +94,9 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 /usr/bin/gconftool-2 --makefile-install-rule \
   %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null ||:
 /usr/bin/scrollkeeper-update -q ||:
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
 
 %preun
 # For GConf apps: uninstall app's system default schemas
@@ -111,11 +107,12 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 
 %postun
 /usr/bin/scrollkeeper-update -q ||:
-
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING NEWS README TODO README.FEDORA
+%doc AUTHORS COPYING NEWS README TODO
 %{_sysconfdir}/gconf/schemas/mail-notification.schemas
 %{_bindir}/*
 %{_libdir}/bonobo/servers/GNOME_MailNotification.server
@@ -125,8 +122,7 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 %{_datadir}/gnome/help/mail-notification/
 %dir %{_datadir}/omf/mail-notification/
 %{_datadir}/omf/mail-notification/mail-notification-C.omf
-%{_datadir}/pixmaps/mail-notification.png
-
+%{_datadir}/icons/hicolor/*/apps/mail-notification.*
 
 %files evolution-plugin
 %defattr(-,root,root,-)
@@ -135,6 +131,11 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 
 
 %changelog
+* Tue Nov 28 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info>  4.0-0.1.rc1
+- Update to 4.0rc1
+- remove some unneeded workarounds and patches
+- require hicolor-icon-theme
+
 * Tue Nov 21 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info>  3.0-11
 - add mail-notification-mail-reader-launch.patch (#215119, credits go to
   John Conroy)
diff --git a/sources b/sources
index 74805b8..3cd23dc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d19fb5c96a0f54d1b1541fbddf73488e  mail-notification-3.0.tar.gz
+91c09b72a59d161564b47fff033be37e  mail-notification-4.0-rc1.tar.gz