Hello community, here is the log from the commit of package xfce4-panel-plugin-mailwatch for openSUSE:Factory checked in at 2012-04-19 12:39:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xfce4-panel-plugin-mailwatch (Old) and /work/SRC/openSUSE:Factory/.xfce4-panel-plugin-mailwatch.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xfce4-panel-plugin-mailwatch", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/xfce4-panel-plugin-mailwatch/xfce4-panel-plugin-mailwatch.changes 2011-10-28 15:29:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xfce4-panel-plugin-mailwatch.new/xfce4-panel-plugin-mailwatch.changes 2012-04-19 12:39:18.000000000 +0200 @@ -1,0 +2,30 @@ +Tue Apr 17 22:32:38 UTC 2012 - [email protected] + +- corrected source URL + +------------------------------------------------------------------- +Tue Apr 17 19:34:04 UTC 2012 - [email protected] + +- corrected source URL +- use pristine source tarball + +------------------------------------------------------------------- +Wed Apr 4 17:19:18 UTC 2012 - [email protected] + +- dixed missing icon + +------------------------------------------------------------------- +Tue Apr 3 17:16:52 UTC 2012 - [email protected] + +- added xfce4-panel-plugin-mailwatch-1.1.0-set-mail-interval.patch + which fixes a problem with the interval not being set correctly + (bxo#6947) +- added xfce4-panel-plugin-mailwatch-1.1.0-fix-format-sting-errors.patch + which fixes some format string errors (bxo#8063) +- added xfce4-panel-plugin-mailwatch-link-against-libgcrypt.patch + in order to link agains libgcrypt +- specfile cleanup +- correct dependencies +- split off -lang subpackage + +------------------------------------------------------------------- New: ---- xfce4-panel-plugin-mailwatch-1.1.0-fix-format-sting-errors.patch xfce4-panel-plugin-mailwatch-1.1.0-set-mail-interval.patch xfce4-panel-plugin-mailwatch-link-against-libgcrypt.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfce4-panel-plugin-mailwatch.spec ++++++ --- /var/tmp/diff_new_pack.lwJdk7/_old 2012-04-19 12:39:20.000000000 +0200 +++ /var/tmp/diff_new_pack.lwJdk7/_new 2012-04-19 12:39:20.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package xfce4-panel-plugin-mailwatch # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,30 +20,42 @@ %define plugin_name xfce4-mailwatch-plugin Name: xfce4-panel-plugin-mailwatch -License: GPL-2.0+ Version: 1.1.0 -Release: 8 -Summary: Versatile mail checking plugin for the Xfce panel +Release: 0 +Summary: Versatile Mail Checking Plugin for the Xfce Panel +License: GPL-2.0+ +Group: System/GUI/XFCE Url: http://goodies.xfce.org/projects/panel-plugins/xfce4-mailwatch-plugin -Source0: xfce4-mailwatch-plugin-1.1.0.tar.bz2 +Source0: http://spurint.org/files/mailwatch/%{plugin_name}-%{version}.tar.bz2 # PATCH-FIX-UPSTREAM xfce4-panel-plugin-mailwatch-1.1.0-fix-high-cpu-usage-while-checking-mail.patch bxo#4494 [email protected] -- Fixes high CPU usage when checking mail (backported from upstream git) Patch0: xfce4-panel-plugin-mailwatch-1.1.0-fix-high-cpu-usage-while-checking-mail.patch # PATCH-FIX-UPSTREAM xfce4-panel-plugin-mailwatch-1.1.0-fix-build-with-4.7.patch [email protected] -- Fixes build with xfce4-panel >= 4.7 Patch1: xfce4-panel-plugin-mailwatch-1.1.0-fix-build-with-4.7.patch -# PATCH-FIX-UPSTREAM xfce4-panel-plugin-mailwatch-1.1.0-fix-gnutls-3.0.3.patch bxo#7998 [email protected] -- Fix build with gnutls >= 3.0.3, a lowat level of 0 is the default in gnutls >= 2.12.0 and gnutls_transport_set_lowat() has been removed in 3.0.3 +# PATCH-FIX-UPSTREAM xfce4-panel-plugin-mailwatch-1.1.0-fix-gnutls-3.0.3.patch bxo#7998 [email protected] -- Fixes build with gnutls >= 3.0.3, a lowat level of 0 is the default in gnutls >= 2.12.0 and gnutls_transport_set_lowat() has been removed in 3.0.3 Patch2: xfce4-panel-plugin-mailwatch-1.1.0-fix-gnutls-3.0.3.patch # PATCH-FIX-UPSTREAM xfce4-panel-plugin-mailwatch-1.1.0-use-docdir.patch [email protected] -- Use docdir correctly Patch3: xfce4-panel-plugin-mailwatch-1.1.0-use-docdir.patch -Group: System/GUI/XFCE -BuildRequires: intltool +# PATCH-FIX-UPSTREAM xfce4-panel-plugin-mailwatch-1.1.0-set-mail-interval.patch bxo#6947 [email protected] -- Fixes a problem with the interval not being set correctly +Patch4: xfce4-panel-plugin-mailwatch-1.1.0-set-mail-interval.patch +# PATCH-FIX-UPSTREAM xfce4-panel-plugin-mailwatch-1.1.0-fix-format-sting-errors.patch bxo#8063 [email protected] -- Fixes some format string errors +Patch5: xfce4-panel-plugin-mailwatch-1.1.0-fix-format-sting-errors.patch +# PATCH-FIX-UPSTREAM xfce4-panel-plugin-mailwatch-link-against-libgcrypt.patch [email protected] -- Link agains libgcrypt +Patch6: xfce4-panel-plugin-mailwatch-link-against-libgcrypt.patch +BuildRequires: ed BuildRequires: fdupes -BuildRequires: libxslt -BuildRequires: docbook-xsl-stylesheets -BuildRequires: pkgconfig(libxfce4panel-1.0) -BuildRequires: pkgconfig(gnutls) -BuildRequires: xfce4-dev-tools +BuildRequires: intltool BuildRequires: libgcrypt-devel -Requires: xfce4-panel >= 4.8.0 +BuildRequires: xfce4-dev-tools +BuildRequires: pkgconfig(gmodule-2.0) +BuildRequires: pkgconfig(gnutls) +BuildRequires: pkgconfig(gobject-2.0) +BuildRequires: pkgconfig(gthread-2.0) +BuildRequires: pkgconfig(gtk+-2.0) +BuildRequires: pkgconfig(libxfce4panel-1.0) +BuildRequires: pkgconfig(libxfce4util-1.0) +BuildRequires: pkgconfig(libxfcegui4-1.0) +Recommends: %{name}-lang = %{version} +Requires: xfce4-panel >= %{panel_version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -51,6 +63,7 @@ which supports a variety of protocols and local mailbox formats. It can check multiple locations and execute custom actions when it finds new mail. +%lang_package %prep %setup -q -n %{plugin_name}-%{version} @@ -58,43 +71,51 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +# fix up missing icon +ed -s panel-plugin/mailwatch.desktop.in.in 2>/dev/null <<'EOF' +,s/^Icon=xfce-mail/Icon=mail-unread/ +w +EOF %build xdt-autogen -export LIBS="-lgcrypt" %configure \ --docdir=%{_datadir}/xfce4/xfce4-mailwatch-plugin \ - --enable-maintainer-mode \ --with-pic \ --disable-static make %{_smp_mflags} V=1 %install %make_install + rm -rf %{buildroot}%{_datadir}/locale/{ast,kk,tl_PH,ur_PK} -%find_lang %{plugin_name} %{name}.lang + +%find_lang %{plugin_name} %{name}.lang %{?no_lang_C} + %fdupes %{buildroot}%{_datadir} %clean rm -rf %{buildroot} -%if 0%{?suse_version} >= 1140 - %post %icon_theme_cache_post %postun %icon_theme_cache_postun -%endif -%files -f %{name}.lang +%files %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING NEWS README TODO %dir %{_datadir}/xfce4 %dir %{_datadir}/xfce4/xfce4-mailwatch-plugin %doc %{_datadir}/xfce4/xfce4-mailwatch-plugin/html/ %{_libexecdir}/xfce4/panel-plugins/xfce4-mailwatch-plugin -%{_datadir}/icons/hicolor/*/apps/xfce-n*mail.* +%{_datadir}/icons/hicolor/*/apps/* %{_datadir}/xfce4/panel-plugins/mailwatch.desktop +%files lang -f %{name}.lang + %changelog ++++++ xfce4-mailwatch-plugin-1.1.0.tar.bz2 ++++++ ++++ 54013 lines of diff (skipped) ++++++ xfce4-panel-plugin-mailwatch-1.1.0-fix-format-sting-errors.patch ++++++ Description: Link format string errors Author: Yves-Alexis Perez <[email protected]> Bug: http://bugzilla.xfce.org/show_bug.cgi?id= Index: xfce4-mailwatch-plugin-1.1.0/libmailwatch-core/mailwatch-net-conn.c =================================================================== --- xfce4-mailwatch-plugin-1.1.0.orig/libmailwatch-core/mailwatch-net-conn.c +++ xfce4-mailwatch-plugin-1.1.0/libmailwatch-core/mailwatch-net-conn.c @@ -224,7 +224,7 @@ xfce_mailwatch_net_conn_tls_handshake(Xf else reason = gnutls_strerror(ret); if(error) - g_set_error(error, XFCE_MAILWATCH_ERROR, code, reason); + g_set_error(error, XFCE_MAILWATCH_ERROR, code, "%s", reason); g_critical("XfceMailwatch: TLS handshake failed: %s", reason); return FALSE; @@ -763,7 +763,7 @@ xfce_mailwatch_net_conn_recv_internal(Xf break; else if(ret < 0 && EINTR != errno) { g_set_error(error, XFCE_MAILWATCH_ERROR, - XFCE_MAILWATCH_ERROR_FAILED, strerror(errno)); + XFCE_MAILWATCH_ERROR_FAILED, "%s", strerror(errno)); return -1; } else if(!block) return 0; @@ -773,7 +773,7 @@ xfce_mailwatch_net_conn_recv_internal(Xf if(ret < 0 && EINTR != errno) { if(error) { g_set_error(error, XFCE_MAILWATCH_ERROR, - XFCE_MAILWATCH_ERROR_FAILED, strerror(errno)); + XFCE_MAILWATCH_ERROR_FAILED, "%s", strerror(errno)); } return -1; } else if(!SHOULD_CONTINUE(net_conn)) { @@ -785,7 +785,7 @@ xfce_mailwatch_net_conn_recv_internal(Xf } else if(TIMER_EXPIRED(RECV_TIMEOUT)) { if(error) { g_set_error(error, XFCE_MAILWATCH_ERROR, - XFCE_MAILWATCH_ERROR_FAILED, strerror(ETIMEDOUT)); + XFCE_MAILWATCH_ERROR_FAILED, "%s", strerror(ETIMEDOUT)); } return -1; } ++++++ xfce4-panel-plugin-mailwatch-1.1.0-set-mail-interval.patch ++++++ --- xfce4-mailwatch-plugin-1.1.0.orig/libmailwatch-core/mailwatch-mailbox-mbox.c 2008-09-11 06:31:50.000000000 +0200 +++ xfce4-mailwatch-plugin-1.1.0.orig/libmailwatch-core/mailwatch-mailbox-mbox.c 2010-10-06 05:39:15.452009578 +0200 @@ -341,6 +341,8 @@ if( val == mbox->interval ) return; + mbox->interval = val; + if( g_atomic_int_get( &mbox->running ) ) { /* probably shouldn't do this so frequently */ if( mbox->check_id ) ++++++ xfce4-panel-plugin-mailwatch-link-against-libgcrypt.patch ++++++ Index: xfce4-mailwatch-plugin-1.1.0/panel-plugin/Makefile.am =================================================================== --- xfce4-mailwatch-plugin-1.1.0.orig/panel-plugin/Makefile.am +++ xfce4-mailwatch-plugin-1.1.0/panel-plugin/Makefile.am @@ -62,7 +62,8 @@ xfce4_mailwatch_plugin_LDFLAGS = \ @GTHREAD_LIBS@ \ @LIBXFCE4PANEL_LIBS@ \ @LIBXFCEGUI4_LIBS@ \ - @GNUTLS_LIBS@ + @GNUTLS_LIBS@ \ + -lgcrypt if HAVE_CYGWIN xfce4_mailwatch_plugin_LDFLAGS += \ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
