PR#3: Fix FTBFS - rpms/system-config-bind

rpms / system-config-bind

#3 Fix FTBFS

Closed 3 years ago by scfc. Opened 4 years ago by scfc.

Unknown source fix-ftbfs-f29 into f29

Fix FTBFS

Tim Landscheidt • 4 years ago

cdab593

system-config-bind-python2.patch

file added

+79

		`@@ -0,0 +1,79 @@`
		`+ diff -urx '*~' system-config-bind-4.0.15.orig/Makefile system-config-bind-4.0.15/Makefile`
		`+ --- system-config-bind-4.0.15.orig/Makefile 2019-06-23 22:45:42.621421872 +0000`
		`+ +++ system-config-bind-4.0.15/Makefile 2019-06-23 22:46:07.893167859 +0000`
		`+ @@ -133,10 +133,10 @@`
		`+ include doc_rules.mk`
		`+`
		`+ pyc: src/*.py`
		`+ - echo -e 'from compileall import *\ncompile_dir("src",1)' \| /usr/bin/python`
		`+ + echo -e 'from compileall import *\ncompile_dir("src",1)' \| /usr/bin/python2`
		`+`
		`+ pyo: src/*.py`
		`+ - echo -e 'from compileall import *\ncompile_dir("src",1)' \| /usr/bin/python -OO`
		`+ + echo -e 'from compileall import *\ncompile_dir("src",1)' \| /usr/bin/python2 -OO`
		`+`
		`+ system-config-bind.desktop.in: system-config-bind.desktop`
		`+ LC_ALL=C intltool-prepare`
		`+ diff -urx '*~' system-config-bind-4.0.15.orig/src/DNSsec.py system-config-bind-4.0.15/src/DNSsec.py`
		`+ --- system-config-bind-4.0.15.orig/src/DNSsec.py 2019-06-23 22:45:42.771366965 +0000`
		`+ +++ system-config-bind-4.0.15/src/DNSsec.py 2019-06-23 22:46:46.509027496 +0000`
		`+ @@ -1,4 +1,4 @@`
		`+ -#!/usr/bin/python`
		`+ +#!/usr/bin/python2`
		`+ #`
		`+ # BIND configuration module`
		`+ #`
		`+ diff -urx '*~' system-config-bind-4.0.15.orig/src/GUI.py system-config-bind-4.0.15/src/GUI.py`
		`+ --- system-config-bind-4.0.15.orig/src/GUI.py 2019-06-23 22:45:42.772366598 +0000`
		`+ +++ system-config-bind-4.0.15/src/GUI.py 2019-06-23 22:46:58.758541966 +0000`
		`+ @@ -1,4 +1,4 @@`
		`+ -#!/usr/bin/python`
		`+ +#!/usr/bin/python2`
		`+ #`
		`+ # BIND configuration GUI module`
		`+ #`
		`+ diff -urx '*~' system-config-bind-4.0.15.orig/src/Hosts.py system-config-bind-4.0.15/src/Hosts.py`
		`+ --- system-config-bind-4.0.15.orig/src/Hosts.py 2019-06-23 22:45:42.772366598 +0000`
		`+ +++ system-config-bind-4.0.15/src/Hosts.py 2019-06-23 22:47:03.013983707 +0000`
		`+ @@ -1,4 +1,4 @@`
		`+ -#!/usr/bin/python`
		`+ +#!/usr/bin/python2`
		`+ # Hosts file parser for system-config-bind Import facility`
		`+ # <ip address> <canonical name> <aliases...>`
		`+ # Jason Vas Dias, Red Hat Inc., Oct 2004`
		`+ diff -urx '*~' system-config-bind-4.0.15.orig/src/Lookup.py system-config-bind-4.0.15/src/Lookup.py`
		`+ --- system-config-bind-4.0.15.orig/src/Lookup.py 2019-06-23 22:45:42.773366232 +0000`
		`+ +++ system-config-bind-4.0.15/src/Lookup.py 2019-06-23 22:47:09.693537787 +0000`
		`+ @@ -1,4 +1,4 @@`
		`+ -#!/usr/bin/python`
		`+ +#!/usr/bin/python2`
		`+ #`
		`+ # Use 'dig' command to get FQDN and address of local (or given) host name,`
		`+ # as this is the only way of ensuring a timeout if there are`
		`+ diff -urx '*~' system-config-bind-4.0.15.orig/src/NamedConf.py system-config-bind-4.0.15/src/NamedConf.py`
		`+ --- system-config-bind-4.0.15.orig/src/NamedConf.py 2019-06-23 22:45:42.773366232 +0000`
		`+ +++ system-config-bind-4.0.15/src/NamedConf.py 2019-06-23 22:47:14.877639472 +0000`
		`+ @@ -1,4 +1,4 @@`
		`+ -#!/usr/bin/python`
		`+ +#!/usr/bin/python2`
		`+ #`
		`+ # NamedConf.py : named.conf parser`
		`+ #`
		`+ diff -urx '*~' system-config-bind-4.0.15.orig/src/Options.py system-config-bind-4.0.15/src/Options.py`
		`+ --- system-config-bind-4.0.15.orig/src/Options.py 2019-06-23 22:45:42.774365866 +0000`
		`+ +++ system-config-bind-4.0.15/src/Options.py 2019-06-23 22:47:27.472027657 +0000`
		`+ @@ -1,4 +1,4 @@`
		`+ -#!/usr/bin/python`
		`+ +#!/usr/bin/python2`
		`+ #`
		`+ # BIND named.conf Options`
		`+ #`
		`+ diff -urx '*~' system-config-bind-4.0.15.orig/src/Zone.py system-config-bind-4.0.15/src/Zone.py`
		`+ --- system-config-bind-4.0.15.orig/src/Zone.py 2019-06-23 22:45:42.776365134 +0000`
		`+ +++ system-config-bind-4.0.15/src/Zone.py 2019-06-23 22:47:37.910205403 +0000`
		`+ @@ -1,4 +1,4 @@`
		`+ -#!/usr/bin/python`
		`+ +#!/usr/bin/python2`
		`+ #`
		`+ # BIND zone file parser`
		`+ #`

system-config-bind.spec

file modified

+9 -5

		`@@ -1,18 +1,18 @@`
		`Summary: BIND DNS Configuration Tool`
		`Name: system-config-bind`
		`Version: 4.0.15`
		`- Release: 17%{?dist}`
		`+ Release: 18%{?dist}`
		`URL: http://fedorahosted.org/system-config-bind`
		`License: GPLv2`
		`Group: Applications/System`
		`Source0: https://fedorahosted.org/releases/s/y/system-config-bind/%{name}-%{version}.tar.gz`
		`BuildArch: noarch`
		`BuildRequires: python2, gettext, make, intltool, desktop-file-utils`
		`- BuildRequires: gnome-doc-utils, docbook-dtds, scrollkeeper`
		`+ BuildRequires: gnome-doc-utils, docbook-dtds, rarian-compat`
		`Requires: pygtk2, gnome-python2-gnome, pygtk2-libglade, gnome-python2-canvas`
		`Requires: bind, bind-utils, usermode, usermode-gtk, xdg-utils`
		`- Requires(post): hicolor-icon-theme`

		`+ Patch0: %{name}-python2.patch`
		`Patch1: %{name}-make.patch`

		`%description`
		`@@ -23,8 +23,7 @@`
		`DNS server.`

		`%prep`
		`- %setup -q`
		`- %patch1 -p1 -b .make`
		`+ %autosetup -p1`

		`%build`
		`make`
		`@@ -63,6 +62,11 @@`
		`%doc COPYING`

		`%changelog`
		`+ * Sun Jun 23 2019 Tim Landscheidt <tim@tim-landscheidt.de> - 4.0.15-18`
		`+ - Use rarian-compat instead of scrollkeeper (#1606474)`
		`+ - Remove obsolete requirement for %%post scriptlet`
		`+ - Use explicit python2 shebang`
		`+`
		`* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.15-17`
		`- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild`