From 24934e623441310f644e5f72855b0f2bf9f3cd1a Mon Sep 17 00:00:00 2001 From: BlackNoxis Date: Mon, 27 Oct 2014 18:38:05 +0200 Subject: Incoming! Moving Rogento.git to kogaion-desktop. Finally --- .../python-report/files/bugs.sabayon.org.ini | 9 ++++ .../files/python-report-0.10-disable-rpm.patch | 20 ++++++++ .../python-report-0.10-fix-version-detection.patch | 22 +++++++++ .../python-report-0.10-sabayon-defaults.patch | 54 +++++++++++++++++++++ .../files/python-report-0.23-disable-Werror.patch | 9 ++++ .../files/python-report-0.23-disable-rpm.patch | 19 ++++++++ .../files/python-report-0.23-sabayon-config.patch | 55 ++++++++++++++++++++++ 7 files changed, 188 insertions(+) create mode 100644 dev-python/python-report/files/bugs.sabayon.org.ini create mode 100644 dev-python/python-report/files/python-report-0.10-disable-rpm.patch create mode 100644 dev-python/python-report/files/python-report-0.10-fix-version-detection.patch create mode 100644 dev-python/python-report/files/python-report-0.10-sabayon-defaults.patch create mode 100644 dev-python/python-report/files/python-report-0.23-disable-Werror.patch create mode 100644 dev-python/python-report/files/python-report-0.23-disable-rpm.patch create mode 100644 dev-python/python-report/files/python-report-0.23-sabayon-config.patch (limited to 'dev-python/python-report/files') diff --git a/dev-python/python-report/files/bugs.sabayon.org.ini b/dev-python/python-report/files/bugs.sabayon.org.ini new file mode 100644 index 00000000..9fa29826 --- /dev/null +++ b/dev-python/python-report/files/bugs.sabayon.org.ini @@ -0,0 +1,9 @@ +[bugs.sabayon.org] +# template +template=bugzilla-template + +# rhbz url +bugzilla_host=bugs.sabayon.org + +# rhbz login, a password is always asked. +# username=user@example.com diff --git a/dev-python/python-report/files/python-report-0.10-disable-rpm.patch b/dev-python/python-report/files/python-report-0.10-disable-rpm.patch new file mode 100644 index 00000000..501bb703 --- /dev/null +++ b/dev-python/python-report/files/python-report-0.10-disable-rpm.patch @@ -0,0 +1,20 @@ +diff -Nurp python-report-0.10.orig/python/report/templates/bugzilla-template/__init__.py python-report-0.10/python/report/templates/bugzilla-template/__init__.py +--- python-report-0.10.orig/python/report/templates/bugzilla-template/__init__.py 2010-04-02 19:32:19.729109477 +0200 ++++ python-report-0.10/python/report/templates/bugzilla-template/__init__.py 2010-04-02 19:32:54.640917830 +0200 +@@ -106,7 +106,6 @@ import filer + def sendToBugzilla(component, signature, io, bzfiler, + optionsDict, fileName, fileDescription): + +- import rpmUtils.arch + + class BugzillaCommunicationException (Exception): + pass +@@ -204,7 +203,7 @@ def sendToBugzilla(component, signature, + bug = withBugzillaDo(bzfiler, lambda b: b.createbug(product=bzfiler.getproduct(), + component=component, + version=bzfiler.getversion(), +- platform=rpmUtils.arch.getBaseArch(), ++ # platform=rpmUtils.arch.getBaseArch(), + bug_severity="medium", + priority="medium", + op_sys="Linux", diff --git a/dev-python/python-report/files/python-report-0.10-fix-version-detection.patch b/dev-python/python-report/files/python-report-0.10-fix-version-detection.patch new file mode 100644 index 00000000..d8f9b955 --- /dev/null +++ b/dev-python/python-report/files/python-report-0.10-fix-version-detection.patch @@ -0,0 +1,22 @@ +diff -Nurp python-report-0.10.orig//python/report/templates/bugzilla-template/filer.py python-report-0.10/python/report/templates/bugzilla-template/filer.py +--- python-report-0.10.orig//python/report/templates/bugzilla-template/filer.py 2010-04-13 23:08:08.849090647 +0200 ++++ python-report-0.10/python/report/templates/bugzilla-template/filer.py 2010-04-13 23:09:20.799052132 +0200 +@@ -61,15 +61,11 @@ def getVersion(): + if os.path.exists(SYSTEM_VERSION_PATH): + file = open(SYSTEM_VERSION_PATH, "r") + content = file.read() +- if content.find("Rawhide") > -1: +- return "rawhide" +- +- clist = content.split(" ") +- i = clist.index("release") +- return clist[i+1] ++ file.close() ++ return content.strip().split()[-1] + else: + # default to rawhide +- return "rawhide" ++ return "unknown" + + class LoginError(Exception): + """An error occurred while logging into the bug reporting system.""" diff --git a/dev-python/python-report/files/python-report-0.10-sabayon-defaults.patch b/dev-python/python-report/files/python-report-0.10-sabayon-defaults.patch new file mode 100644 index 00000000..4af6ec65 --- /dev/null +++ b/dev-python/python-report/files/python-report-0.10-sabayon-defaults.patch @@ -0,0 +1,54 @@ +diff -Nurp python-report-0.10.orig/python/report/templates/bugzilla-template/__init__.py python-report-0.10/python/report/templates/bugzilla-template/__init__.py +--- python-report-0.10.orig/python/report/templates/bugzilla-template/__init__.py 2010-04-02 18:46:19.862030189 +0200 ++++ python-report-0.10/python/report/templates/bugzilla-template/__init__.py 2010-04-02 18:56:47.102924468 +0200 +@@ -55,10 +55,10 @@ def displayURL(optionsDict): + def bugURL(optionsDict): + if 'bugURL' in optionsDict: + return optionsDict["bugURL"] +- host = "bugzilla.redhat.com" ++ host = "bugs.sabayon.org" + if 'bugzilla_host' in optionsDict: + host = optionsDict["bugzilla_host"] +- return "https://" + host + "/xmlrpc.cgi" ++ return "http://" + host + "/xmlrpc.cgi" + + def report(signature, io, optionsDict): + if not io: +@@ -130,8 +130,8 @@ def sendToBugzilla(component, signature, + + try: + if not bzfiler: +- bzfiler = filer.BugzillaFiler("https://bugzilla.redhat.com/xmlrpc.cgi", +- "http://bugzilla.redhat.com", ++ bzfiler = filer.BugzillaFiler("http://bugs.sabayon.org/xmlrpc.cgi", ++ "http://bugs.sabayon.org", + filer.getVersion(), filer.getProduct()) + + if not bzfiler or not bzfiler.supportsFiling() or not bzfiler.bugUrl: +diff -Nurp python-report-0.10.orig/python/report/templates/RHEL-template/__init__.py python-report-0.10/python/report/templates/RHEL-template/__init__.py +--- python-report-0.10.orig/python/report/templates/RHEL-template/__init__.py 2010-04-02 18:46:19.862030189 +0200 ++++ python-report-0.10/python/report/templates/RHEL-template/__init__.py 2010-04-02 18:56:33.214921519 +0200 +@@ -55,10 +55,10 @@ def displayURL(optionsDict): + def bugURL(optionsDict): + if optionsDict.has_key("bugURL"): + return optionsDict["bugURL"] +- host = "bugzilla.redhat.com" ++ host = "bugs.sabayon.org" + if optionsDict.has_key("bugzilla_host"): + host = optionsDict["bugzilla_host"] +- return "https://" + host + "/xmlrpc.cgi" ++ return "http://" + host + "/xmlrpc.cgi" + + def report(signature, io, optionsDict): + if not io: +@@ -131,8 +131,8 @@ def sendToBugzilla( component, hashmarke + + try: + if not bzfiler: +- bzfiler = filer.BugzillaFiler("https://bugzilla.redhat.com/xmlrpc.cgi", +- "http://bugzilla.redhat.com", ++ bzfiler = filer.BugzillaFiler("http://bugs.sabayon.org/xmlrpc.cgi", ++ "http://bugs.sabayon.org", + filer.getVersion(), filer.getProduct()) + + if not bzfiler or not bzfiler.supportsFiling() or not bzfiler.bugUrl: diff --git a/dev-python/python-report/files/python-report-0.23-disable-Werror.patch b/dev-python/python-report/files/python-report-0.23-disable-Werror.patch new file mode 100644 index 00000000..e4bdc909 --- /dev/null +++ b/dev-python/python-report/files/python-report-0.23-disable-Werror.patch @@ -0,0 +1,9 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -1,5 +1,5 @@ + AC_INIT([report], [0.23]) +-AM_INIT_AUTOMAKE([-Wall -Werror foreign]) ++AM_INIT_AUTOMAKE([-Wall foreign]) + AC_PROG_CC + AC_PROG_CXX + AC_PROG_LIBTOOL diff --git a/dev-python/python-report/files/python-report-0.23-disable-rpm.patch b/dev-python/python-report/files/python-report-0.23-disable-rpm.patch new file mode 100644 index 00000000..4a110930 --- /dev/null +++ b/dev-python/python-report/files/python-report-0.23-disable-rpm.patch @@ -0,0 +1,19 @@ +--- a/python/report/plugins/bugzilla/__init__.py ++++ b/python/report/plugins/bugzilla/__init__.py +@@ -115,8 +115,6 @@ import filer + def sendToBugzilla(component, signature, io, bzfiler, + optionsDict, fileName, fileDescription): + +- import rpmUtils.arch +- + class BugzillaCommunicationException (Exception): + pass + +@@ -298,7 +296,6 @@ def sendToBugzilla(component, signature, + product=bzfiler.getproduct(), + component=component, + version=bzfiler.getversion(), +- platform=rpmUtils.arch.getBaseArch(), + bug_severity="medium", + priority="medium", + op_sys="Linux", diff --git a/dev-python/python-report/files/python-report-0.23-sabayon-config.patch b/dev-python/python-report/files/python-report-0.23-sabayon-config.patch new file mode 100644 index 00000000..32879703 --- /dev/null +++ b/dev-python/python-report/files/python-report-0.23-sabayon-config.patch @@ -0,0 +1,55 @@ +--- a/etc/Makefile.am ++++ b/etc/Makefile.am +@@ -1,11 +1,9 @@ + nobase_dist_sysconf_DATA = \ +-report.d/bugzilla.redhat.com.conf \ +-report.d/RHEL-bugzilla.redhat.com.conf \ ++report.d/bugs.sabayon.org.conf \ + report.conf \ + report.d/ftp.conf \ + report.d/scp.conf \ + report.d/localsave.conf \ +-report.d/strata-test.conf \ +-report.d/RHEL.conf ++report.d/strata-test.conf + + dist_man_MANS = report.conf.5 +--- a/etc/report.d/bugs.sabayon.org.conf ++++ b/etc/report.d/bugs.sabayon.org.conf +@@ -0,0 +1,7 @@ ++[bugs.sabayon.org] ++# plugin ++plugin=bugzilla ++ ++# rhbz url ++bugzilla_host=bugs.sabayon.org ++ +--- a/python/report/plugins/bugzilla/__init__.py ++++ b/python/report/plugins/bugzilla/__init__.py +@@ -1,5 +1,5 @@ + """ +- A Report plugin to send a report to bugzilla.redhat.com. ++ A Report plugin to send a report to bugs.sabayon.org. + Copyright (C) 2009 Red Hat, Inc + + Author(s): Gavin Romig-Koch +@@ -54,7 +54,7 @@ def displayURL(optionsDict): + def bugURL(optionsDict): + if 'bugURL' in optionsDict: + return optionsDict["bugURL"] +- host = "bugzilla.redhat.com" ++ host = "bugs.sabayon.org" + if 'bugzilla_host' in optionsDict: + host = optionsDict["bugzilla_host"] + return "https://" + host + "/xmlrpc.cgi" +@@ -149,8 +149,8 @@ def sendToBugzilla(component, signature, + else: + version = filer.getVersion() + +- bzfiler = filer.BugzillaFiler("https://bugzilla.redhat.com/xmlrpc.cgi", +- "http://bugzilla.redhat.com", ++ bzfiler = filer.BugzillaFiler("https://bugs.sabayon.org/xmlrpc.cgi", ++ "http://bugs.sabayon.org", + version, product) + + if not bzfiler or not bzfiler.supportsFiling() or not bzfiler.bugUrl: -- cgit v1.2.3