diff options
| author | François Andriot <albator78@libertysurf.fr> | 2021-01-31 21:11:44 +0100 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2021-01-31 21:12:23 +0100 |
| commit | 93ff54308967154e48a8331626fd04900ccb75b8 (patch) | |
| tree | 9d414be5ec4bb9550f70600542d52453caad2e23 /redhat/dependencies | |
| parent | 24c06ffc5bdff8a2d02c893c0d03f5173eab5c8c (diff) | |
| download | tde-packaging-93ff54308967154e48a8331626fd04900ccb75b8.tar.gz tde-packaging-93ff54308967154e48a8331626fd04900ccb75b8.zip | |
RPM: more updates
Diffstat (limited to 'redhat/dependencies')
| -rw-r--r-- | redhat/dependencies/python-tqt/python-tqt.spec | 1 | ||||
| -rw-r--r-- | redhat/dependencies/tqca-tls/tqca-tls.spec | 23 | ||||
| -rw-r--r-- | redhat/dependencies/tqtinterface/tqtinterface.spec | 4 |
3 files changed, 22 insertions, 6 deletions
diff --git a/redhat/dependencies/python-tqt/python-tqt.spec b/redhat/dependencies/python-tqt/python-tqt.spec index 374081de4..2f57100bb 100644 --- a/redhat/dependencies/python-tqt/python-tqt.spec +++ b/redhat/dependencies/python-tqt/python-tqt.spec @@ -245,6 +245,7 @@ cp -rf ../pyuic3 ../pylupdate3 echo yes | %__python ../configure.py \ -c -n %{_includedir}/tqscintilla \ + -g %{_includedir}/tqt3 \ -q %{_datadir}/tqt3 \ -y tqt-mt \ -o %{_libdir} -u -j 10 \ diff --git a/redhat/dependencies/tqca-tls/tqca-tls.spec b/redhat/dependencies/tqca-tls/tqca-tls.spec index 1ece07861..639f8ef9e 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 @@ -100,15 +101,29 @@ contains the TLS plugin. %build unset QTDIR QTINC QTLIB -./configure \ - --tqtdir=%{_prefix} +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build +fi -%__make %{?_smp_mflags} +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DWITH_ALL_OPTIONS="ON" \ + \ + .. + +%__make %{?_smp_mflags} || %__make %install %__rm -rf %{?buildroot} -%__make install INSTALL_ROOT=%{?buildroot} +%__make install DESTDIR="%{?buildroot}" -C build %clean diff --git a/redhat/dependencies/tqtinterface/tqtinterface.spec b/redhat/dependencies/tqtinterface/tqtinterface.spec index e4253ac40..682250423 100644 --- a/redhat/dependencies/tqtinterface/tqtinterface.spec +++ b/redhat/dependencies/tqtinterface/tqtinterface.spec @@ -234,8 +234,8 @@ fi %cmake \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ - -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \ -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DWITH_GCC_VISIBILITY=OFF \ |