RPM: update spec files for TDE 14.0.7

1 files changed, 69 insertions, 52 deletions

diff --git a/redhat/main/tdeedu/tdeedu-14.0.0.spec b/redhat/main/tdeedu/tdeedu.spec
index af7343097..aaf41572f 100644
--- a/redhat/main/tdeedu/tdeedu-14.0.0.spec
+++ b/redhat/main/tdeedu/tdeedu.spec
@@ -22,7 +22,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg tdeedu
 %define tde_prefix /opt/trinity
@@ -63,7 +63,7 @@ Source1:		%{name}-rpmlintrc
 
 BuildRequires: trinity-tdelibs-devel >= %{tde_version}
 
-BuildRequires: autoconf automake libtool m4
+BuildRequires:	cmake >= 2.8
 BuildRequires: desktop-file-utils
 
 # SUSE desktop files utility
@@ -80,8 +80,14 @@ BuildRequires:	gcc-c++
 BuildRequires:	fdupes
 
 # PYTHON support
-BuildRequires:	python-devel
-BuildRequires:	python
+%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30 || 0%{?suse_version} >= 1500
+%define python python3
+%define __python %__python2
+%else
+%define python python
+%endif
+BuildRequires:	%{python}
+BuildRequires:	%{python}-devel
 
 # BOOST support
 BuildRequires:	boost-devel
@@ -89,18 +95,14 @@ BuildRequires:	boost-devel
 # OCAML support
 %if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
 BuildRequires: ocaml(compiler)
+#BuildRequires: ocaml-facile-devel
 %else
 BuildRequires: ocaml
+#BuildRequires: ocaml-facile-devel
 %endif
 
 # KIG python scripting support
-%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%if 0%{?suse_version} == 1330 || 0%{?suse_version} >= 1500 || 0%{?fedora} >= 29
-%define with_kig 0
-%else
 %define with_kig 1
-%endif
-%endif
 
 Obsoletes:		trinity-kdeedu < %{version}-%{release}
 Provides:		trinity-kdeedu = %{version}-%{release}
@@ -212,6 +214,7 @@ This package is part of Trinity, as a component of the TDE education module.
 %{tde_datadir}/icons/hicolor/*/apps/blinken.png
 %{tde_datadir}/icons/hicolor/scalable/apps/blinken.svgz
 %{tde_tdedocdir}/HTML/en/blinken/
+%{tde_mandir}/man1/blinken*
 
 ##########
 
@@ -248,6 +251,7 @@ This package is part of Trinity, as a component of the TDE education module.
 %{tde_datadir}/icons/hicolor/*/apps/kalzium.png
 %{tde_datadir}/icons/hicolor/scalable/apps/kalzium.svgz
 %{tde_tdedocdir}/HTML/en/kalzium/
+%{tde_mandir}/man1/kalzium*
 
 ##########
 
@@ -300,6 +304,7 @@ This package is part of Trinity, as a component of the TDE education module.
 %{tde_datadir}/icons/hicolor/*/apps/kanagram.png
 %{tde_datadir}/icons/hicolor/scalable/apps/kanagram.svgz
 %{tde_tdedocdir}/HTML/en/kanagram/
+%{tde_mandir}/man1/kanagram*
 
 ##########
 
@@ -325,6 +330,7 @@ This package is part of Trinity, as a component of the TDE education module.
 %{tde_datadir}/icons/hicolor/scalable/apps/kbruch.svgz
 %{tde_datadir}/icons/crystalsvg/*/actions/kbruch_*.png
 %{tde_tdedocdir}/HTML/en/kbruch/
+%{tde_mandir}/man1/kbruch*
 
 ##########
 
@@ -343,6 +349,7 @@ This package is part of Trinity, as a component of the TDE education module.
 %defattr(-,root,root,-)
 %{tde_bindir}/keduca
 %{tde_bindir}/keducabuilder
+%{tde_bindir}/keduca-shrinker
 %{tde_tdelibdir}/libkeducapart.la
 %{tde_tdelibdir}/libkeducapart.so
 %{tde_tdeappdir}/keduca.desktop
@@ -354,6 +361,7 @@ This package is part of Trinity, as a component of the TDE education module.
 %{tde_datadir}/mimelnk/application/x-edugallery.desktop
 %{tde_datadir}/services/keduca_part.desktop
 %{tde_tdedocdir}/HTML/en/keduca/
+%{tde_mandir}/man1/keduca*
 
 ##########
 
@@ -374,12 +382,14 @@ This package is part of Trinity, as a component of the TDE education module.
 %files -n trinity-kgeography
 %defattr(-,root,root,-)
 %{tde_bindir}/kgeography
+%{tde_bindir}/kgeography_gen_map.pl
 %{tde_tdeappdir}/kgeography.desktop
 %{tde_datadir}/config.kcfg/kgeography.kcfg
 %{tde_datadir}/icons/crystalsvg/*/apps/kgeography.png
 %{tde_datadir}/icons/crystalsvg/scalable/apps/kgeography.svgz
 %{tde_datadir}/icons/hicolor/*/apps/kgeography.png
 %{tde_tdedocdir}/HTML/en/kgeography
+%{tde_mandir}/man1/kgeography*
 
 ##########
 
@@ -430,6 +440,7 @@ This package is part of Trinity, as a component of the TDE education module.
 %{tde_datadir}/icons/hicolor/*/apps/khangman.png
 %{tde_datadir}/icons/hicolor/scalable/apps/khangman.svgz
 %{tde_tdedocdir}/HTML/en/khangman/
+%{tde_mandir}/man1/khangman*
 
 ##########
 
@@ -490,6 +501,7 @@ This package is part of Trinity, as a component of the TDE education module.
 %{tde_tdedocdir}/HTML/en/kig/
 %{tde_confdir}/magic/cabri.magic.mgc
 %{tde_confdir}/magic/drgeo.magic.mgc
+%{tde_mandir}/man1/kig*
 
 ##########
 
@@ -516,6 +528,7 @@ This package is part of Trinity, as a component of the TDE education module.
 %{tde_tdedocdir}/HTML/en/kiten/
 %{tde_datadir}/icons/hicolor/*/apps/kiten.png
 %{tde_datadir}/icons/hicolor/scalable/apps/kiten.svgz
+%{tde_mandir}/man1/kiten*
 
 ##########
 
@@ -550,6 +563,7 @@ This package is part of Trinity, as a component of the TDE education module.
 %{tde_datadir}/icons/hicolor/*/apps/klatin.png
 %{tde_datadir}/icons/hicolor/scalable/apps/klatin.svgz
 %{tde_tdedocdir}/HTML/en/klatin/
+%{tde_mandir}/man1/klatin*
 
 ##########
 
@@ -579,6 +593,7 @@ This package is part of Trinity, as a component of the TDE education module.
 %{tde_datadir}/icons/hicolor/*/apps/klettres.png
 %{tde_datadir}/icons/hicolor/scalable/apps/klettres.svgz
 %{tde_tdedocdir}/HTML/en/klettres/
+%{tde_mandir}/man1/klettres*
 
 ##########
 
@@ -635,6 +650,7 @@ This package is part of Trinity, as a component of the TDE education module.
 %{tde_datadir}/mimelnk/application/x-kmplot.desktop
 %{tde_datadir}/services/kmplot_part.desktop
 %{tde_tdedocdir}/HTML/en/kmplot/
+%{tde_mandir}/man1/kmplot*
 
 ##########
 
@@ -661,6 +677,7 @@ This package is part of Trinity, as a component of the TDE education module.
 %{tde_datadir}/icons/hicolor/*/apps/kpercentage.png
 %{tde_datadir}/icons/hicolor/scalable/apps/kpercentage.svgz
 %{tde_tdedocdir}/HTML/en/kpercentage/
+%{tde_mandir}/man1/kpercentage*
 
 ##########
 
@@ -695,6 +712,7 @@ This package is part of Trinity, as a component of the TDE education module.
 %{tde_datadir}/icons/hicolor/*/apps/kstars.png
 %{tde_datadir}/icons/hicolor/scalable/apps/kstars.svgz
 %{tde_tdedocdir}/HTML/en/kstars/
+%{tde_mandir}/man1/kstars*
 
 ##########
 
@@ -743,6 +761,7 @@ This package is part of Trinity, as a component of the TDE education module.
 %{tde_datadir}/icons/hicolor/*/apps/ktouch.png
 %{tde_datadir}/icons/hicolor/scalable/apps/ktouch.svgz
 %{tde_tdedocdir}/HTML/en/ktouch/
+%{tde_mandir}/man1/ktouch*
 
 ##########
 
@@ -780,6 +799,7 @@ This package is part of Trinity, as a component of the TDE education module.
 %{tde_datadir}/config.kcfg/kturtle.kcfg
 %{tde_datadir}/icons/hicolor/*/apps/kturtle.png
 %{tde_tdedocdir}/HTML/en/kturtle/
+%{tde_mandir}/man1/kturtle*
 
 ##########
 
@@ -809,6 +829,7 @@ This package is part of Trinity, as a component of the TDE education module.
 %{tde_datadir}/icons/hicolor/*/apps/kverbos.png
 %{tde_datadir}/icons/hicolor/scalable/apps/kverbos.svgz
 %{tde_tdedocdir}/HTML/en/kverbos/
+%{tde_mandir}/man1/kverbos*
 
 ##########
 
@@ -851,6 +872,8 @@ This package is part of Trinity, as a component of the TDE education module.
 %{tde_datadir}/config.kcfg/presettings.kcfg
 %{tde_datadir}/icons/hicolor/*/apps/kvoctrain.png
 %{tde_tdedocdir}/HTML/en/kvoctrain/
+%{tde_mandir}/man1/kvoctrain*
+%{tde_mandir}/man1/spotlight2kvtml*
 
 ##########
 
@@ -883,6 +906,8 @@ This package is part of Trinity, as a component of the TDE education module.
 %{tde_datadir}/icons/crystalsvg/scalable/mimetypes/kwordquiz_doc.svg
 %{tde_datadir}/mimelnk/application/x-kwordquiz.desktop
 %{tde_tdedocdir}/HTML/en/kwordquiz/
+%{tde_mandir}/man1/kwordquiz*
+%{tde_mandir}/man1/langen*
 
 ##########
 
@@ -1024,6 +1049,12 @@ This package is part of Trinity, as a component of the TDE education module.
 %{tde_bindir}/temma
 %{tde_bindir}/v4ldriver
 %{tde_bindir}/v4lphilips
+%{tde_mandir}/man1/celestrongps*
+%{tde_mandir}/man1/fliccd*
+%{tde_mandir}/man1/indi*
+%{tde_mandir}/man1/lx200*
+%{tde_mandir}/man1/temma*
+%{tde_mandir}/man1/v4l*
 
 ##########
 
@@ -1062,66 +1093,52 @@ This package contains the development files for tdeedu.
 %prep
 %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
 
-%if 0%{?fedora} >= 30
+%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8
 # Fix shebangs
 sed -i "kig/pykig/pykig.py" \
-    -e "s|env python|env python3|"
+    -e "s|env python|env %{python}|"
 %endif
 
-# RHEL5 strange FTBFS on V4L stuff
-%if 0%{?rhel} == 5
-%__sed -i "admin/acinclude.m4.in" -e "s|-ansi||"
-%endif
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__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}"
-export kde_confdir="%{tde_confdir}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
 
-# Specific path for RHEL4
-if [ -d "/usr/X11R6" ]; then
-  export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-  export CFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
 fi
 
-# Warning: GCC visibility causes FTBFS [Bug #1285]
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=ON \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility \
+  -DBIN_INSTALL_DIR="%{tde_bindir}" \
+  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+  -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
+  -DLIB_INSTALL_DIR="%{tde_libdir}" \
+  -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
+  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+  -DSYSCONF_INSTALL_DIR="%{tde_confdir}" \
+  -DXDG_MENU_INSTALL_DIR="%{_sysconfdir}/xdg/menus" \
   \
-%if 0%{?with_kig}
-   --enable-kig-python-scripting \
-%else
-   --disable-kig-python-scripting \
-%endif
-   --enable-ocamlsolver
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_OCAML_SOLVER=OFF \
+  ..
 
-%__make %{_smp_mflags} \
-  OCAMLLIB=$(ocamlc -where) \
-  FACILELIB=$(ocamlc -where)
+%__make %{?_smp_mflags} || %__make
 
 
 %install
 export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
 
 # Updates applications categories for openSUSE
 %if 0%{?suse_version}