From 4ce2406d123e7f3f83e1f37b091847c87561b5b1 Mon Sep 17 00:00:00 2001
From: Erik van Pienbroek <epienbro@fedoraproject.org>
Date: Nov 21 2012 19:13:08 +0000
Subject: Update to eab5c13 snapshot


- Fixes new e-mail detection in evolution 3.6
- Use a more efficient method to retrieve unread mails from
  evolution as suggested by Milan Crha (GNOME BZ #688429)
- Replaced the patch with a sed call to avoid multiple gcc -O optimalisation flags being used

---

diff --git a/.gitignore b/.gitignore
index 29aa12b..85acfbb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 mail-notification-5.3.tar.bz2
 /mail-notification-b4ca832.tar.gz
 /mail-notification-72ad191.tar.gz
+/mail-notification-eab5c13.tar.gz
diff --git a/mail-notification-5.4-build-without-optimalisations.patch b/mail-notification-5.4-build-without-optimalisations.patch
deleted file mode 100644
index 7c09231..0000000
--- a/mail-notification-5.4-build-without-optimalisations.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- jbsrc/jb.c.orig	2011-02-08 23:11:32.767114666 +0100
-+++ jbsrc/jb.c	2011-02-08 23:18:48.870910628 +0100
-@@ -446,6 +446,9 @@
-    */
-   jb_compile_options_add_ldflags(object->compile_options, "-Wl,--export-dynamic");
- 
-+  jb_compile_options_add_cppflags(object->compile_options, "-O0");
-+  jb_compile_options_add_ldflags(object->compile_options, "-O0");
-+
-   jb_compile_options_add_libs(object->compile_options, "-lm");
-   jb_compile_options_add_libs(object->compile_options, "-lX11");
- 
diff --git a/mail-notification.spec b/mail-notification.spec
index 2103fe7..0797628 100644
--- a/mail-notification.spec
+++ b/mail-notification.spec
@@ -1,8 +1,8 @@
-%global git_revision 72ad191
+%global git_revision eab5c13
 
 Name:           mail-notification
 Version:        5.4
-Release:        63.git%{git_revision}%{?dist}
+Release:        64.git.%{git_revision}%{?dist}
 Summary:        Status icon that informs you if you have new mail
 
 Group:          Applications/Internet
@@ -16,8 +16,6 @@ URL:            http://www.nongnu.org/mailnotify/
 # wget https://github.com/epienbroek/mail-notification/tarball/$git_revision -O mail-notification-$git_revision.tar.gz
 Source0:        mail-notification-%{git_revision}.tar.gz
 
-Patch1:         mail-notification-5.4-build-without-optimalisations.patch
-
 BuildRequires:  gettext
 BuildRequires:  desktop-file-utils, scrollkeeper
 BuildRequires:  openssl-devel >= 0.9.6
@@ -67,16 +65,15 @@ Evolution support for Mail Notification.
 %prep
 %setup -q -n epienbroek-%{name}-%{git_revision}
 
-# Temporary patch to build without any optimalisations so we
-# can get better stacktraces for RHBZ #531088
-%patch1 -p0 -b .gcc
-
 
 %build
+# Temporary build without any optimalisations so we
+# can get better stacktraces for RHBZ #531088
+CFLAGS=$(echo $RPM_OPT_FLAGS | sed s/O2/O0/)
 
 ./jb configure \
   cc="%{__cc}" \
-  cflags="$RPM_OPT_FLAGS" \
+  cflags="$CFLAGS" \
   cppflags="-D_GNU_SOURCE" \
   destdir=$RPM_BUILD_ROOT \
   prefix=%{_prefix} \
@@ -164,6 +161,13 @@ touch --no-create %{_datadir}/icons/hicolor || :
 
 
 %changelog
+* Wed Nov 21 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 5.4.64.git.eab5c13
+- Update to eab5c13 snapshot
+- Fixes new e-mail detection in evolution 3.6
+- Use a more efficient method to retrieve unread mails from
+  evolution as suggested by Milan Crha (GNOME BZ #688429)
+- Replaced the patch with a sed call to avoid multiple gcc -O optimalisation flags being used
+
 * Tue Nov 20 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 5.4-63.git72ad191
 - Update to 72ad191 snapshot
 - Fixes compatibility with GLib 2.35 (deprecated g_type_init)
diff --git a/sources b/sources
index e8004b5..884aaab 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-08600c3a80c202f4e24d9b14e6c76a3c  mail-notification-72ad191.tar.gz
+be90f9c63d190b93df4112e1ebe13da0  mail-notification-eab5c13.tar.gz