Hello community, here is the log from the commit of package claws-mail for openSUSE:Factory checked in at 2014-11-10 17:28:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/claws-mail (Old) and /work/SRC/openSUSE:Factory/.claws-mail.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "claws-mail" Changes: -------- --- /work/SRC/openSUSE:Factory/claws-mail/claws-mail.changes 2014-11-02 16:46:31.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.claws-mail.new/claws-mail.changes 2014-11-10 17:28:19.000000000 +0100 @@ -1,0 +2,21 @@ +Sat Nov 1 17:43:56 UTC 2014 - kieltux@gmail.com + +- Update to version 3.11.1: + + Use 'gnutls_priority' hidden account preference for POP3 and + STARTTLS connections, in addition to SMTP. + + RSSyl plugin: Enable use of .netrc to store network + credentials. + + Remove dependency on intltool. + + Remove appdata. + + Updated translations: Norwegian Bokmål. + + Bug fixed: claws#3306, claws#3308 +- Removed intltool BuildRequires: no longer needed. +- Removed --enable-appdata from %configure (dropped in upstream). +- Add fix_categories_and_recover_keywords_in_desktop_file.patch + from upstream git to fix categories and recover keywords in + desktop file. +- Add recover_desktop_file_installation.patch from bugzilla + (claws#3320) and recover_desktop_file_installation_part2.patch + from upstream git to recover desktop file installation. + +------------------------------------------------------------------- Old: ---- claws-mail-3.11.0.tar.xz New: ---- claws-mail-3.11.1.tar.xz fix_categories_and_recover_keywords_in_desktop_file.patch recover_desktop_file_installation.patch recover_desktop_file_installation_part2.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ claws-mail.spec ++++++ --- /var/tmp/diff_new_pack.BZjSI7/_old 2014-11-10 17:28:21.000000000 +0100 +++ /var/tmp/diff_new_pack.BZjSI7/_new 2014-11-10 17:28:21.000000000 +0100 @@ -22,13 +22,18 @@ %endif Name: claws-mail -Version: 3.11.0 +Version: 3.11.1 Release: 0 Url: http://www.claws-mail.org/ Summary: A lightweight and highly configurable email client License: GPL-3.0+ Group: Productivity/Networking/Email/Clients Source0: http://sourceforge.net/projects/claws-mail/files/Claws%20Mail/%{version}/claws-mail-%{version}.tar.xz +# Recover desktop file installation +Patch0: recover_desktop_file_installation.patch +Patch1: recover_desktop_file_installation_part2.patch +# Fix categories and recover keywords in desktop file +Patch2: fix_categories_and_recover_keywords_in_desktop_file.patch BuildRequires: NetworkManager-devel BuildRequires: compface BuildRequires: db-devel @@ -43,7 +48,6 @@ %else BuildRequires: gtk3-devel %endif -BuildRequires: intltool BuildRequires: libarchive-devel BuildRequires: libcanberra-devel >= 0.6 BuildRequires: libcurl-devel @@ -124,6 +128,9 @@ %lang_package %prep %setup -q +%patch0 +%patch1 -p1 +%patch2 -p1 %build %configure \ @@ -165,8 +172,7 @@ --enable-crash-dialog \ --enable-startup-notification \ --enable-compface \ - --enable-libetpan \ - --enable-appdata + --enable-libetpan make %{?_smp_mflags} %install @@ -237,8 +243,6 @@ %{_datadir}/claws-mail/tools/kdeservicemenu/ %{_mandir}/man1/claws-mail.1.gz %config(noreplace) %{_sysconfdir}/skel/.claws-mail/ -%dir %{_datadir}/appdata/ -%{_datadir}/appdata/*.xml %files devel %defattr(-,root,root) ++++++ claws-mail-3.11.0.tar.xz -> claws-mail-3.11.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/claws-mail/claws-mail-3.11.0.tar.xz /work/SRC/openSUSE:Factory/.claws-mail.new/claws-mail-3.11.1.tar.xz differ: char 27, line 1 ++++++ fix_categories_and_recover_keywords_in_desktop_file.patch ++++++
From cfde37a35a8b9d54bd680245a7d37a63d6779706 Mon Sep 17 00:00:00 2001 From: Ricardo Mones
Date: Tue, 28 Oct 2014 16:59:16 +0100 Subject: [PATCH] Fix categories and recover keywords in desktop file
--- claws-mail.desktop | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/claws-mail.desktop b/claws-mail.desktop index 116c9cb..df0bb00 100644 --- a/claws-mail.desktop +++ b/claws-mail.desktop @@ -18,7 +18,8 @@ GenericName[sk]=Poštový klient GenericName[sv]=E-postklient Exec=claws-mail %u Icon=claws-mail -Categories=Network;Office;Email; +Categories=Network;Email; +Keywords=lightweight;fast;gui;extensible;plugin;pop;pop3;imap;imap4;nntp;news; Comment=Lightweight and Fast GTK+ based Mail Client Comment[ca]=Client de correu electrònic ràpid i lleuger basat en GTK+ Comment[cs]=Lehký a rychlý mailový klient založený na GTK+ -- 1.7.10.4 ++++++ recover_desktop_file_installation.patch ++++++ --- Makefile.in 2014-10-28 02:59:07.000000000 +0800 +++ Makefile.in.new 2014-11-01 16:57:58.497854587 +0800 @@ -165,11 +165,12 @@ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } -am__installdirs = "$(DESTDIR)$(pixmapdir)" "$(DESTDIR)$(pixmap128dir)" \ - "$(DESTDIR)$(pixmap64dir)" "$(DESTDIR)$(pkgconfigdir)" \ - "$(DESTDIR)$(relnotesdir)" "$(DESTDIR)$(clawsincludedir)" -DATA = $(pixmap_DATA) $(pixmap128_DATA) $(pixmap64_DATA) \ - $(pkgconfig_DATA) $(relnotes_DATA) +am__installdirs = "$(DESTDIR)$(gnomapdir)" "$(DESTDIR)$(pixmapdir)" \ + "$(DESTDIR)$(pixmap128dir)" "$(DESTDIR)$(pixmap64dir)" \ + "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(relnotesdir)" \ + "$(DESTDIR)$(clawsincludedir)" +DATA = $(gnomap_DATA) $(pixmap_DATA) $(pixmap128_DATA) \ + $(pixmap64_DATA) $(pkgconfig_DATA) $(relnotes_DATA) HEADERS = $(clawsinclude_HEADERS) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive @@ -512,6 +513,11 @@ pixmap64_DATA = claws-mail-64x64.png pixmap128dir = $(datadir)/icons/hicolor/128x128/apps pixmap128_DATA = claws-mail-128x128.png + +# when changing the name or location of the .desktop file, +# also update src/common/Makefile.am +gnomapdir = $(datadir)/applications +gnomap_DATA = claws-mail.desktop @UPDATE_GTK_ICON_CACHE_TRUE@gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = claws-mail.pc @@ -593,6 +599,27 @@ distclean-libtool: -rm -f libtool config.lt +install-gnomapDATA: $(gnomap_DATA) + @$(NORMAL_INSTALL) + @list='$(gnomap_DATA)'; test -n "$(gnomapdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(gnomapdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(gnomapdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(gnomapdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(gnomapdir)" || exit $$?; \ + done + +uninstall-gnomapDATA: + @$(NORMAL_UNINSTALL) + @list='$(gnomap_DATA)'; test -n "$(gnomapdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(gnomapdir)'; $(am__uninstall_files_from_dir) install-pixmapDATA: $(pixmap_DATA) @$(NORMAL_INSTALL) @list='$(pixmap_DATA)'; test -n "$(pixmapdir)" || list=; \ @@ -1017,7 +1044,7 @@ all-am: Makefile $(DATA) $(HEADERS) config.h claws-features.h installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(pixmapdir)" "$(DESTDIR)$(pixmap128dir)" "$(DESTDIR)$(pixmap64dir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(relnotesdir)" "$(DESTDIR)$(clawsincludedir)"; do \ + for dir in "$(DESTDIR)$(gnomapdir)" "$(DESTDIR)$(pixmapdir)" "$(DESTDIR)$(pixmap128dir)" "$(DESTDIR)$(pixmap64dir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(relnotesdir)" "$(DESTDIR)$(clawsincludedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive @@ -1072,9 +1099,9 @@ info-am: -install-data-am: install-clawsincludeHEADERS install-pixmap128DATA \ - install-pixmap64DATA install-pixmapDATA install-pkgconfigDATA \ - install-relnotesDATA +install-data-am: install-clawsincludeHEADERS install-gnomapDATA \ + install-pixmap128DATA install-pixmap64DATA \ + install-pixmapDATA install-pkgconfigDATA install-relnotesDATA @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-data-hook install-dvi: install-dvi-recursive @@ -1122,7 +1149,8 @@ ps-am: -uninstall-am: uninstall-clawsincludeHEADERS uninstall-pixmap128DATA \ +uninstall-am: uninstall-clawsincludeHEADERS \ + uninstall-gnomapDATA uninstall-pixmap128DATA \ uninstall-pixmap64DATA uninstall-pixmapDATA \ uninstall-pkgconfigDATA uninstall-relnotesDATA @$(NORMAL_INSTALL) @@ -1138,8 +1166,9 @@ distclean-hdr distclean-libtool distclean-tags distcleancheck \ distdir distuninstallcheck dvi dvi-am html html-am info \ info-am install install-am install-clawsincludeHEADERS \ - install-data install-data-am install-data-hook install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ + install-data install-data-am install-data-hook \ + install-dvi install-dvi-am install-exec \ + install-exec-am install-gnomapDATA install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-pixmap128DATA \ install-pixmap64DATA install-pixmapDATA install-pkgconfigDATA \ @@ -1148,8 +1177,8 @@ maintainer-clean maintainer-clean-generic \ maintainer-clean-local mostlyclean mostlyclean-generic \ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ - uninstall-am uninstall-clawsincludeHEADERS uninstall-hook \ - uninstall-pixmap128DATA uninstall-pixmap64DATA \ + uninstall-am uninstall-clawsincludeHEADERS uninstall-gnomapDATA \ + uninstall-hook uninstall-pixmap128DATA uninstall-pixmap64DATA \ uninstall-pixmapDATA uninstall-pkgconfigDATA \ uninstall-relnotesDATA ++++++ recover_desktop_file_installation_part2.patch ++++++
From 44131ac697f1a55f65cf3916b0ca09ff8d3c1af8 Mon Sep 17 00:00:00 2001 From: Ricardo Mones
Date: Tue, 28 Oct 2014 17:20:23 +0100 Subject: [PATCH] Recover desktop file installation
--- Makefile.am | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Makefile.am b/Makefile.am index 6b221fc..3fdb4aa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -34,6 +34,11 @@ pixmap64_DATA=claws-mail-64x64.png pixmap128dir=$(datadir)/icons/hicolor/128x128/apps pixmap128_DATA=claws-mail-128x128.png +# when changing the name or location of the .desktop file, +# also update src/common/Makefile.am +gnomapdir = $(datadir)/applications +gnomap_DATA=claws-mail.desktop + rename-icons: @cd $(DESTDIR)$(datadir)/icons/hicolor/64x64/apps && \ mv claws-mail-64x64.png claws-mail.png -- 1.7.10.4 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org