From 3f69d0ee51708b5b8034a5c2c159ba61532093bb Mon Sep 17 00:00:00 2001 From: Rosa Date: Thu, 2 Feb 2012 00:42:47 +0400 Subject: [PATCH] Automatic import for version 3.8.0 --- .abf.yml | 2 +- claws-mail-3.7.9-bug2414.patch | 18 ------ claws-mail.spec | 102 +++++++++++++-------------------- 3 files changed, 41 insertions(+), 81 deletions(-) delete mode 100644 claws-mail-3.7.9-bug2414.patch diff --git a/.abf.yml b/.abf.yml index abffac3..f6a614d 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - "claws-mail-3.7.9.tar.bz2": a5d5d93d5d6d6cabdbabd391724d7564a304449a + "claws-mail-3.8.0.tar.bz2": de6010392074633194e2aa5898e66d73c35bda5a diff --git a/claws-mail-3.7.9-bug2414.patch b/claws-mail-3.7.9-bug2414.patch deleted file mode 100644 index e1d4eb6..0000000 --- a/claws-mail-3.7.9-bug2414.patch +++ /dev/null @@ -1,18 +0,0 @@ -Index: src/main.c -=================================================================== -RCS file: //claws/src/main.c,v -retrieving revision 1.115.2.237 -retrieving revision 1.115.2.238 -diff -u -r1.115.2.237 -r1.115.2.238 ---- src/main.c 10 Apr 2011 17:19:04 -0000 1.115.2.237 -+++ src/main.c 30 Apr 2011 19:27:15 -0000 1.115.2.238 -@@ -331,7 +331,7 @@ - gtk_widget_show(hack); - } - -- xdisplay = gdk_display_get_default(); -+ xdisplay = GDK_DISPLAY_XDISPLAY(gdk_display_get_default()); - sn_display = sn_display_new(xdisplay, - sn_error_trap_push, - sn_error_trap_pop); - diff --git a/claws-mail.spec b/claws-mail.spec index 41bd782..290335d 100644 --- a/claws-mail.spec +++ b/claws-mail.spec @@ -2,17 +2,17 @@ %define version_name %{name}-%{version} %define iconname %{name}.png %define Group Networking/Mail +%define _disable_ld_no_undefined 1 Summary: The user-friendly, lightweight and fast GTK2 based email client Name: claws-mail -Version: 3.7.9 -Release: %mkrel 2 +Version: 3.8.0 +Release: 1 Epoch: 1 License: GPLv3+ Group: %{Group} URL: http://www.claws-mail.org Source0: http://downloads.sourceforge.net/sylpheed-claws/%{name}-%{version}.tar.bz2 -Patch0: claws-mail-3.7.9-bug2414.patch BuildRequires: gtk2-devel BuildRequires: openldap-devel BuildRequires: enchant-devel @@ -26,35 +26,21 @@ BuildRequires: bison BuildRequires: startup-notification-devel BuildRequires: gnutls-devel BuildRequires: valgrind -%if %mdkversion < 200700 -BuildRequires: libgnomeprintui-devel -%endif BuildRequires: spamassassin-spamd >= 3.0.0 BuildRequires: gpgme-devel > 0.4.5 BuildRequires: libsm-devel -%if %mdkversion > 200800 BuildRequires: imagemagick -%else -BuildRequires: imagemagick -%endif -%if %mdkversion > 200800 +BuildRequires: glib2-devel +BuildRequires: libtool BuildRequires: compface-devel Requires: compface -%endif -%if %mdkversion > 200700 BuildRequires: libdbus-glib-devel -%endif -%if %mdkversion > 2008100 Requires: rootcerts -%endif -#%if %mdkversion >= 200900 -#BuildRequires: libnm_util-devel -#BuildRequires: libnm_glib-devel -#%endif Requires: common-licenses Requires: aspell-dictionary -Obsoletes: %{name}-tools +Obsoletes: %{name}-tools < %{epoch}:%{version}-%{release} Provides: %{name}-tools +Obsoletes: %{name}-spamassassin-plugin < %{epoch}:%{version}-%{release} # Fix upgrade from mdk 2006: Obsoletes: sylpheed-claws2 Obsoletes: sylpheed-claws @@ -114,19 +100,7 @@ For a complete listing of Features: http://www.claws-mail.org/features.php Summary: Development files for %{name} Group: Development/Other Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: gtk2-devel -Requires: openldap-devel -Requires: enchant-devel Requires: aspell-dictionary -Requires: libgdk_pixbuf2.0-devel >= 2.6.4 -Requires: pilot-link-devel -Requires: libltdl-devel -Requires: libetpan-devel >= 0.42 -%if %mdkversion < 200700 -Requires: libgnomeprintui-devel -%endif -Requires: gpgme-devel > 0.4.5 -Requires: gnutls-devel Obsoletes: sylpheed-claws2-devel Obsoletes: sylpheed-claws-devel @@ -163,7 +137,7 @@ Group: %{Group} Requires: %{name} = %{epoch}:%{version}-%{release} Requires: dillo Provides: sylpheed-claws2-dillo_viewer-plugin -Obsoletes: sylpheed-claws2-dillo_viewer-plugin +Obsoletes: sylpheed-claws2-dillo_viewer-plugin < %{epoch}:%{version}-%{release} %description dillo_viewer-plugin This plugin uses the Dillo browser to view text/html @@ -174,7 +148,7 @@ Summary: PGP core plugin for %{name} Group: %{Group} Requires: %{name} = %{epoch}:%{version}-%{release} Provides: sylpheed-claws2-pgpcore-plugin -Obsoletes: sylpheed-claws2-pgpcore-plugin +Obsoletes: sylpheed-claws2-pgpcore-plugin < %{epoch}:%{version}-%{release} %description pgpcore-plugin Handles core PGP functions and is a dependency of both @@ -186,7 +160,7 @@ Group: %{Group} Requires: %{name} = %{epoch}:%{version}-%{release} Requires: %{name}-pgpcore-plugin = %{epoch}:%{version}-%{release} Provides: sylpheed-claws2-pgpinline-plugin -Obsoletes: sylpheed-claws2-pgpinline-plugin +Obsoletes: sylpheed-claws2-pgpinline-plugin < %{epoch}:%{version}-%{release} %description pgpinline-plugin Handles PGP/Inline signed and/or encrypted mails. @@ -199,7 +173,7 @@ Group: %{Group} Requires: %{name} = %{epoch}:%{version}-%{release} Requires: %{name}-pgpcore-plugin = %{epoch}:%{version}-%{release} Provides: sylpheed-claws2-pgpmime-plugin -Obsoletes: sylpheed-claws2-pgpmime-plugin +Obsoletes: sylpheed-claws2-pgpmime-plugin < %{epoch}:%{version}-%{release} %description pgpmime-plugin Handles PGP/MIME signed and/or encrypted mails. @@ -212,7 +186,7 @@ Group: %{Group} Requires: %{name} = %{epoch}:%{version}-%{release} Requires: spamassassin-spamd Provides: sylpheed-claws2-spamassassin-plugin -Obsoletes: sylpheed-claws2-spamassassin-plugin +Obsoletes: sylpheed-claws2-spamassassin-plugin < %{epoch}:%{version}-%{release} %description spamassassin-plugin Enables the scanning of incoming mail received from a @@ -225,7 +199,7 @@ Summary: Notafication icon for %{name} Group: %{Group} Requires: %{name} = %{epoch}:%{version}-%{release} Provides: sylpheed-claws2-trayicon-plugin -Obsoletes: sylpheed-claws2-trayicon-plugin +Obsoletes: sylpheed-claws2-trayicon-plugin < %{epoch}:%{version}-%{release} %description trayicon-plugin Places an icon in the system tray that indicates @@ -237,22 +211,16 @@ See README for additional info. %prep %setup -q -%patch0 -p0 %build -%define _disable_ld_no_undefined 1 - %configure2_5x \ --enable-enchant \ --enable-jpilot \ - --disable-openssl \ --enable-ldap \ - --enable-gpgme \ --enable-crash-dialog \ --enable-spamassassin-plugin \ --enable-dillo-viewer-plugin \ --enable-trayicon-plugin \ - --enable-bogofilter \ --enable-ipv6 \ %if %mdkversion > 200800 --enable-compface \ @@ -262,7 +230,7 @@ See README for additional info. --disable-rpath \ --disable-static -%make +%make LIBTOOL=%{_bindir}/libtool %check make check @@ -276,8 +244,6 @@ rm -rf %{buildroot} ##remove duplicate man# rm -rf %{buildroot}%{_mandir} -## remove unneeded file -#rm -rf tools/Makefile* ## remove unneeded devel files rm -f %{buildroot}%{_libdir}/%{name}/plugins/*.*a @@ -296,18 +262,6 @@ rm -f %{buildroot}%{_docdir}/claws-mail/tools/Makefile* %find_lang %{name} -%if %mdkversion < 200900 -%post -%{update_menus} -%update_icon_cache hicolor -%endif - -%if %mdkversion < 200900 -%postun -%{clean_menus} -%clean_icon_cache hicolor -%endif - %clean rm -rf %{buildroot} @@ -367,7 +321,31 @@ rm -rf %{buildroot} %changelog -* Mon May 23 2011 Funda Wang 1:3.7.9-2mdv2011.0 +* Sun Dec 18 2011 Andrey Bondrov 1:3.8.0-1 ++ Revision: 743401 +- New version 3.8.0, minor spec cleanups + +* Tue Nov 08 2011 Andrey Bondrov 1:3.7.10-3 ++ Revision: 729070 +- Add patch0 to fix new glib issues + +* Fri Sep 23 2011 Tomasz Pawel Gajc 1:3.7.10-2 ++ Revision: 701085 +- export libtool binary so it finally compiles +- drop unrecognized configure options +- add buildrequires on libtool and glib2-devel +- spec file clean +- add versioned obsoletes +- update to new version 3.7.10 +- drop patch 0, not needed anymore + + + Matthew Dawkins + - oops + - cleaned up spec + rebuild for libetpan + removed devel reqs for devel pkg, not needed + +* Mon May 23 2011 Funda Wang 1:3.7.9-2 + Revision: 677607 - update multiarch usage - add upstream patch to fix bug#2414 @@ -522,7 +500,7 @@ rm -rf %{buildroot} + Revision: 164141 - Upgrade to 3.3.0 - + Olivier Blin + + Olivier Blin - restore BuildRoot * Sun Dec 30 2007 Tomasz Pawel Gajc 1:3.2.0-2mdv2008.1