From 7c01826b66a70cc4627014593b9336f8231ad9db Mon Sep 17 00:00:00 2001 From: Dominik Honnef Date: Mon, 18 Apr 2016 19:50:27 +0200 Subject: [PATCH] sabnzbd: update to 1.0.0 --- ...-00-system-configobj-feedparser-gntp.patch | 27 +++++++------------ srcpkgs/sabnzbd/template | 8 +++--- 2 files changed, 14 insertions(+), 21 deletions(-) diff --git a/srcpkgs/sabnzbd/patches/sabnzbd-00-system-configobj-feedparser-gntp.patch b/srcpkgs/sabnzbd/patches/sabnzbd-00-system-configobj-feedparser-gntp.patch index 0f009ecf651..3036ce27074 100644 --- a/srcpkgs/sabnzbd/patches/sabnzbd-00-system-configobj-feedparser-gntp.patch +++ b/srcpkgs/sabnzbd/patches/sabnzbd-00-system-configobj-feedparser-gntp.patch @@ -1,14 +1,12 @@ --- sabnzbd/config.py +++ sabnzbd/config.py -@@ -23,10 +23,12 @@ import os +@@ -24,10 +24,10 @@ import logging import threading import shutil -+ +import configobj -+ import sabnzbd.misc - from sabnzbd.constants import CONFIG_VERSION, NORMAL_PRIORITY, DEFAULT_PRIORITY + from sabnzbd.constants import CONFIG_VERSION, NORMAL_PRIORITY, DEFAULT_PRIORITY, MAX_WIN_DFOLDER from sabnzbd.utils import listquote -from sabnzbd.utils import configobj from sabnzbd.decorators import synchronized @@ -17,30 +15,25 @@ --- sabnzbd/rss.py +++ sabnzbd/rss.py -@@ -35,7 +35,7 @@ from sabnzbd.misc import cat_convert, sanitize_foldername, wildcard_to_re, cat_t +@@ -36,7 +36,7 @@ import sabnzbd.emailer as emailer - from sabnzbd.encoding import latin1, unicoder, xml_name + from sabnzbd.encoding import unicoder, xml_name -import sabnzbd.utils.feedparser as feedparser +import feedparser __RSS = None # Global pointer to RSS-scanner instance + --- sabnzbd/growler.py +++ sabnzbd/growler.py -@@ -31,7 +31,14 @@ import sabnzbd - import sabnzbd.cfg - from sabnzbd.encoding import unicoder, latin1 +@@ -37,7 +37,7 @@ + from sabnzbd.encoding import unicoder from sabnzbd.constants import NOTIFY_KEYS + -from gntp import GNTPRegister -+ -+try: -+ # <= version 0.6 -+ from gntp import GNTPRegister -+except ImportError: -+ # >= version 1.0 -+ from gntp.core import GNTPRegister -+ ++from gntp.core import GNTPRegister from gntp.notifier import GrowlNotifier try: import Growl + diff --git a/srcpkgs/sabnzbd/template b/srcpkgs/sabnzbd/template index d0509abf858..2e1bd529ed1 100644 --- a/srcpkgs/sabnzbd/template +++ b/srcpkgs/sabnzbd/template @@ -1,7 +1,7 @@ # Template file for 'sabnzbd' pkgname=sabnzbd -version=0.7.20 -revision=2 +version=1.0.0 +revision=1 wrksrc="SABnzbd-${version}" depends="par2cmdline python-cheetah python-configobj python-feedparser python-gntp python-openssl python-yenc unzip" maintainer="Dominik Honnef " @@ -10,8 +10,8 @@ maintainer="Dominik Honnef " license="GPL" homepage="http://sabnzbd.org/" short_desc="SABnzbd is an Open Source Binary Newsreader written in Python" -distfiles="${SOURCEFORGE_SITE}/sabnzbdplus/SABnzbd-${version}-src.tar.gz" -checksum=20b3a4613a0ecdede4fdfeb628ae806e458ac1a6fb684306328dd4ed1faf8742 +distfiles="https://github.com/sabnzbd/sabnzbd/releases/download/${version}/SABnzbd-${version}-src.tar.gz" +checksum=7573dfafd6f3b51e899f47436de0e0b3d8e83a568e2a6f0f3da0aaa1f3d4cfaa noarch=yes pycompile_dirs="/usr/share/sabnzbd"