rpms/sylpheed/F-10 sylpheed-2.6.0-addrbook-csv-import.patch, NONE, 1.1 .cvsignore, 1.38, 1.39 sources, 1.38, 1.39 sylpheed.spec, 1.89, 1.90 sylpheed-2.5.0-socket-redefine.patch, 1.1, NONE sylpheed-2.5.0-svn2029.patch, 1.1, NONE sylpheed-2.5.0rc2-gtk-2.13.1.patch, 1.3, NONE

[Michael Schwendt]

Author: mschwendt

Update of /cvs/pkgs/rpms/sylpheed/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29049/F-10

Modified Files:
	.cvsignore sources sylpheed.spec 
Added Files:
	sylpheed-2.6.0-addrbook-csv-import.patch 
Removed Files:
	sylpheed-2.5.0-socket-redefine.patch 
	sylpheed-2.5.0-svn2029.patch 
	sylpheed-2.5.0rc2-gtk-2.13.1.patch 
Log Message:
sync with Fedora 11 development

sylpheed-2.6.0-addrbook-csv-import.patch:

--- NEW FILE sylpheed-2.6.0-addrbook-csv-import.patch ---
diff -Nur sylpheed-2.6.0-orig/src/addr_compl.c sylpheed-2.6.0/src/addr_compl.c
--- sylpheed-2.6.0-orig/src/addr_compl.c	2008-11-20 02:49:38.000000000 +0100
+++ sylpheed-2.6.0/src/addr_compl.c	2009-02-24 11:47:11.000000000 +0100
@@ -174,7 +174,7 @@
 	addr_ce = g_new0(completion_entry, 1);
 
 	ae = g_new0(address_entry, 1);
-	ae->name    = g_strdup(name);
+	ae->name    = g_strdup(name ? name : "");
 	ae->address = g_strdup(address);		
 	if ((found = g_list_find_custom(address_list, ae,
 					address_entry_find_func))) {


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sylpheed/F-10/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore	17 Jun 2008 11:00:25 -0000	1.38
+++ .cvsignore	18 Mar 2009 17:08:21 -0000	1.39
@@ -1,2 +1,2 @@
-sylpheed-2.5.0.tar.bz2.asc
-sylpheed-2.5.0.tar.bz2
+sylpheed-2.6.0.tar.bz2
+sylpheed-2.6.0.tar.bz2.asc


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sylpheed/F-10/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	17 Jun 2008 11:00:25 -0000	1.38
+++ sources	18 Mar 2009 17:08:21 -0000	1.39
@@ -1,2 +1,2 @@
-5b453dede37deea13e16c1be707b5dfe  sylpheed-2.5.0.tar.bz2.asc
-a6fc9e9c2a33876fddb33f25f40b820f  sylpheed-2.5.0.tar.bz2
+5b7ed03b106e2a0d300b103652dd34c2  sylpheed-2.6.0.tar.bz2
+495ba47f34dcdbce14f056dbab3a54aa  sylpheed-2.6.0.tar.bz2.asc


Index: sylpheed.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sylpheed/F-10/sylpheed.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- sylpheed.spec	28 Aug 2008 17:05:04 -0000	1.89
+++ sylpheed.spec	18 Mar 2009 17:08:21 -0000	1.90
@@ -2,10 +2,12 @@
 # people who have linked the desktop icon
 %define desktopvendor redhat
 
+%define tarversion 2.6.0
+
 Summary: GTK+ based, lightweight, and fast email client
 Name: sylpheed
-Version: 2.5.0
-Release: 4.2029svn%{?dist}
+Version: 2.6.0
+Release: 4%{?dist}
 License: GPLv2+
 URL: http://sylpheed.sraoss.jp/
 Group: Applications/Internet
@@ -21,23 +23,26 @@
 %if 0%{?fedora} > 8
 BuildRequires: enchant-devel
 %endif
-Source0: http://sylpheed.sraoss.jp/sylpheed/v2.5/%{name}-%{version}.tar.bz2
+Source0: http://sylpheed.sraoss.jp/sylpheed/v2.6/%{name}-%{tarversion}.tar.bz2
 Source1: sylpheed.1
 
+# customisations for default program paths
 Patch1: sylpheed-2.4.6-defs.h.patch
+# customisations in the .desktop file
 Patch2: sylpheed-2.5.0-desktop.patch
+# customisation for /etc/pki/tls/
 Patch3: sylpheed-2.5.0-certsdir.patch
+# customisation for default Folder View preferences to mimic older Sylpheed
 Patch4: sylpheed-2.5.0-prefs_common.patch
-Patch6: sylpheed-2.5.0rc2-gtk-2.13.1.patch
-Patch7: sylpheed-2.5.0-svn2029.patch
-Patch8: sylpheed-2.5.0-socket-redefine.patch
+# crash-fix
+Patch5: sylpheed-2.6.0-addrbook-csv-import.patch
 
 # For xdg-open in patch1.
 Requires: xdg-utils
 
 %description
-This program is an X based fast email client which has features
-like:
+This program is an X based fast email client which has features like:
+
 o user-friendly and intuitive interface
 o integrated NetNews client (partially implemented)
 o ability of keyboard-only operation
@@ -51,14 +56,12 @@
 See /usr/share/doc/sylpheed*/README for more information.
 
 %prep
-%setup -q -n sylpheed-%{version}
+%setup -q -n sylpheed-%{tarversion}
 %patch1 -p1 -b .defs.h
 %patch2 -p1 -b .desktop
 %patch3 -p1 -b .certsdir
 %patch4 -p1 -b .prefs_common
-%patch6 -p1 -b .gtk-2.13.1
-%patch7 -p0 -b .svn2029
-%patch8 -p1 -b .socket-redefine
+%patch5 -p1 -b .addrbook-csv-import
 
 %build
 %configure --enable-ssl %{!?_without_gpgme:--enable-gpgme} \
@@ -66,7 +69,10 @@
     %{!?_without_ldap:--enable-ldap} \
     %{?_with_oniguruma:--enable-oniguruma} \
     %{?_with_jpilot:--enable-jpilot}
+# Compile with deprecated OpenLDAP API to fix segfaults on 64-bit.
 echo "#define LDAP_DEPRECATED 1" >> config.h
+# Fedora 9 and newer use the GtkSpell+Enchant feature:
+# http://fedoraproject.org/wiki/Releases/FeatureDictionary
 %if 0%{?fedora} > 8
 echo "#define USE_ENCHANT 1" >> config.h
 %endif
@@ -79,14 +85,13 @@
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 install -p -m 644 sylpheed-64x64.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/sylpheed.png
-[ ! -f ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop ] && exit 1
 desktop-file-install --vendor %{desktopvendor} \
     --dir $RPM_BUILD_ROOT%{_datadir}/applications \
     --remove-category Application \
     --add-category Network \
     --delete-original \
     ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
-install -d $RPM_BUILD_ROOT%{_mandir}/man1/
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
 install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/
 %find_lang %{name}
 
@@ -94,17 +99,38 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
-%defattr(-,root,root,0755)
+%defattr(-,root,root,-)
 %doc COPYING ChangeLog README INSTALL TODO
 %doc ChangeLog.ja README.ja INSTALL.ja TODO.ja
 %doc AUTHORS NEWS
 %{_bindir}/sylpheed
 %{_datadir}/sylpheed/
-%{_datadir}/applications/*
+%{_datadir}/applications/%{desktopvendor}-%{name}.desktop
 %{_datadir}/pixmaps/*
 %{_mandir}/man1/*
 
 %changelog
+* Tue Feb 24 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.6.0-4
+- fix crash in import of csv address-books with empty Name fields
+
+* Fri Feb 13 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.6.0-3
+- no build, add comments to spec file, remove old cruft
+
+* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 2.6.0-2
+- rebuild with new openssl
+
+* Fri Dec 19 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 2.6.0-1
+- update to 2.6.0 final (obsoletes SOCK_NONBLOCK patch)
+
+* Mon Dec  1 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 2.6.0-0.1.rc
+- update to 2.6.0rc
+
+* Mon Nov 17 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 2.6.0-0.1.beta2
+- update to 2.6.0beta2
+
+* Tue Sep 30 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 2.6.0-0.1.beta1
+- update to 2.6.0beta1
+
 * Thu Aug 28 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 2.5.0-4.2029svn
 - patch libsylph/socket.* to not redefine SOCK_NONBLOCK from
   /usr/include/bits/socket.h


--- sylpheed-2.5.0-socket-redefine.patch DELETED ---


--- sylpheed-2.5.0-svn2029.patch DELETED ---


--- sylpheed-2.5.0rc2-gtk-2.13.1.patch DELETED ---