[mail-notification/f12/master] revert last changes

[Dmitry Butskoy]

commit b97ec5063eb12550ae83090ec9a773af25fd3e36
Author: Dmitry Butskoy <Dmitry at Butskoy.name>
Date:   Mon Oct 11 19:39:42 2010 +0400

    revert last changes

 mail-notification-5.4-kde-trayicon.patch |   72 ------------------------------
 mail-notification-5.4-popup-attach.patch |   45 ------------------
 mail-notification.spec                   |   55 ++---------------------
 3 files changed, 4 insertions(+), 168 deletions(-)
---
diff --git a/mail-notification.spec b/mail-notification.spec
index 7cedd31..2712a7f 100644
--- a/mail-notification.spec
+++ b/mail-notification.spec
@@ -1,6 +1,6 @@
 Name:           mail-notification
 Version:        5.4
-Release:        25%{?dist}
+Release:        16%{?dist}
 Summary:        Status icon that informs you if you have new mail
 
 Group:          Applications/Internet
@@ -11,11 +11,6 @@ Patch0:		mail-notification-5.4-evolution.patch
 Patch1:		mail-notification-5.4-gmime.patch
 Patch2:		mail-notification-5.4-sasl_encode64.patch
 Patch3:		mail-notification-5.4-evolution-gtkhtml.patch
-Patch4:		mail-notification-5.4-camel_headers.patch
-Patch5:		mail-notification-5.4-icons.patch
-Patch6:		mail-notification-5.4-weak.patch
-Patch7:		mail-notification-5.4-popup-attach.patch
-Patch8:		mail-notification-5.4-kde-trayicon.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gettext
@@ -35,9 +30,6 @@ BuildRequires:  perl-XML-Parser
 BuildRequires:  evolution-devel 
 BuildRequires:  evolution-data-server-devel >= 1.5
 
-# temporary to work-around some dependency issues in other packages...
-BuildRequires:  libICE-devel, libSM-devel
-
 Requires:         hicolor-icon-theme
 
 Requires(pre):    GConf2
@@ -65,15 +57,10 @@ Evolution support for Mail Notification.
 
 %prep
 %setup -q
-%patch0 -p1 -b .evolution
+%patch0 -p0 -b .evolution
 %patch1 -p1 -b .gmime
 %patch2 -p1 -b .sasl_encode64
 %patch3 -p1 -b .gtkhtml
-%patch4 -p1 -b .camel_headers
-%patch5 -p1 -b .icons
-%patch6 -p1 -b .weak
-%patch7 -p1 -b .popup_attach
-%patch8 -p1 -b .kde_trayicon
 
 #  Drop #line statements in C sources generated bu .gob,
 #  for the proper debuginfo package
@@ -91,7 +78,6 @@ popd
 	cc="%{__cc}" \
 	cflags="$RPM_OPT_FLAGS" \
 	cppflags="-D_GNU_SOURCE" \
-	libs="-lX11" \
 	destdir=$RPM_BUILD_ROOT \
 	prefix=%{_prefix} \
 	bindir=%{_bindir} \
@@ -118,7 +104,7 @@ rm -rf $RPM_BUILD_ROOT%{_localstatedir}
 
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
-chmod +x $RPM_BUILD_ROOT%{_libdir}/evolution/*/plugins/*.so
+chmod +x $RPM_BUILD_ROOT%{_libdir}/evolution/2.*/plugins/*.so
 
 desktop-file-install --vendor fedora                   \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/gnome/autostart/  \
@@ -195,43 +181,10 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 
 %files evolution-plugin
 %defattr(-,root,root,-)
-%{_libdir}/evolution/*/plugins/*
+%{_libdir}/evolution/2.*/plugins/*
 
 
 %changelog
-* Mon Oct 11 2010 Dmitry Butskoy <Dmitry at Butskoy.name> - 5.4-25
-- fix popup window place
-  (#608372, by Erik van Pienbroek <erik-fedora at vanpienbroek.nl>)
-- fix tray icon freezes on KDE when unread count reaches zero (#641580)
-
-* Fri Sep 17 2010 Dmitry Butskoy <Dmitry at Butskoy.name> - 5.4-24
-- add support for evolution 2.31+
-  (#633507, by Erik van Pienbroek <erik-fedora at vanpienbroek.nl>)
-  Combined with common evolution patch
-
-* Thu Sep  9 2010 Dmitry Butskoy <Dmitry at Butskoy.name> - 5.4-23
-- rebuild with new evolution-data-server
-
-* Wed Jul 14 2010 Dmitry Butskoy <Dmitry at Butskoy.name> - 5.4-22
-- rebuild with new gtkhtml3
-
-* Tue Jun  8 2010 Dmitry Butskoy <Dmitry at Butskoy.name> - 5.4-21
-- rebuild with new evolution-data-server
-
-* Mon May 24 2010 Dmitry Butskoy <Dmitry at Butskoy.name> - 5.4-20
-- change icon usage for Fedora 13 (#573809)
-- fix some memory failures (Mat Booth <fedora at matbooth.co.uk>)
-
-* Tue May  4 2010 Dmitry Butskoy <Dmitry at Butskoy.name> - 5.4-19
-- rebuilt with new evolution-data-server
-
-* Fri Feb 16 2010 Dmitry Butskoy <Dmitry at Butskoy.name> - 5.4-18
-- rebuilt with gmime-2.6
-- explicitly link with libX11 (#564739)
-
-* Mon Feb  1 2010 Dmitry Butskoy <Dmitry at Butskoy.name> - 5.4-17
-- update evolution patch (#538956, by Matthew Barnes <mbarnes at redhat.com>)
-
 * Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> - 5.4-16
 - rebuilt with new openssl