From 3ed93e42cb7360ce5e198fe78fdaafd6cf242222 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Tue, 27 Jun 2017 20:28:07 +0200 Subject: [PATCH] RPM: add build workarounds for kvirc, piklab, qalculate and tderadio --- redhat/applications/kvirc/kvirc-14.0.0.spec | 4 ++++ redhat/applications/piklab/piklab-14.0.0.spec | 9 ++++++++- redhat/applications/qalculate-tde/qalculate-tde.spec | 4 ++++ redhat/applications/tderadio/tderadio-14.0.0.spec | 4 ++++ redhat/extras/kdissert/kdissert-14.0.0.spec | 4 ++++ 5 files changed, 24 insertions(+), 1 deletion(-) diff --git a/redhat/applications/kvirc/kvirc-14.0.0.spec b/redhat/applications/kvirc/kvirc-14.0.0.spec index 6ba3059c4..63b743791 100644 --- a/redhat/applications/kvirc/kvirc-14.0.0.spec +++ b/redhat/applications/kvirc/kvirc-14.0.0.spec @@ -181,6 +181,10 @@ export PATH="%{tde_bindir}:${PATH}" %__make symlinks -C src/kvilib/build %__make symlinks -C src/kvirc/build +%if 0%{?mgaversion} >= 6 +%__sed -i "src/modules/"*"/Makefile" -e "s|-Wl,--no-undefined||" +%endif + %__make %{?_smp_mflags} diff --git a/redhat/applications/piklab/piklab-14.0.0.spec b/redhat/applications/piklab/piklab-14.0.0.spec index 5df50a206..8a646a921 100644 --- a/redhat/applications/piklab/piklab-14.0.0.spec +++ b/redhat/applications/piklab/piklab-14.0.0.spec @@ -114,7 +114,6 @@ are supported. A command-line programmer and debugger are also available. %__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" - %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" @@ -141,8 +140,16 @@ export PATH="%{tde_bindir}:${PATH}" --disable-libreadline \ %endif +%if 0%{?mgaversion} >= 6 +touch "src/devices/pic/xml_data/Makefile.in" "src/devices/mem24/xml_data/Makefile.in" +%endif + %__make %{?_smp_mflags} +%if 0%{?mgaversion} >= 6 +touch "src/devices/pic/xml_data/Makefile.in" "src/devices/mem24/xml_data/Makefile.in" +%endif + %install export PATH="%{tde_bindir}:${PATH}" diff --git a/redhat/applications/qalculate-tde/qalculate-tde.spec b/redhat/applications/qalculate-tde/qalculate-tde.spec index 924875d9d..ef36cdc26 100644 --- a/redhat/applications/qalculate-tde/qalculate-tde.spec +++ b/redhat/applications/qalculate-tde/qalculate-tde.spec @@ -126,6 +126,10 @@ 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 diff --git a/redhat/applications/tderadio/tderadio-14.0.0.spec b/redhat/applications/tderadio/tderadio-14.0.0.spec index 6523d51f2..8b1cb0393 100644 --- a/redhat/applications/tderadio/tderadio-14.0.0.spec +++ b/redhat/applications/tderadio/tderadio-14.0.0.spec @@ -167,6 +167,10 @@ export PATH="%{tde_bindir}:${PATH}" --enable-alsa \ --enable-oss +%if 0%{?mgaversion} >= 6 +%__sed -i "tderadio3/plugins/"*"/Makefile" -e "s|-Wl,--no-undefined||" +%endif + %__make %{?_smp_mflags} diff --git a/redhat/extras/kdissert/kdissert-14.0.0.spec b/redhat/extras/kdissert/kdissert-14.0.0.spec index 0e9e0fe6f..9a2e60d12 100644 --- a/redhat/extras/kdissert/kdissert-14.0.0.spec +++ b/redhat/extras/kdissert/kdissert-14.0.0.spec @@ -102,6 +102,10 @@ export CPPFLAGS="${CPPFLAGS} -I%{tde_tdeincludedir} -I%{_includedir}/tqt -I%{_in --kdeincludes=%{tde_tdeincludedir} ./waf +%__sed -i \ + -e "s|KDE Desktop Entry|Desktop Entry|" \ + -e "s|KDE|TDE|g" \ + "src/appdata/kdissert.desktop" %install