diff --git a/0003-qt-5.14.patch b/0003-qt-5.14.patch index acd1436..915e7f1 100644 --- a/0003-qt-5.14.patch +++ b/0003-qt-5.14.patch @@ -23,19 +23,19 @@ index 9c9751488..7ca9690dc 100644 + +FIND_PACKAGE(Qt5Core) + -+IF(Qt5Core_VERSION_STRING VERSION_GREATER 5.14) ++IF(Qt5Core_VERSION_STRING VERSION_GREATER_EQUAL 5.14) + # New (>= 5.14) + FIND_PROGRAM(PYSIDE2UICBINARY NAMES uic-qt5 uic) + set(UICOPTIONS "--generator=python") + FIND_PROGRAM(PYSIDE2RCCBINARY NAMES rcc-qt5 rcc) + set(RCCOPTIONS "--generator=python" "--compress-algo=zlib" "--compress=1") -+ELSE(Qt5Core_VERSION_STRING VERSION_GREATER 5.14) ++ELSE(Qt5Core_VERSION_STRING VERSION_LESS 5.14) + # Legacy (< 5.14) + FIND_PROGRAM(PYSIDE2UICBINARY NAMES python2-pyside2-uic pyside2-uic pyside2-uic-${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} HINTS ${PYSIDE_BIN_DIR}) + FIND_PROGRAM(PYSIDE2RCCBINARY NAMES pyside2-rcc pyside2-rcc-${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} HINTS ${PYSIDE_BIN_DIR}) + set(UICOPTIONS "") + set(RCCOPTIONS "") -+ENDIF(Qt5Core_VERSION_STRING VERSION_GREATER 5.14) ++ENDIF(Qt5Core_VERSION_STRING VERSION_GREATER_EQUAL 5.14) MACRO(PYSIDE_WRAP_UI outfiles) FOREACH(it ${ARGN}) diff --git a/FreeCAD-test.spec b/FreeCAD-test.spec index ddb1b45..7c7746b 100644 --- a/FreeCAD-test.spec +++ b/FreeCAD-test.spec @@ -1,7 +1,7 @@ # # spec file for package FreeCAD-test # -# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed diff --git a/FreeCAD.changes b/FreeCAD.changes index f29f394..28c5040 100644 --- a/FreeCAD.changes +++ b/FreeCAD.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Jan 25 11:03:06 UTC 2020 - Hans-Peter Jansen + +- make 0003-qt-5.14.patch do what it is advertising + * fix conditional in order to locate rcc/uic properly + ------------------------------------------------------------------- Fri Jan 24 09:02:08 UTC 2020 - Adrian Schröter diff --git a/FreeCAD.spec b/FreeCAD.spec index 6b42f3b..3f540fb 100644 --- a/FreeCAD.spec +++ b/FreeCAD.spec @@ -1,7 +1,7 @@ # # spec file for package FreeCAD # -# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed