diff options
| author | François Andriot <albator78@libertysurf.fr> | 2021-01-31 21:05:16 +0100 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2021-01-31 21:05:16 +0100 |
| commit | 05e981f0b89c0130808952da8dda4aff1d7d25a7 (patch) | |
| tree | 814c5ea1ecbdff476518542612921e373b45e72d /redhat/dependencies | |
| parent | effbf509eea4f37a1a8660242769ed1746b67ee0 (diff) | |
| download | tde-packaging-05e981f0b89c0130808952da8dda4aff1d7d25a7.tar.gz tde-packaging-05e981f0b89c0130808952da8dda4aff1d7d25a7.zip | |
RPM: more updates
Diffstat (limited to 'redhat/dependencies')
| -rw-r--r-- | redhat/dependencies/tqca-tls/tqca-tls.spec | 1 | ||||
| -rw-r--r-- | redhat/dependencies/tqt3/tqt3.spec | 6 | ||||
| -rw-r--r-- | redhat/dependencies/tqtinterface/tqtinterface.spec | 1 |
3 files changed, 4 insertions, 4 deletions
diff --git a/redhat/dependencies/tqca-tls/tqca-tls.spec b/redhat/dependencies/tqca-tls/tqca-tls.spec index 3f5d9d109..3022051ec 100644 --- a/redhat/dependencies/tqca-tls/tqca-tls.spec +++ b/redhat/dependencies/tqca-tls/tqca-tls.spec @@ -57,6 +57,7 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz BuildRequires: libtqt4-devel >= %{tde_epoch}:4.2.0 BuildRequires: libtqca-devel >= %{tde_epoch}:1.0 +BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: openssl-devel >= 0.9.8 diff --git a/redhat/dependencies/tqt3/tqt3.spec b/redhat/dependencies/tqt3/tqt3.spec index daa0c8f29..2d63b6548 100644 --- a/redhat/dependencies/tqt3/tqt3.spec +++ b/redhat/dependencies/tqt3/tqt3.spec @@ -1270,7 +1270,7 @@ echo "sle_version = %{?sle_version}" # fix variables in 'qmake.conf' %__sed -i mkspecs/*/qmake.conf \ - -e "s|^QMAKE_INCDIR_QT.*|QMAKE_INCDIR_QT = %{_includedir}/tqt3|" \ + -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|" \ @@ -1281,8 +1281,8 @@ echo "sle_version = %{?sle_version}" -e "s|^QMAKE_STRIPFLAGS_LIB +=.*|QMAKE_STRIPFLAGS_LIB +=|" \ -e "s|^QMAKE_MOC =.*|QMAKE_MOC = %{_bindir}/tqmoc|" \ -e "s|^QMAKE_UIC =.*|QMAKE_UIC = %{_bindir}/tquic|" \ - -e "s|^QMAKE_INCDIR_QT =.*|QMAKE_INCDIR_QT = %{_includedir}/tqt3|" \ - -e "s|^QMAKE_LIBDIR_QT =.*|QMAKE_LIBDIR_QT = %{_libdir}|" \ + -e "s|^QMAKE_INCDIR_TQT =.*|QMAKE_INCDIR_TQT = %{_includedir}/tqt3|" \ + -e "s|^QMAKE_LIBDIR_TQT =.*|QMAKE_LIBDIR_TQT = %{_libdir}|" \ %build diff --git a/redhat/dependencies/tqtinterface/tqtinterface.spec b/redhat/dependencies/tqtinterface/tqtinterface.spec index 5d873b86a..4a01a16a9 100644 --- a/redhat/dependencies/tqtinterface/tqtinterface.spec +++ b/redhat/dependencies/tqtinterface/tqtinterface.spec @@ -18,7 +18,6 @@ # BUILD WARNING: # Remove qt-devel and qt3-devel and any kde*-devel on your system ! # Having KDE libraries may cause FTBFS here ! -%global # TDE variables %define tde_epoch 2 |