rpms/sylpheed/devel sylpheed-2.4.6-defs.h.patch, NONE, 1.1 sylpheed.spec, 1.57, 1.58 sylpheed-2.2.3-defs.h.patch, 1.1, NONE

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/pkgs/rpms/sylpheed/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29285

Modified Files:
	sylpheed.spec 
Added Files:
	sylpheed-2.4.6-defs.h.patch 
Removed Files:
	sylpheed-2.2.3-defs.h.patch 
Log Message:
* Tue Oct 02 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.4.6-2
- Require xdg-utils and use xdg-open instead of gnome-open in defs.h
  patch.


sylpheed-2.4.6-defs.h.patch:

--- NEW FILE sylpheed-2.4.6-defs.h.patch ---
diff -Nur sylpheed-2.4.6-orig/libsylph/defs.h sylpheed-2.4.6/libsylph/defs.h
--- sylpheed-2.4.6-orig/libsylph/defs.h	2007-10-02 09:57:18.000000000 +0200
+++ sylpheed-2.4.6/libsylph/defs.h	2006-09-22 04:58:56.000000000 +0200
@@ -87,12 +87,12 @@
 #else
 #  define DEFAULT_SIGNATURE	".signature"
 #endif
-#define DEFAULT_INC_PATH	"/usr/bin/inc"
+#define DEFAULT_INC_PATH	"/usr/bin/mh/inc"
 #define DEFAULT_INC_PROGRAM	"inc"
 /* #define DEFAULT_INC_PATH	"/usr/bin/imget" */
 /* #define DEFAULT_INC_PROGRAM	"imget" */
 #define DEFAULT_SENDMAIL_CMD	"/usr/sbin/sendmail -t -i"
-#define DEFAULT_BROWSER_CMD	"xdg-open '%s'"
+#define DEFAULT_BROWSER_CMD	"mozilla-firefox -remote 'openURL(%s,new-window)'"
 
 #ifdef _PATH_MAILDIR
 #  define DEFAULT_SPOOL_PATH	_PATH_MAILDIR


Index: sylpheed.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sylpheed/devel/sylpheed.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- sylpheed.spec	19 Sep 2007 09:59:04 -0000	1.57
+++ sylpheed.spec	2 Oct 2007 08:01:12 -0000	1.58
@@ -5,13 +5,13 @@
 Summary: GTK+ based, lightweight, and fast email client
 Name: sylpheed
 Version: 2.4.6
-Release: 1
+Release: 2
 License: GPLv2+
 URL: http://sylpheed.sraoss.jp/
 Group: Applications/Internet
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 BuildRequires: gtk2-devel openssl-devel
-BuildRequires: desktop-file-utils pkgconfig gettext
+BuildRequires: desktop-file-utils pkgconfig gettext xdg-utils
 %{!?_without_gpgme:BuildRequires: gpgme-devel}
 %{!?_without_compface:BuildRequires: compface-devel}
 %{!?_without_ldap:BuildRequires: openldap-devel}
@@ -20,11 +20,14 @@
 Source0: http://sylpheed.sraoss.jp/sylpheed/v2.4/%{name}-%{version}.tar.bz2
 Source1: sylpheed.1
 
-Patch1: sylpheed-2.2.3-defs.h.patch
+Patch1: sylpheed-2.4.6-defs.h.patch
 Patch2: sylpheed-2.4.2-desktop.patch
 Patch3: sylpheed-2.3.1-certsdir.patch
 Patch4: sylpheed-2.2.5-prefs_common.patch
 
+# For xdg-open in patch1.
+Requires: xdg-utils
+
 %description
 This program is an X based fast email client which has features
 like:
@@ -84,6 +87,10 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Oct 02 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.4.6-2
+- Require xdg-utils and use xdg-open instead of gnome-open in defs.h
+  patch.
+
 * Wed Sep 19 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.4.6-1
 - Update to 2.4.6 (bug-fixes, but also minor feature additions
   and rewrites).


--- sylpheed-2.2.3-defs.h.patch DELETED ---