rpms/mail-notification/devel .cvsignore, 1.7, 1.8 mail-notification.spec, 1.33, 1.34 sources, 1.7, 1.8 mail-notification-README.FEDORA, 1.1, NONE mail-notification-mail-reader-launch.patch, 1.1, NONE

[Thorsten Leemhuis (thl)]

Author: thl

Update of /cvs/extras/rpms/mail-notification/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11059

Modified Files:
	.cvsignore mail-notification.spec sources 
Removed Files:
	mail-notification-README.FEDORA 
	mail-notification-mail-reader-launch.patch 
Log Message:
4.0-0.1.rc1 -- Update to 4.0rc1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mail-notification/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	14 Jun 2006 16:34:41 -0000	1.7
+++ .cvsignore	28 Nov 2006 06:56:57 -0000	1.8
@@ -1 +1 @@
-mail-notification-3.0.tar.gz
+mail-notification-4.0-rc1.tar.gz


Index: mail-notification.spec
===================================================================
RCS file: /cvs/extras/rpms/mail-notification/devel/mail-notification.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- mail-notification.spec	21 Nov 2006 19:15:24 -0000	1.33
+++ mail-notification.spec	28 Nov 2006 06:56:57 -0000	1.34
@@ -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:  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 @@
 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 @@
 /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 @@
 
 %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 @@
 %{_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 @@
 
 
 %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)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mail-notification/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	14 Jun 2006 16:34:41 -0000	1.7
+++ sources	28 Nov 2006 06:56:57 -0000	1.8
@@ -1 +1 @@
-d19fb5c96a0f54d1b1541fbddf73488e  mail-notification-3.0.tar.gz
+91c09b72a59d161564b47fff033be37e  mail-notification-4.0-rc1.tar.gz


--- mail-notification-README.FEDORA DELETED ---


--- mail-notification-mail-reader-launch.patch DELETED ---