[pithos] Bump version to 1.3.0

commit b87fae893235bcab95af5f36ecd3f5648c08a00e Author: Patrick Griffis <tingping(a)tingping.se&gt; Date: Thu Apr 13 13:17:15 2017 -0400 Bump version to 1.3.0 .gitignore | 1 + 8656c60e9663148166c8bd2cfd910a4423b2588d.patch | 29 +++++++++++++++ be9e8cb35692ef0b7d835dc26b28996cf6aacb7b.patch | 51 ++++++++++++++++++++++++++ pithos.spec | 20 ++++++++-- sources | 2 +- 5 files changed, 98 insertions(+), 5 deletions(-) --- diff --git a/.gitignore b/.gitignore index 9e2e184..0b3384b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ pithos-1.1.2.tar.gz /pithos-1.2.0.tar.xz /pithos-1.2.1.tar.xz +/pithos-1.3.0.tar.xz diff --git a/8656c60e9663148166c8bd2cfd910a4423b2588d.patch b/8656c60e9663148166c8bd2cfd910a4423b2588d.patch new file mode 100644 index 0000000..f42d302 --- /dev/null +++ b/8656c60e9663148166c8bd2cfd910a4423b2588d.patch @@ -0,0 +1,29 @@ +From 8656c60e9663148166c8bd2cfd910a4423b2588d Mon Sep 17 00:00:00 2001 +From: Patrick Griffis <tingping(a)tingping.se&gt; +Date: Thu, 13 Apr 2017 13:06:51 -0400 +Subject: [PATCH] build: Make man page generation optional + +This doesn't work when building a packages +--- + configure.ac | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index fe71139..524cd8c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -32,7 +32,13 @@ AS_IF([test "$with_docs" = "yes"], [ + ]) + AM_CONDITIONAL([WITH_DOCS], [test "$with_docs" = "yes"]) + +-AC_PATH_PROG([HELP2MAN], [help2man], [no]) ++AC_ARG_WITH(help2man, AS_HELP_STRING([--with-help2man], [Build man page automatically]), ++ [with_help2man=$withval], [with_help2man=no]) ++AS_IF([test "$with_help2man" = "yes"], [ ++ AC_PATH_PROG([HELP2MAN], [help2man], [no]) ++], [ ++ HELP2MAN=no ++]) + AM_CONDITIONAL([HAVE_HELP2MAN], [test "$HELP2MAN" != "no"]) + + AC_CONFIG_FILES([ diff --git a/be9e8cb35692ef0b7d835dc26b28996cf6aacb7b.patch b/be9e8cb35692ef0b7d835dc26b28996cf6aacb7b.patch new file mode 100644 index 0000000..451def6 --- /dev/null +++ b/be9e8cb35692ef0b7d835dc26b28996cf6aacb7b.patch @@ -0,0 +1,51 @@ +From be9e8cb35692ef0b7d835dc26b28996cf6aacb7b Mon Sep 17 00:00:00 2001 +From: Patrick Griffis <tingping(a)tingping.se&gt; +Date: Fri, 7 Apr 2017 14:45:51 -0400 +Subject: [PATCH] Fix exception with global usage + +Fixes #439 +--- + pithos/util.py | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git a/pithos/util.py b/pithos/util.py +index e14f787..cd8d3a4 100644 +--- a/pithos/util.py ++++ b/pithos/util.py +@@ -32,6 +32,8 @@ + + # TODO: Async + def unlock_keyring(): ++ global _current_collection ++ + service = Secret.Service.get_sync( + Secret.ServiceFlags.NONE, + None, +@@ -49,8 +51,6 @@ def unlock_keyring(): + 'Could not get the default Secret Collection.\n' + 'Attempting to use the session Collection.' + ) +- +- global _current_collection + _current_collection = Secret.COLLECTION_SESSION + return + +@@ -63,12 +63,12 @@ def unlock_keyring(): + ) + + if not num_items or default_collection not in unlocked: +- global _current_collection + _current_collection = Secret.COLLECTION_SESSION + logging.debug('The default keyring is locked. Using session collection.') + else: + logging.debug('The default keyring was unlocked.') + ++ + def get_account_password(email): + return Secret.password_lookup_sync(_ACCOUNT_SCHEMA, {"email": email}, None) or '' + +@@ -139,4 +139,3 @@ def open_browser(url, parent=None, timestamp=0): + popup_at_pointer = Gtk.Menu.popup_at_pointer + else: + popup_at_pointer = lambda menu, event: menu.popup(None, None, None, None, event.button, event.time) +- diff --git a/pithos.spec b/pithos.spec index d2b6b3b..c4b4c5d 100644 --- a/pithos.spec +++ b/pithos.spec @@ -1,18 +1,21 @@ %global appid io.github.Pithos Name: pithos -Version: 1.2.1 -Release: 2%{?dist} +Version: 1.3.0 +Release: 1%{?dist} Summary: A Pandora client for the GNOME Desktop Group: Applications/Multimedia License: GPLv3 URL: https://pithos.github.io/ Source0: https://github.com/pithos/pithos/releases/download/%{version}/pithos-%{ve... +Patch0: https://github.com/pithos/pithos/commit/be9e8cb35692ef0b7d835dc26b28996cf... +Patch1: https://github.com/pithos/pithos/commit/8656c60e9663148166c8bd2cfd910a442... + BuildArch: noarch BuildRequires: python3-devel >= 3.4 -BuildRequires: intltool +BuildRequires: intltool libappstream-glib BuildRequires: glib2-devel gdk-pixbuf2-devel Requires: gtk3 libsecret @@ -38,7 +41,7 @@ but is command-line only. Neither integrate with the desktop very well, missing things like media key support and song notifications. %prep -%autosetup +%autosetup -p1 %install %configure @@ -47,6 +50,9 @@ things like media key support and song notifications. # Remove Unity specific icons rm -rf %{buildroot}%{_datadir}/icons/ubuntu* +%check +appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata.xml + %post glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || : @@ -66,8 +72,14 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || : %{_datadir}/glib-2.0/schemas/%{appid}.gschema.xml %{_datadir}/icons/hicolor/*/apps/*.png %{_datadir}/icons/hicolor/scalable/apps/*.svg +%{_datadir}/icons/hicolor/symbolic/apps/*.svg +%{_mandir}/man1/*.gz %changelog +* Thu Apr 13 2017 Patrick Griffis <tingping(a)tingping.se&gt; - 1.3.0-1 +- Bump version to 1.3.0 +- Fix directory ownership + * Mon Mar 20 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org&gt; - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index cae0aaa..cb8ec7f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -314f57af9909396c1be338e461378b7c pithos-1.2.1.tar.xz +f53ea35b3a60db90727957f99cabfa83 pithos-1.3.0.tar.xz