3ed93e42 | 2017-06-27 13:28:07 | François Andriot |
RPM: add build workarounds for kvirc, piklab, qalculate and tderadio |
||
M redhat/applications/kvirc/kvirc-14.0.0.spec M redhat/applications/piklab/piklab-14.0.0.spec M redhat/applications/qalculate-tde/qalculate-tde.spec M redhat/applications/tderadio/tderadio-14.0.0.spec M redhat/extras/kdissert/kdissert-14.0.0.spec |
||
diff --git a/redhat/applications/kvirc/kvirc-14.0.0.spec b/redhat/applications/kvirc/kvirc-14.0.0.spec index 6ba3059..63b7437 100644 --- a/redhat/applications/kvirc/kvirc-14.0.0.spec +++ b/redhat/applications/kvirc/kvirc-14.0.0.spec @@ -181,6 +181,10 @@ %__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 5df50a2..8a646a9 100644 --- a/redhat/applications/piklab/piklab-14.0.0.spec +++ b/redhat/applications/piklab/piklab-14.0.0.spec @@ -114,7 +114,6 @@ %__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 @@ --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 924875d..ef36cdc 100644 --- a/redhat/applications/qalculate-tde/qalculate-tde.spec +++ b/redhat/applications/qalculate-tde/qalculate-tde.spec @@ -126,6 +126,10 @@ --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 6523d51..8b1cb03 100644 --- a/redhat/applications/tderadio/tderadio-14.0.0.spec +++ b/redhat/applications/tderadio/tderadio-14.0.0.spec @@ -167,6 +167,10 @@ --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 0e9e0fe..9a2e60d 100644 --- a/redhat/extras/kdissert/kdissert-14.0.0.spec +++ b/redhat/extras/kdissert/kdissert-14.0.0.spec @@ -102,6 +102,10 @@ --kdeincludes=%{tde_tdeincludedir} ./waf +%__sed -i \ + -e "s|KDE Desktop Entry|Desktop Entry|" \ + -e "s|KDE|TDE|g" \ + "src/appdata/kdissert.desktop" %install |