From d84b31ee10ac76331f9bab2752b50463ee5b1f13 Mon Sep 17 00:00:00 2001 From: konradm Date: Sun, 10 Aug 2008 15:25:50 +0000 Subject: [PATCH 1/9] Initial import into Fedora. --- .cvsignore | 1 + hellanzb-README.Fedora | 8 +++ hellanzb-configuration-location3.patch | 42 ++++++++++++ hellanzb-remove-bogus-shebang.patch | 10 +++ hellanzb-unrar-is-optional.patch | 22 ++++++ hellanzb.spec | 94 ++++++++++++++++++++++++++ import.log | 1 + sources | 1 + 8 files changed, 179 insertions(+) create mode 100644 hellanzb-README.Fedora create mode 100644 hellanzb-configuration-location3.patch create mode 100644 hellanzb-remove-bogus-shebang.patch create mode 100644 hellanzb-unrar-is-optional.patch create mode 100644 hellanzb.spec create mode 100644 import.log diff --git a/.cvsignore b/.cvsignore index e69de29..2ab8557 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +hellanzb-0.13.tar.gz diff --git a/hellanzb-README.Fedora b/hellanzb-README.Fedora new file mode 100644 index 0000000..c38583c --- /dev/null +++ b/hellanzb-README.Fedora @@ -0,0 +1,8 @@ +Thanks for installing the Fedora package of hellanzb. To configure +the client for use, copy /usr/share/doc/hellanzb/hellanzb.conf.sample to +$HOME/.hellanzb.conf and edit it appropriately. To start hellanzb, just +run 'hellanzb -D'. To enqueue nzbs, drop them in the queue directory as +configured in your $HOME/.hellanzb.conf. + +If you want Hellanzb to automatically unrar downloaded files, install +the 'unrar' from a repository that provides packages Fedora can't. diff --git a/hellanzb-configuration-location3.patch b/hellanzb-configuration-location3.patch new file mode 100644 index 0000000..81d63eb --- /dev/null +++ b/hellanzb-configuration-location3.patch @@ -0,0 +1,42 @@ +--- Hellanzb/Core.py.orig 2008-08-05 23:50:37.000000000 -0700 ++++ Hellanzb/Core.py 2008-08-06 00:02:39.000000000 -0700 +@@ -32,14 +32,13 @@ + return + else: + error('Unable to load specified config file: ' + optionalConfigFile) + sys.exit(1) + +- # look for conf in this order: sys.prefix, ./, or ./etc/ +- confDirs = [os.path.join(sys.prefix, 'etc')] ++ # look for conf in this order: $HOME/, /etc, or ./ ++ confDirs = [os.environ['HOME'], '/etc'] + try: +- confDirs.append(os.path.join(os.getcwd(), 'etc')) + confDirs.append(os.getcwd()) + except OSError, ose: + if ose.errno != 2: + raise + # OSError: [Errno 2] No such file or directory. cwd doesn't exist +@@ -49,16 +48,22 @@ + if Hellanzb.SYSNAME == "Darwin": + confDirs[0] = '/opt/local/etc' + + for dir in confDirs: + file = os.path.join(dir, 'hellanzb.conf') ++ file2 = os.path.join(dir, '.hellanzb.conf') + + if loadConfig(file): + Hellanzb.CONFIG_FILENAME = file + return ++ elif loadConfig(file2): ++ Hellanzb.CONFIG_FILENAME = file2 ++ return + + error('Could not find configuration file in the following dirs: ' + str(confDirs)) ++ readmeFedora = "*DOCDIR*/*PKGNAME*/README.Fedora" ++ print open(readmeFedora).read().strip() + sys.exit(1) + + def loadConfig(fileName): + """ Attempt to load the specified config file. If successful, clean the variables/data the + config file has setup """ diff --git a/hellanzb-remove-bogus-shebang.patch b/hellanzb-remove-bogus-shebang.patch new file mode 100644 index 0000000..b90b2fb --- /dev/null +++ b/hellanzb-remove-bogus-shebang.patch @@ -0,0 +1,10 @@ +--- Hellanzb/Growl.py.orig 2008-07-19 18:08:13.000000000 -0700 ++++ Hellanzb/Growl.py 2008-07-19 18:08:45.000000000 -0700 +@@ -1,7 +1,5 @@ +-#!/usr/bin/env python +- + """Growl 0.6 Network Protocol Client for Python""" + __version__ = "0.6" # will always match Growl version + __author__ = "Rui Carmo (http://the.taoofmac.com)" + __copyright__ = "(C) 2004 Rui Carmo. Code under BSD License." + __contributors__ = "Ingmar J Stein (Growl Team)" diff --git a/hellanzb-unrar-is-optional.patch b/hellanzb-unrar-is-optional.patch new file mode 100644 index 0000000..7e9e803 --- /dev/null +++ b/hellanzb-unrar-is-optional.patch @@ -0,0 +1,22 @@ +--- Hellanzb/Core.py.orig 2008-07-21 06:05:16.000000000 -0700 ++++ Hellanzb/Core.py 2008-07-21 06:06:23.000000000 -0700 +@@ -94,11 +94,18 @@ + Hellanzb.MAX_RATE = 0 + else: + Hellanzb.MAX_RATE = int(Hellanzb.MAX_RATE) + + if not hasattr(Hellanzb, 'UNRAR_CMD') or Hellanzb.UNRAR_CMD is None: +- Hellanzb.UNRAR_CMD = assertIsExe(['rar', 'unrar']) ++ # unrar is optional when it is not installed or not specified in conf ++ Hellanzb.UNRAR_CMD = None ++ try: ++ Hellanzb.UNRAR_CMD = assertIsExe(['rar', 'unrar']) ++ except FatalError: ++ # if unrar isn't available, skip it and warn the user ++ print "Warning -- unrar was not found. Disabling unraring." ++ Hellanzb.SKIP_UNRAR = True + else: + Hellanzb.UNRAR_CMD = assertIsExe([Hellanzb.UNRAR_CMD]) + + if not hasattr(Hellanzb, 'PAR2_CMD') or Hellanzb.PAR2_CMD is None: + Hellanzb.PAR2_CMD = assertIsExe(['par2']) diff --git a/hellanzb.spec b/hellanzb.spec new file mode 100644 index 0000000..95e2d6a --- /dev/null +++ b/hellanzb.spec @@ -0,0 +1,94 @@ +%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} + +Name: hellanzb +Version: 0.13 +Release: 5%{?dist} +Summary: Hands-free nzb downloader and post processor + +Group: Applications/Internet +License: BSD +URL: http://www.hellanzb.com/trac/ +Source0: http://www.hellanzb.com/distfiles/hellanzb-%{version}.tar.gz +Source1: hellanzb-README.Fedora +# Make hellanzb check in $HOME, then /etc, then cwd. Print Fedora-specific +# README if no config is found. +Patch0: hellanzb-configuration-location3.patch +# Disable unrar functionality if the command is not found in PATH. +Patch1: hellanzb-unrar-is-optional.patch +# Remove a bogus shebang from a library that rpmlint doesn't like. +Patch2: hellanzb-remove-bogus-shebang.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: python-devel +BuildRequires: python-setuptools +BuildArch: noarch + +Requires: par2cmdline +Requires: python-twisted +Requires: python-twisted-web +Requires: python-yenc + + +%description +hellanzb is an easy to use application designed to retrieve nzb files +and fully process them. The goal being to make getting files from Usenet +as hands-free as possible. Once fully installed, all that's required +is moving an nzb file to the queue directory. The rest: downloading, +par-checking, un-raring, etc. is done automatically by hellanzb. + + +%prep +%setup -q +%patch0 +sed --in-place 's|\*DOCDIR\*|%{_docdir}|' Hellanzb/Core.py +sed --in-place 's|\*PKGNAME\*|%{name}|' Hellanzb/Core.py +%patch1 +%patch2 + + +%build +%{__python} -c 'import setuptools; execfile("setup.py")' build + + +%install +rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir} +%{__python} -c 'import setuptools; execfile("setup.py")' install --skip-build --root $RPM_BUILD_ROOT + +mv $RPM_BUILD_ROOT/%{_bindir}/%{name}.py $RPM_BUILD_ROOT/%{_bindir}/%{name} +rm $RPM_BUILD_ROOT/usr/etc/%{name}.conf.sample + +mv etc/hellanzb.conf.sample $RPM_BUILD_ROOT/%{_docdir}/%{name}/ +cp %{SOURCE1} $RPM_BUILD_ROOT/%{_docdir}/%{name}/README.Fedora + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root,-) +%{_docdir}/%{name}/ +%{python_sitelib}/* +%{_bindir}/%{name} + + +%changelog +* Wed Aug 6 2008 Conrad Meyer - 0.13-5 +- Re-seperated unrar and configuration patches. + +* Tue Aug 5 2008 Conrad Meyer - 0.13-4 +- Add missing BR to build in mock/koji. +- Patched to look in /etc instead of /usr/etc for configuration. +- Patched to inform user that configuration is needed if no configuration + can be found. + +* Mon Jul 21 2008 Conrad Meyer - 0.13-3 +- Patch to make unrar optional. + +* Sat Jul 19 2008 Conrad Meyer - 0.13-2 +- Look for configuration on a per-user basis (~/.hellanzb.conf). +- Move sample config to %%doc. +- Add a README.RPMFusion. + +* Mon Jun 2 2008 Conrad Meyer - 0.13-1 +- Initial revision. diff --git a/import.log b/import.log new file mode 100644 index 0000000..85c0eba --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +hellanzb-0_13-5_fc9:HEAD:hellanzb-0.13-5.fc9.src.rpm:1218381246 diff --git a/sources b/sources index e69de29..6cb52cf 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +d3510c6b1b2c7b935332a469fdc8e7e2 hellanzb-0.13.tar.gz From 60b00206b601cb35b827692cdd0812ac85a99bd0 Mon Sep 17 00:00:00 2001 From: konradm Date: Sun, 10 Aug 2008 15:46:17 +0000 Subject: [PATCH 2/9] Try three... --- .cvsignore | 1 + sources | 1 + 2 files changed, 2 insertions(+) diff --git a/.cvsignore b/.cvsignore index 2ab8557..c3abcec 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ hellanzb-0.13.tar.gz +hellanzb-README.Fedora diff --git a/sources b/sources index 6cb52cf..9942b42 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ d3510c6b1b2c7b935332a469fdc8e7e2 hellanzb-0.13.tar.gz +c6cebd7a279ee4aabbf3773c6aab7b6b hellanzb-README.Fedora From f4b380f5c404d90fe73258dd61f96e5db36137f5 Mon Sep 17 00:00:00 2001 From: konradm Date: Thu, 16 Oct 2008 03:14:58 +0000 Subject: [PATCH 3/9] Add patch for bug 467032 --- hellanzb-0.13-dont-attempt-multiple-groups.diff | 16 ++++++++++++++++ hellanzb.spec | 9 ++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 hellanzb-0.13-dont-attempt-multiple-groups.diff diff --git a/hellanzb-0.13-dont-attempt-multiple-groups.diff b/hellanzb-0.13-dont-attempt-multiple-groups.diff new file mode 100644 index 0000000..093ce46 --- /dev/null +++ b/hellanzb-0.13-dont-attempt-multiple-groups.diff @@ -0,0 +1,16 @@ +--- Hellanzb/NZBLeecher/NZBParser.py.orig 2008-10-15 20:05:11.000000000 -0700 ++++ Hellanzb/NZBLeecher/NZBParser.py 2008-10-15 20:10:32.000000000 -0700 +@@ -148,11 +148,12 @@ + self.file = None + self.fileNeedsDownload = None + + elif name == 'group': + newsgroup = self.parseUnicode(''.join(self.chars)) +- self.file.groups.append(newsgroup) ++ #self.file.groups.append(newsgroup) ++ self.file.group = newsgroup + + self.chars = None + + elif name == 'segment': + if self.number in self.segmentNumbers: diff --git a/hellanzb.spec b/hellanzb.spec index 95e2d6a..0f2d051 100644 --- a/hellanzb.spec +++ b/hellanzb.spec @@ -2,7 +2,7 @@ Name: hellanzb Version: 0.13 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Hands-free nzb downloader and post processor Group: Applications/Internet @@ -17,6 +17,9 @@ Patch0: hellanzb-configuration-location3.patch Patch1: hellanzb-unrar-is-optional.patch # Remove a bogus shebang from a library that rpmlint doesn't like. Patch2: hellanzb-remove-bogus-shebang.patch +# Multiple group support is broken, so only take the last one +# See: https://bugzilla.redhat.com/show_bug.cgi?id=467032 +Patch3: hellanzb-0.13-dont-attempt-multiple-groups.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel BuildRequires: python-setuptools @@ -43,6 +46,7 @@ sed --in-place 's|\*DOCDIR\*|%{_docdir}|' Hellanzb/Core.py sed --in-place 's|\*PKGNAME\*|%{name}|' Hellanzb/Core.py %patch1 %patch2 +%patch3 %build @@ -73,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Oct 15 2008 Conrad Meyer - 0.13-6 +- Don't allow multiple groups as support for that is broken. + * Wed Aug 6 2008 Conrad Meyer - 0.13-5 - Re-seperated unrar and configuration patches. From 78d84458e8ead94333851b5ef87710a578bbc01d Mon Sep 17 00:00:00 2001 From: Ignacio Vazquez-Abrams Date: Sat, 29 Nov 2008 16:47:49 +0000 Subject: [PATCH 4/9] Rebuild for Python 2.6 --- hellanzb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hellanzb.spec b/hellanzb.spec index 0f2d051..65b92a7 100644 --- a/hellanzb.spec +++ b/hellanzb.spec @@ -2,7 +2,7 @@ Name: hellanzb Version: 0.13 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Hands-free nzb downloader and post processor Group: Applications/Internet @@ -77,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 0.13-7 +- Rebuild for Python 2.6 + * Wed Oct 15 2008 Conrad Meyer - 0.13-6 - Don't allow multiple groups as support for that is broken. From 15a4063679c77a83f5b984d71eedb524c0369582 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 25 Feb 2009 03:36:24 +0000 Subject: [PATCH 5/9] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- hellanzb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hellanzb.spec b/hellanzb.spec index 65b92a7..29cf8a5 100644 --- a/hellanzb.spec +++ b/hellanzb.spec @@ -2,7 +2,7 @@ Name: hellanzb Version: 0.13 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Hands-free nzb downloader and post processor Group: Applications/Internet @@ -77,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Feb 24 2009 Fedora Release Engineering - 0.13-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Sat Nov 29 2008 Ignacio Vazquez-Abrams - 0.13-7 - Rebuild for Python 2.6 From c3b473ec5644b599254651223f8baad82eee9378 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sat, 25 Jul 2009 02:06:32 +0000 Subject: [PATCH 6/9] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- hellanzb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hellanzb.spec b/hellanzb.spec index 29cf8a5..9091e67 100644 --- a/hellanzb.spec +++ b/hellanzb.spec @@ -2,7 +2,7 @@ Name: hellanzb Version: 0.13 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Hands-free nzb downloader and post processor Group: Applications/Internet @@ -77,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jul 24 2009 Fedora Release Engineering - 0.13-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Tue Feb 24 2009 Fedora Release Engineering - 0.13-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From b66ed422fb692593b6e7c320a2a4ed647248a845 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:54:52 +0000 Subject: [PATCH 7/9] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index cc91025..b2fc751 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: hellanzb -# $Id$ +# $Id: Makefile,v 1.1 2008/08/10 01:06:03 kevin Exp $ NAME := hellanzb SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 2daaafad552a8e595ef450cc94cc06fcc3797dd8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 17:41:46 +0000 Subject: [PATCH 8/9] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- import.log | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index b2fc751..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: hellanzb -# $Id: Makefile,v 1.1 2008/08/10 01:06:03 kevin Exp $ -NAME := hellanzb -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/import.log b/import.log deleted file mode 100644 index 85c0eba..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -hellanzb-0_13-5_fc9:HEAD:hellanzb-0.13-5.fc9.src.rpm:1218381246 From 2603ecdcd62f38ee6e774356cd2dab3f90b242ec Mon Sep 17 00:00:00 2001 From: Till Maas Date: Wed, 4 Jun 2014 19:47:22 +0200 Subject: [PATCH 9/9] 2014-06-04 - This package was already retired in pkgdb/blocked in koji, but no dead.package file existed. The original retirement reason is unclear. --- .gitignore | 2 - dead.package | 1 + ...nzb-0.13-dont-attempt-multiple-groups.diff | 16 --- hellanzb-README.Fedora | 8 -- hellanzb-configuration-location3.patch | 42 ------- hellanzb-remove-bogus-shebang.patch | 10 -- hellanzb-unrar-is-optional.patch | 22 ---- hellanzb.spec | 110 ------------------ sources | 2 - 9 files changed, 1 insertion(+), 212 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 hellanzb-0.13-dont-attempt-multiple-groups.diff delete mode 100644 hellanzb-README.Fedora delete mode 100644 hellanzb-configuration-location3.patch delete mode 100644 hellanzb-remove-bogus-shebang.patch delete mode 100644 hellanzb-unrar-is-optional.patch delete mode 100644 hellanzb.spec delete mode 100644 sources diff --git a/.gitignore b/.gitignore deleted file mode 100644 index c3abcec..0000000 --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -hellanzb-0.13.tar.gz -hellanzb-README.Fedora diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5784d07 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +2014-06-04 - This package was already retired in pkgdb/blocked in koji, but no dead.package file existed. The original retirement reason is unclear. diff --git a/hellanzb-0.13-dont-attempt-multiple-groups.diff b/hellanzb-0.13-dont-attempt-multiple-groups.diff deleted file mode 100644 index 093ce46..0000000 --- a/hellanzb-0.13-dont-attempt-multiple-groups.diff +++ /dev/null @@ -1,16 +0,0 @@ ---- Hellanzb/NZBLeecher/NZBParser.py.orig 2008-10-15 20:05:11.000000000 -0700 -+++ Hellanzb/NZBLeecher/NZBParser.py 2008-10-15 20:10:32.000000000 -0700 -@@ -148,11 +148,12 @@ - self.file = None - self.fileNeedsDownload = None - - elif name == 'group': - newsgroup = self.parseUnicode(''.join(self.chars)) -- self.file.groups.append(newsgroup) -+ #self.file.groups.append(newsgroup) -+ self.file.group = newsgroup - - self.chars = None - - elif name == 'segment': - if self.number in self.segmentNumbers: diff --git a/hellanzb-README.Fedora b/hellanzb-README.Fedora deleted file mode 100644 index c38583c..0000000 --- a/hellanzb-README.Fedora +++ /dev/null @@ -1,8 +0,0 @@ -Thanks for installing the Fedora package of hellanzb. To configure -the client for use, copy /usr/share/doc/hellanzb/hellanzb.conf.sample to -$HOME/.hellanzb.conf and edit it appropriately. To start hellanzb, just -run 'hellanzb -D'. To enqueue nzbs, drop them in the queue directory as -configured in your $HOME/.hellanzb.conf. - -If you want Hellanzb to automatically unrar downloaded files, install -the 'unrar' from a repository that provides packages Fedora can't. diff --git a/hellanzb-configuration-location3.patch b/hellanzb-configuration-location3.patch deleted file mode 100644 index 81d63eb..0000000 --- a/hellanzb-configuration-location3.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- Hellanzb/Core.py.orig 2008-08-05 23:50:37.000000000 -0700 -+++ Hellanzb/Core.py 2008-08-06 00:02:39.000000000 -0700 -@@ -32,14 +32,13 @@ - return - else: - error('Unable to load specified config file: ' + optionalConfigFile) - sys.exit(1) - -- # look for conf in this order: sys.prefix, ./, or ./etc/ -- confDirs = [os.path.join(sys.prefix, 'etc')] -+ # look for conf in this order: $HOME/, /etc, or ./ -+ confDirs = [os.environ['HOME'], '/etc'] - try: -- confDirs.append(os.path.join(os.getcwd(), 'etc')) - confDirs.append(os.getcwd()) - except OSError, ose: - if ose.errno != 2: - raise - # OSError: [Errno 2] No such file or directory. cwd doesn't exist -@@ -49,16 +48,22 @@ - if Hellanzb.SYSNAME == "Darwin": - confDirs[0] = '/opt/local/etc' - - for dir in confDirs: - file = os.path.join(dir, 'hellanzb.conf') -+ file2 = os.path.join(dir, '.hellanzb.conf') - - if loadConfig(file): - Hellanzb.CONFIG_FILENAME = file - return -+ elif loadConfig(file2): -+ Hellanzb.CONFIG_FILENAME = file2 -+ return - - error('Could not find configuration file in the following dirs: ' + str(confDirs)) -+ readmeFedora = "*DOCDIR*/*PKGNAME*/README.Fedora" -+ print open(readmeFedora).read().strip() - sys.exit(1) - - def loadConfig(fileName): - """ Attempt to load the specified config file. If successful, clean the variables/data the - config file has setup """ diff --git a/hellanzb-remove-bogus-shebang.patch b/hellanzb-remove-bogus-shebang.patch deleted file mode 100644 index b90b2fb..0000000 --- a/hellanzb-remove-bogus-shebang.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- Hellanzb/Growl.py.orig 2008-07-19 18:08:13.000000000 -0700 -+++ Hellanzb/Growl.py 2008-07-19 18:08:45.000000000 -0700 -@@ -1,7 +1,5 @@ --#!/usr/bin/env python -- - """Growl 0.6 Network Protocol Client for Python""" - __version__ = "0.6" # will always match Growl version - __author__ = "Rui Carmo (http://the.taoofmac.com)" - __copyright__ = "(C) 2004 Rui Carmo. Code under BSD License." - __contributors__ = "Ingmar J Stein (Growl Team)" diff --git a/hellanzb-unrar-is-optional.patch b/hellanzb-unrar-is-optional.patch deleted file mode 100644 index 7e9e803..0000000 --- a/hellanzb-unrar-is-optional.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- Hellanzb/Core.py.orig 2008-07-21 06:05:16.000000000 -0700 -+++ Hellanzb/Core.py 2008-07-21 06:06:23.000000000 -0700 -@@ -94,11 +94,18 @@ - Hellanzb.MAX_RATE = 0 - else: - Hellanzb.MAX_RATE = int(Hellanzb.MAX_RATE) - - if not hasattr(Hellanzb, 'UNRAR_CMD') or Hellanzb.UNRAR_CMD is None: -- Hellanzb.UNRAR_CMD = assertIsExe(['rar', 'unrar']) -+ # unrar is optional when it is not installed or not specified in conf -+ Hellanzb.UNRAR_CMD = None -+ try: -+ Hellanzb.UNRAR_CMD = assertIsExe(['rar', 'unrar']) -+ except FatalError: -+ # if unrar isn't available, skip it and warn the user -+ print "Warning -- unrar was not found. Disabling unraring." -+ Hellanzb.SKIP_UNRAR = True - else: - Hellanzb.UNRAR_CMD = assertIsExe([Hellanzb.UNRAR_CMD]) - - if not hasattr(Hellanzb, 'PAR2_CMD') or Hellanzb.PAR2_CMD is None: - Hellanzb.PAR2_CMD = assertIsExe(['par2']) diff --git a/hellanzb.spec b/hellanzb.spec deleted file mode 100644 index 9091e67..0000000 --- a/hellanzb.spec +++ /dev/null @@ -1,110 +0,0 @@ -%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} - -Name: hellanzb -Version: 0.13 -Release: 9%{?dist} -Summary: Hands-free nzb downloader and post processor - -Group: Applications/Internet -License: BSD -URL: http://www.hellanzb.com/trac/ -Source0: http://www.hellanzb.com/distfiles/hellanzb-%{version}.tar.gz -Source1: hellanzb-README.Fedora -# Make hellanzb check in $HOME, then /etc, then cwd. Print Fedora-specific -# README if no config is found. -Patch0: hellanzb-configuration-location3.patch -# Disable unrar functionality if the command is not found in PATH. -Patch1: hellanzb-unrar-is-optional.patch -# Remove a bogus shebang from a library that rpmlint doesn't like. -Patch2: hellanzb-remove-bogus-shebang.patch -# Multiple group support is broken, so only take the last one -# See: https://bugzilla.redhat.com/show_bug.cgi?id=467032 -Patch3: hellanzb-0.13-dont-attempt-multiple-groups.diff -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: python-devel -BuildRequires: python-setuptools -BuildArch: noarch - -Requires: par2cmdline -Requires: python-twisted -Requires: python-twisted-web -Requires: python-yenc - - -%description -hellanzb is an easy to use application designed to retrieve nzb files -and fully process them. The goal being to make getting files from Usenet -as hands-free as possible. Once fully installed, all that's required -is moving an nzb file to the queue directory. The rest: downloading, -par-checking, un-raring, etc. is done automatically by hellanzb. - - -%prep -%setup -q -%patch0 -sed --in-place 's|\*DOCDIR\*|%{_docdir}|' Hellanzb/Core.py -sed --in-place 's|\*PKGNAME\*|%{name}|' Hellanzb/Core.py -%patch1 -%patch2 -%patch3 - - -%build -%{__python} -c 'import setuptools; execfile("setup.py")' build - - -%install -rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir} -%{__python} -c 'import setuptools; execfile("setup.py")' install --skip-build --root $RPM_BUILD_ROOT - -mv $RPM_BUILD_ROOT/%{_bindir}/%{name}.py $RPM_BUILD_ROOT/%{_bindir}/%{name} -rm $RPM_BUILD_ROOT/usr/etc/%{name}.conf.sample - -mv etc/hellanzb.conf.sample $RPM_BUILD_ROOT/%{_docdir}/%{name}/ -cp %{SOURCE1} $RPM_BUILD_ROOT/%{_docdir}/%{name}/README.Fedora - - -%clean -rm -rf $RPM_BUILD_ROOT - - -%files -%defattr(-,root,root,-) -%{_docdir}/%{name}/ -%{python_sitelib}/* -%{_bindir}/%{name} - - -%changelog -* Fri Jul 24 2009 Fedora Release Engineering - 0.13-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Tue Feb 24 2009 Fedora Release Engineering - 0.13-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 0.13-7 -- Rebuild for Python 2.6 - -* Wed Oct 15 2008 Conrad Meyer - 0.13-6 -- Don't allow multiple groups as support for that is broken. - -* Wed Aug 6 2008 Conrad Meyer - 0.13-5 -- Re-seperated unrar and configuration patches. - -* Tue Aug 5 2008 Conrad Meyer - 0.13-4 -- Add missing BR to build in mock/koji. -- Patched to look in /etc instead of /usr/etc for configuration. -- Patched to inform user that configuration is needed if no configuration - can be found. - -* Mon Jul 21 2008 Conrad Meyer - 0.13-3 -- Patch to make unrar optional. - -* Sat Jul 19 2008 Conrad Meyer - 0.13-2 -- Look for configuration on a per-user basis (~/.hellanzb.conf). -- Move sample config to %%doc. -- Add a README.RPMFusion. - -* Mon Jun 2 2008 Conrad Meyer - 0.13-1 -- Initial revision. diff --git a/sources b/sources deleted file mode 100644 index 9942b42..0000000 --- a/sources +++ /dev/null @@ -1,2 +0,0 @@ -d3510c6b1b2c7b935332a469fdc8e7e2 hellanzb-0.13.tar.gz -c6cebd7a279ee4aabbf3773c6aab7b6b hellanzb-README.Fedora