rpms/mail-notification/devel mail-notification-mail-reader-launch.patch, NONE, 1.1 mail-notification.spec, 1.32, 1.33

[Thorsten Leemhuis (thl)]

Author: thl

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

Modified Files:
	mail-notification.spec 
Added Files:
	mail-notification-mail-reader-launch.patch 
Log Message:
3.0-11 -- add mail-notification-mail-reader-launch.patch (#215119, credits go to John Conroy)

mail-notification-mail-reader-launch.patch:

--- NEW FILE mail-notification-mail-reader-launch.patch ---
--- 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);


Index: mail-notification.spec
===================================================================
RCS file: /cvs/extras/rpms/mail-notification/devel/mail-notification.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- mail-notification.spec	9 Nov 2006 10:53:20 -0000	1.32
+++ mail-notification.spec	21 Nov 2006 19:15:24 -0000	1.33
@@ -2,7 +2,7 @@
 
 Name:           mail-notification
 Version:        3.0
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Status icon that informs you if you have new mail
 
 Group:          Applications/Internet
@@ -11,6 +11,7 @@
 Source0:        http://savannah.nongnu.org/download/mailnotify/mail-notification-3.0.tar.gz
 Source1:        mail-notification-README.FEDORA
 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
@@ -57,6 +58,7 @@
 %prep
 %setup -q -n %{name}-%{version}
 %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
@@ -133,6 +135,10 @@
 
 
 %changelog
+* 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)
+
 * Thu Nov 09 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info>  3.0-10
 - Update patch