From e13ef4c131037302855ca22b3c4d78048247c5d2 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Dec 05 2010 23:12:14 +0000 Subject: drop f-15 patch --- diff --git a/syncevolution-1.1-libnotify07.patch b/syncevolution-1.1-libnotify07.patch deleted file mode 100644 index 302ea02..0000000 --- a/syncevolution-1.1-libnotify07.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- syncevolution-1.1/src/syncevo-dbus-server.cpp 2010-10-21 00:56:31.000000000 -0700 -+++ syncevolution-1.1/src/syncevo-dbus-server.cpp.new 2010-11-24 14:43:13.717662962 -0800 -@@ -6108,7 +6108,7 @@ - notify_notification_clear_actions(m_notification); - notify_notification_close(m_notification, NULL); - } -- m_notification = notify_notification_new(summary, body, NULL, NULL); -+ m_notification = notify_notification_new(summary, body, NULL); - //if actions are not supported, don't add actions - //An example is Ubuntu Notify OSD. It uses an alert box - //instead of a bubble when a notification is appended with actions. diff --git a/syncevolution.spec b/syncevolution.spec index 96222bd..d3c8b62 100644 --- a/syncevolution.spec +++ b/syncevolution.spec @@ -1,14 +1,12 @@ Summary: SyncML client for evolution Name: syncevolution Version: 1.1 -Release: 3%{?dist} +Release: 2%{?dist} Epoch: 1 License: LGPLv2+ Group: Applications/Productivity URL: http://syncevolution.org/ Source: http://downloads.syncevolution.org/syncevolution/sources/%{name}-%{version}.tar.gz -# https://bugs.meego.com/show_bug.cgi?id=10453 -Patch0: syncevolution-1.1-libnotify07.patch BuildRequires: bluez-libs-devel BuildRequires: boost-devel @@ -83,7 +81,7 @@ Perl utils for use with %{name}. %prep %setup -q -%patch0 -p1 -b .notify07 + # use the ac macros in Makefile.am sed -i '/^ACLOCAL_AMFLAGS/{ /m4-repo/!s/$/ -I m4-repo/ }' Makefile*.am touch -r Makefile-gen.am Makefile.am @@ -169,12 +167,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/sync-moblin.desktop %{_datadir}/syncevolution/xml/*.pl %changelog -* Sun Dec 5 2010 Peter Robinson - 1:1.1-3 +* Sun Dec 5 2010 Peter Robinson - 1:1.1-2 - Update deps and other spec bits -* Wed Nov 24 2010 Adam Williamson - 1:1.1-2 -- add libnotify07 patch to build against libnotify 0.7 - * Tue Oct 26 2010 Peter Robinson - 1:1.1-1 - Update to 1.1 stable release