diff options
| author | François Andriot <albator78@libertysurf.fr> | 2023-11-10 18:06:02 +0100 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2023-11-10 18:06:15 +0100 |
| commit | 904d1e092483ee658ea62dcfab44d9962843f227 (patch) | |
| tree | 9a45ae4bbb4fb5e5bf70a8bb55184c80752c789d /redhat/dependencies | |
| parent | 3da26236a5f931eae506b2aa7109549f041c8e22 (diff) | |
| download | tde-packaging-904d1e092483ee658ea62dcfab44d9962843f227.tar.gz tde-packaging-904d1e092483ee658ea62dcfab44d9962843f227.zip | |
RPM: add support for Fedora 39
Signed-off-by: François Andriot <albator78@libertysurf.fr>
Diffstat (limited to 'redhat/dependencies')
| -rw-r--r-- | redhat/dependencies/pytqt/pytqt.spec | 2 | ||||
| -rw-r--r-- | redhat/dependencies/sip4-tqt/sip4-tqt.spec | 2 | ||||
| -rw-r--r-- | redhat/dependencies/tqt3/tqt3.spec | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/redhat/dependencies/pytqt/pytqt.spec b/redhat/dependencies/pytqt/pytqt.spec index b96c52efb..6183f40df 100644 --- a/redhat/dependencies/pytqt/pytqt.spec +++ b/redhat/dependencies/pytqt/pytqt.spec @@ -73,7 +73,9 @@ BuildRequires: libtqscintilla-devel >= %{?epoch:%{epoch}:}1.7.1 BuildRequires: gcc-c++ # PYTHON support +%if "%{python}" == "" %global python python3 +%endif %global __python %__python3 %global python_sitearch %{python3_sitearch} %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} diff --git a/redhat/dependencies/sip4-tqt/sip4-tqt.spec b/redhat/dependencies/sip4-tqt/sip4-tqt.spec index ed63e325e..7dae151e8 100644 --- a/redhat/dependencies/sip4-tqt/sip4-tqt.spec +++ b/redhat/dependencies/sip4-tqt/sip4-tqt.spec @@ -77,7 +77,9 @@ BuildRequires: bison BuildRequires: flex # PYTHON support +%if "%{python}" == "" %global python python3 +%endif %global __python %__python3 %global python_sitearch %{python3_sitearch} %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} diff --git a/redhat/dependencies/tqt3/tqt3.spec b/redhat/dependencies/tqt3/tqt3.spec index c73abd7fd..5feba7a23 100644 --- a/redhat/dependencies/tqt3/tqt3.spec +++ b/redhat/dependencies/tqt3/tqt3.spec @@ -328,7 +328,6 @@ Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig Requires: coreutils Requires: fontconfig >= 2.0 -Requires: /etc/ld.so.conf.d %description -n %{libtqt3}-mt This is the Trolltech TQt library, version 3. It's necessary for @@ -1291,11 +1290,12 @@ echo "sle_version = %{?sle_version}" %endif # fix variables in 'qmake.conf' +distrib_cflags="$(rpm -E %optflags|sed -e "s/_FORTIFY_SOURCE=3/_FORTIFY_SOURCE=2/")" %__sed -i mkspecs/*/qmake.conf \ -e "s|^QMAKE_INCDIR_TQT.*|QMAKE_INCDIR_TQT = %{_includedir}/tqt3|" \ -e "s|\$(QTDIR)|/usr|g" \ -e "s|-lqt|-ltqt|g" \ - -e "s|^QMAKE_CFLAGS =.*|QMAKE_CFLAGS = %{?optflags} -pipe -fvisibility=hidden -fvisibility-inlines-hidden|" \ + -e "s|^QMAKE_CFLAGS =.*|QMAKE_CFLAGS = ${distrib_cflags} -pipe -fvisibility=hidden -fvisibility-inlines-hidden|" \ -e "s|^QMAKE_INCDIR =.*|QMAKE_INCDIR = %{_includedir}|" \ -e "s|^QMAKE_LIBDIR =.*|QMAKE_LIBDIR = %{_libdir}|" \ -e "s|^QMAKE_RPATH = .*|QMAKE_RPATH =|" \ |