sabnzbd: update to 1.0.0

This commit is contained in:
Dominik Honnef 2016-04-18 19:50:27 +02:00
parent b0a0b51212
commit 7c01826b66
2 changed files with 14 additions and 21 deletions

View File

@ -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

View File

@ -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 <dominik@honnef.co>"
@ -10,8 +10,8 @@ maintainer="Dominik Honnef <dominik@honnef.co>"
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"