diff --git a/.gitignore b/.gitignore index 29140e3..14dd447 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /mailnag-0.5.2.tar.gz /mailnag-1.0.0.tar.gz /v1.1.0.tar.gz +/v1.2.0.tar.gz diff --git a/mailnag-addaction_apichange.patch b/mailnag-addaction_apichange.patch deleted file mode 100644 index 2e543c9..0000000 --- a/mailnag-addaction_apichange.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur mailnag-0.5.2.org/Mailnag/daemon/mailchecker.py mailnag-0.5.2/Mailnag/daemon/mailchecker.py ---- mailnag-0.5.2.org/Mailnag/daemon/mailchecker.py 2013-11-03 12:24:43.323803657 +0100 -+++ mailnag-0.5.2/Mailnag/daemon/mailchecker.py 2013-11-03 12:25:45.896804596 +0100 -@@ -147,7 +147,7 @@ - for mail in new_mails: - n = self._get_notification(mail.sender, mail.subject, "mail-unread") - notification_id = str(id(n)) -- n.add_action("mark-as-read", _("Mark as read"), self._notification_action_handler, (mail, notification_id), None) -+ n.add_action("mark-as-read", _("Mark as read"), self._notification_action_handler, (mail, notification_id)) - n.show() - self._notifications[notification_id] = n - -@@ -155,7 +155,7 @@ - def _get_notification(self, summary, body, icon): - n = Notify.Notification.new(summary, body, icon) - n.set_category("email") -- n.add_action("default", "default", self._notification_action_handler, None, None) -+ n.add_action("default", "default", self._notification_action_handler, None) - - return n - diff --git a/mailnag-imaplib2.patch b/mailnag-imaplib2.patch deleted file mode 100644 index cd17cbe..0000000 --- a/mailnag-imaplib2.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- Mailnag/daemon/imaplib2.py 2012-08-13 13:46:24.073363757 +0200 -+++ Mailnag/daemon/imaplib2.py 2012-08-13 14:45:09.212443357 +0200 -@@ -411,6 +411,8 @@ - This connection will be used by the routines: - read, send, shutdown, socket.""" - -+ if (port != None): -+ port = int(port) - self.host = self._choose_nonull_or_dflt('', host) - self.port = self._choose_nonull_or_dflt(IMAP4_PORT, port) - self.sock = self.open_socket() -@@ -1993,6 +1999,8 @@ - read, send, shutdown, socket, ssl.""" - - self.host = self._choose_nonull_or_dflt('', host) -+ if (port != None): -+ port = int(port) - self.port = self._choose_nonull_or_dflt(IMAP4_SSL_PORT, port) - self.sock = self.open_socket() - self.ssl_wrap_socket() diff --git a/mailnag-sound.patch b/mailnag-sound.patch deleted file mode 100644 index ae99e16..0000000 --- a/mailnag-sound.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Naur mailnag-0.5.2.org/Mailnag/daemon/mailchecker.py mailnag-0.5.2/Mailnag/daemon/mailchecker.py ---- mailnag-0.5.2.org/Mailnag/daemon/mailchecker.py 2013-11-06 18:17:22.992205709 +0100 -+++ mailnag-0.5.2/Mailnag/daemon/mailchecker.py 2013-11-06 18:21:12.436209152 +0100 -@@ -100,8 +100,7 @@ - - # play sound if it is enabled in mailnags settings and - # gnome-shell notifications aren't disabled -- if (self._cfg.get('general', 'playsound') == '1') and \ -- (self._gsettings.get_int('saved-session-presence') != 2): -+ if (self._cfg.get('general', 'playsound') == '1'): - gstplay(get_data_file(self._cfg.get('general', 'soundfile'))) - - self._reminder.save(self._mail_list) diff --git a/mailnag.spec b/mailnag.spec index e350647..7944651 100644 --- a/mailnag.spec +++ b/mailnag.spec @@ -1,6 +1,6 @@ Name: mailnag -Version: 1.1.0 -Release: 5%{?dist} +Version: 1.2.0 +Release: 1%{?dist} Summary: Mail notification daemon License: GPLv2 @@ -29,9 +29,6 @@ creates a proper GNOME 3 notification that mentions sender and subject. %prep %setup -q -# avoid rpmlint error wrong-script-end-of-line-encoding for these files -sed -i -e 's/\r//' Mailnag/{common/config,configuration/accountdialog,configuration/plugindialog}.py - # sooner or later python3 might be the default in Fedora; be prepared sed -i 's_#!.*/usr/bin/env.*python_#!%{_bindir}/env python2_' $(find . -name '*.py') @@ -41,6 +38,7 @@ CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build %install rm -rf %{buildroot} %{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT +desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/mailnag.desktop desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/mailnag-config.desktop %find_lang %{name} @@ -69,6 +67,9 @@ fi %{_datadir}/icons/hicolor/*/apps/%{name}*png %changelog +* Sun Mar 27 2016 Thorsten Leemhuis - 1.2.0-1 +- update to 1.2.0 + * Thu Feb 04 2016 Fedora Release Engineering - 1.1.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index e098881..d6e86fc 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -f3c0df790a2f5e6b615ef804ee0e5a91 mailnag-1.0.0.tar.gz -479bc76816797cf0578c5b92849d2012 v1.1.0.tar.gz +afde260255bd8e2ceb72ebe562a1f4ae v1.2.0.tar.gz