summaryrefslogtreecommitdiffstats
path: root/redhat/applications/qalculate-tde
diff options
context:
space:
mode:
authorFrançois Andriot <[email protected]>2021-01-30 23:53:31 +0100
committerFrançois Andriot <[email protected]>2021-01-30 23:57:34 +0100
commiteffbf509eea4f37a1a8660242769ed1746b67ee0 (patch)
tree47f019bebdc7f0549e43e57ac57856b2d505468b /redhat/applications/qalculate-tde
parent6581dc50b83f203d65eac61c00a159ab2a6ddb5d (diff)
downloadtde-packaging-effbf509eea4f37a1a8660242769ed1746b67ee0.tar.gz
tde-packaging-effbf509eea4f37a1a8660242769ed1746b67ee0.zip
RPM: update build scripts for Fedora 33 / CentOS 8
Diffstat (limited to 'redhat/applications/qalculate-tde')
-rw-r--r--redhat/applications/qalculate-tde/qalculate-tde.spec9
1 files changed, 1 insertions, 8 deletions
diff --git a/redhat/applications/qalculate-tde/qalculate-tde.spec b/redhat/applications/qalculate-tde/qalculate-tde.spec
index ccfd3eac8..152d4554d 100644
--- a/redhat/applications/qalculate-tde/qalculate-tde.spec
+++ b/redhat/applications/qalculate-tde/qalculate-tde.spec
@@ -68,7 +68,7 @@ BuildRequires: libtool
BuildRequires: libqalculate-devel >= 0.9.6
-%if 0%{?suse_version} == 1330 || 0%{?suse_version} >= 1500
+%if 0%{?suse_version} == 1330 || 0%{?suse_version} >= 1500 || 0%{?rhel}
BuildRequires: cln-devel
%endif
%if 0%{?pclinuxos} >= 2018
@@ -109,9 +109,6 @@ This package contains the TDE user interface of qalculate.
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-# Fix build on r14.0.x
-%__sed -i *"/Makefile.am" -e "s|\$(LIB_TQT)|-ltqt-mt|"
-
%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
@@ -139,10 +136,6 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
--enable-rpath \
--disable-gcc-hidden-visibility
-%if 0%{?mgaversion} >= 6
-%__sed -i "src/Makefile" -e "s|-Wl,--no-undefined||"
-%endif
-
%__make %{?_smp_mflags} || %__make