From ebbd6436524d660ebbc2ebc122f0c2d50cb31b3f Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Dec 22 2016 06:00:20 +0000 Subject: Add upstream bug link; update patch --- diff --git a/doxygen-rc.patch b/doxygen-rc.patch index 89a9518..eec08e9 100644 --- a/doxygen-rc.patch +++ b/doxygen-rc.patch @@ -7,7 +7,7 @@ diff -up doxygen-1.8.12/doc/translator.py.rc doxygen-1.8.12/doc/translator.py ''' - major, minor, patch = (int(e) for e in platform.python_version_tuple()) -+ major, minor, patch = (int(re.sub('[a-z].*','',e)) for e in platform.python_version_tuple()) ++ major, minor, patch = (int(re.sub('[^0-9].*','',e)) for e in platform.python_version_tuple()) if major == 2: return open(fname, mode=mode) # Python 2 without encoding else: @@ -16,7 +16,7 @@ diff -up doxygen-1.8.12/doc/translator.py.rc doxygen-1.8.12/doc/translator.py # The Python 2.6+ or 3.3+ is required. - major, minor, patch = (int(e) for e in platform.python_version_tuple()) -+ major, minor, patch = (int(re.sub('[a-z].*','',e)) for e in platform.python_version_tuple()) ++ major, minor, patch = (int(re.sub('[^0-9].*','',e)) for e in platform.python_version_tuple()) if (major == 2 and minor < 6) or (major == 3 and minor < 0): print('Python 2.6+ or Python 3.0+ are required for the script') sys.exit(1) diff --git a/doxygen.spec b/doxygen.spec index 8557c44..32ced99 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -22,6 +22,7 @@ Patch6: doxygen-774949.patch Patch7: doxygen-775245.patch # Build with python rc +# https://bugzilla.gnome.org/show_bug.cgi?id=760678 Patch10: doxygen-rc.patch BuildRequires: perl