diff options
author | François Andriot <albator78@libertysurf.fr> | 2021-01-30 23:53:31 +0100 |
---|---|---|
committer | François Andriot <albator78@libertysurf.fr> | 2021-01-30 23:57:34 +0100 |
commit | effbf509eea4f37a1a8660242769ed1746b67ee0 (patch) | |
tree | 47f019bebdc7f0549e43e57ac57856b2d505468b /redhat/main/tdeedu | |
parent | 6581dc50b83f203d65eac61c00a159ab2a6ddb5d (diff) | |
download | tde-packaging-effbf509eea4f37a1a8660242769ed1746b67ee0.tar.gz tde-packaging-effbf509eea4f37a1a8660242769ed1746b67ee0.zip |
RPM: update build scripts for Fedora 33 / CentOS 8
Diffstat (limited to 'redhat/main/tdeedu')
-rw-r--r-- | redhat/main/tdeedu/tdeedu.spec | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/redhat/main/tdeedu/tdeedu.spec b/redhat/main/tdeedu/tdeedu.spec index 088a16c99..fa96a96ab 100644 --- a/redhat/main/tdeedu/tdeedu.spec +++ b/redhat/main/tdeedu/tdeedu.spec @@ -131,7 +131,14 @@ BuildRequires: ocaml %endif # KIG python scripting support +%if 0%{?rhel} != 5 %define with_kig 1 +%endif + +# V4L support +%if 0%{?rhel} != 5 +%define with_v4l 1 +%endif Obsoletes: trinity-kdeedu < %{version}-%{release} Provides: trinity-kdeedu = %{version}-%{release} @@ -149,7 +156,9 @@ Requires: trinity-keduca = %{version}-%{release} Requires: trinity-kgeography = %{version}-%{release} Requires: trinity-kgeography-data = %{version}-%{release} Requires: trinity-khangman = %{version}-%{release} +%if 0%{?with_kig} Requires: trinity-kig = %{version}-%{release} +%endif Requires: trinity-kiten = %{version}-%{release} Requires: trinity-klatin = %{version}-%{release} Requires: trinity-klettres = %{version}-%{release} @@ -177,7 +186,9 @@ Educational/Edutainment applications, including: * keduca: Tests and Exams * kgeography: Geography Trainer * khangman: Hangman Game +%if 0%{?with_kig} * kig: Interactive Geometry +%endif * kiten: Japanese Reference/Study Tool * klatin: Latin Reviser * klettres: French alphabet tutor @@ -473,6 +484,7 @@ This package is part of Trinity, as a component of the TDE education module. ########## +%if 0%{?with_kig} %package -n trinity-kig Summary: Interactive geometry program for TDE Group: System/GUI/Other @@ -531,6 +543,7 @@ This package is part of Trinity, as a component of the TDE education module. %config(noreplace) %{tde_confdir}/magic/cabri.magic.mgc %config(noreplace) %{tde_confdir}/magic/drgeo.magic.mgc %{tde_mandir}/man1/kig* +%endif ########## @@ -1072,12 +1085,14 @@ This package is part of Trinity, as a component of the TDE education module. %{tde_bindir}/lx200classic %{tde_bindir}/lx200generic %{tde_bindir}/lx200gps -%{tde_bindir}/meade_lpi %{tde_bindir}/sbigccd %{tde_bindir}/skycommander %{tde_bindir}/temma +%if 0%{?with_v4l} +%{tde_bindir}/meade_lpi %{tde_bindir}/v4ldriver %{tde_bindir}/v4lphilips +%endif %{tde_mandir}/man1/celestrongps* %{tde_mandir}/man1/fliccd* %{tde_mandir}/man1/indi* @@ -1158,7 +1173,10 @@ fi -DXDG_MENU_INSTALL_DIR="%{_sysconfdir}/xdg/menus" \ \ -DWITH_ALL_OPTIONS=ON \ + %{?!with_kig:-DBUILD_KIG=OFF} \ -DWITH_OCAML_SOLVER=OFF \ + %{?!with_kig:-DWITH_KIG_PYTHON_SCRIPTING=OFF} \ + %{?!with_v4l:-DWITH_V4L=OFF} \ .. %__make %{?_smp_mflags} || %__make |