diff options
| author | François Andriot <albator78@libertysurf.fr> | 2019-07-30 19:54:39 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2019-07-30 19:54:39 +0200 |
| commit | f6042194a160d58772626035fa59604da08e06e0 (patch) | |
| tree | 598895a543568639cb582d0013891519357cdf11 /redhat/dependencies | |
| parent | 87f8fcd5f192267ad890dd4e923be245bb834658 (diff) | |
| download | tde-packaging-f6042194a160d58772626035fa59604da08e06e0.tar.gz tde-packaging-f6042194a160d58772626035fa59604da08e06e0.zip | |
RPM: update packages to build on Fedora 30, Mageia 7
Diffstat (limited to 'redhat/dependencies')
| -rw-r--r-- | redhat/dependencies/tqt3/tqt3-14.0.0.spec | 8 | ||||
| -rw-r--r-- | redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec | 4 |
2 files changed, 11 insertions, 1 deletions
diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec index 2a9d0c917..b7fc869e6 100644 --- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec +++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec @@ -274,7 +274,11 @@ BuildRequires: sqlite3-devel # POSTGRESQL support BuildRequires: postgresql +%if 0%{?fedora} >= 30 +BuildRequires: postgresql-server-devel +%else BuildRequires: postgresql-devel +%endif # Firebird support %if 0%{?mdkversion} || 0%{?mgaversion} @@ -1407,7 +1411,9 @@ echo yes | ./configure \ -v # proceed -%__make %{?_smp_mflags} sub-src sub-plugins sub-tools +%__make %{?_smp_mflags} sub-src || %__make sub-src +%__make %{?_smp_mflags} sub-plugins || %__make sub-plugins +%__make %{?_smp_mflags} sub-tools # build tqtconv2ui %__make -C tools/designer/tools/tqtconv2ui diff --git a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec index 09c1cab1d..de6ad4622 100644 --- a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec +++ b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec @@ -78,8 +78,12 @@ BuildRequires: pkgconfig # PTHREAD support %if 0%{?rhel} >= 5 || 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?mgaversion} >= 7 +BuildRequires: %{_lib}npth-devel +%else BuildRequires: pth-devel %endif +%endif %if 0%{?fedora} && 0%{?fedora} <= 26 BuildRequires: pth-devel %endif |