diff options
| author | François Andriot <[email protected]> | 2021-01-30 23:53:31 +0100 |
|---|---|---|
| committer | François Andriot <[email protected]> | 2021-01-30 23:53:31 +0100 |
| commit | 24c06ffc5bdff8a2d02c893c0d03f5173eab5c8c (patch) | |
| tree | c9490db2a17d1bcf985c898caf6d10c58c9d81e2 /redhat/applications/qalculate-tde | |
| parent | 91820d56fc19f373e2ad40d9d21852eddcb81da7 (diff) | |
| download | tde-packaging-24c06ffc5bdff8a2d02c893c0d03f5173eab5c8c.tar.gz tde-packaging-24c06ffc5bdff8a2d02c893c0d03f5173eab5c8c.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.spec | 9 |
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 4d6d4a2e6..21c581105 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 |