From effbf509eea4f37a1a8660242769ed1746b67ee0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Sat, 30 Jan 2021 23:53:31 +0100 Subject: RPM: update build scripts for Fedora 33 / CentOS 8 --- redhat/applications/qalculate-tde/qalculate-tde.spec | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'redhat/applications/qalculate-tde/qalculate-tde.spec') 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 -- cgit v1.2.1