RPM: various updates for TDE 14.0.12

Signed-off-by: François Andriot <[email protected]>

16 files changed, 56 insertions, 27 deletions

diff --git a/redhat/applications/koffice/koffice.spec b/redhat/applications/koffice/koffice.spec
index cd7f34018..a1c312f4e 100644
--- a/redhat/applications/koffice/koffice.spec
+++ b/redhat/applications/koffice/koffice.spec
@@ -243,7 +243,11 @@ BuildRequires:	wv2-devel
 
 # MESA support
 %if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} >= 8
+BuildRequires:	%{_lib}mesagl-devel
+%else
 BuildRequires:	%{_lib}mesagl1-devel
+%endif
 BuildRequires:	%{_lib}mesaglu1-devel
 %endif
 %if 0%{?fedora} || 0%{?rhel}
diff --git a/redhat/applications/kxmleditor/kxmleditor.spec b/redhat/applications/kxmleditor/kxmleditor.spec
index 5c80303b8..1112b49d5 100644
--- a/redhat/applications/kxmleditor/kxmleditor.spec
+++ b/redhat/applications/kxmleditor/kxmleditor.spec
@@ -131,10 +131,6 @@ export PATH="%{tde_bindir}:${PATH}"
 
 %find_lang %{tde_pkg}
 
-# Move desktop icon to correct location
-%__mkdir_p "%{?buildroot}%{tde_tdeappdir}"
-%__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{?buildroot}%{tde_tdeappdir}"
-
 # Updates applications categories for openSUSE
 %if 0%{?suse_version}
 %suse_update_desktop_file -G "XML Editor" -r "%{tde_pkg}" Utility Editor
diff --git a/redhat/common/cmake/cmake.spec b/redhat/common/cmake/cmake.spec
index fc4e0ca42..9a730145f 100644
--- a/redhat/common/cmake/cmake.spec
+++ b/redhat/common/cmake/cmake.spec
@@ -21,6 +21,12 @@
 %endif
 %define tde_pkg cmake
 
+%if 0%{?rhel} == 7
+%define cmake_datadir %{_datadir}/cmake3
+%else
+%define cmake_datadir %{_datadir}/cmake
+%endif
+
 
 Name:		trinity-%{tde_pkg}
 Version:	%{tde_version}
@@ -93,20 +99,20 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%{_datadir}/cmake/Modules/FindTDE.cmake
-%{_datadir}/cmake/Modules/FindTQt.cmake
-%{_datadir}/cmake/Modules/FindTQtQUI.cmake
-%{_datadir}/cmake/Modules/TDEL10n.cmake
-%{_datadir}/cmake/Modules/TDEMacros.cmake
-%{_datadir}/cmake/Modules/TDESetupPaths.cmake
-%{_datadir}/cmake/Modules/tde_automoc.cmake
-%{_datadir}/cmake/Modules/tde_l10n_merge.pl
-%{_datadir}/cmake/Modules/tde_uic.cmake
-%{_datadir}/cmake/Templates/tde_dummy_cpp.cmake
-%{_datadir}/cmake/Templates/tde_export_library.cmake
-%{_datadir}/cmake/Templates/tde_libtool_file.cmake
-%{_datadir}/cmake/Templates/tde_tdeinit_executable.cmake
-%{_datadir}/cmake/Templates/tde_tdeinit_module.cmake
+%{cmake_datadir}/Modules/FindTDE.cmake
+%{cmake_datadir}/Modules/FindTQt.cmake
+%{cmake_datadir}/Modules/FindTQtQUI.cmake
+%{cmake_datadir}/Modules/TDEL10n.cmake
+%{cmake_datadir}/Modules/TDEMacros.cmake
+%{cmake_datadir}/Modules/TDESetupPaths.cmake
+%{cmake_datadir}/Modules/tde_automoc.cmake
+%{cmake_datadir}/Modules/tde_l10n_merge.pl
+%{cmake_datadir}/Modules/tde_uic.cmake
+%{cmake_datadir}/Templates/tde_dummy_cpp.cmake
+%{cmake_datadir}/Templates/tde_export_library.cmake
+%{cmake_datadir}/Templates/tde_libtool_file.cmake
+%{cmake_datadir}/Templates/tde_tdeinit_executable.cmake
+%{cmake_datadir}/Templates/tde_tdeinit_module.cmake
 
 
 %changelog
diff --git a/redhat/dependencies/polkit-tqt/polkit-tqt.spec b/redhat/dependencies/polkit-tqt/polkit-tqt.spec
index bc5d32ba7..c1c4fa1a3 100644
--- a/redhat/dependencies/polkit-tqt/polkit-tqt.spec
+++ b/redhat/dependencies/polkit-tqt/polkit-tqt.spec
@@ -49,6 +49,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
+BuildRequires:	libtqt4-devel
 BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	trinity-dbus-1-tqt-devel
 BuildRequires:	trinity-filesystem >= %{tde_version}
diff --git a/redhat/dependencies/tqscintilla/tqscintilla.spec b/redhat/dependencies/tqscintilla/tqscintilla.spec
index 81f73c635..d46caa44b 100644
--- a/redhat/dependencies/tqscintilla/tqscintilla.spec
+++ b/redhat/dependencies/tqscintilla/tqscintilla.spec
@@ -137,11 +137,6 @@ This package contains the documentation for tqscintilla.
 
 %files -n %{libtqscintilla}-doc
 %defattr(-,root,root,-)
-%{_docdir}/libtqscintilla7/
-%exclude %{_docdir}/libtqscintilla7/ChangeLog
-%exclude %{_docdir}/libtqscintilla7/LICENSE
-%exclude %{_docdir}/libtqscintilla7/NEWS
-%exclude %{_docdir}/libtqscintilla7/README
 /usr/share/doc/libtqscintilla/
 
 ##########
@@ -184,6 +179,15 @@ fi
 %__rm -rf %{?buildroot}
 %__make install -C build DESTDIR=%{?buildroot}
 
+# Fix doc location
+if [ -d %{?buildroot}%{_docdir}/lib64tqscintilla7 ]; then
+  %__mv -f %{?buildroot}%{_docdir}/lib64tqscintilla7 %{?buildroot}%{_docdir}/libtqscintilla7
+fi
+if [ -d %{?buildroot}%{_docdir}/libtqscintilla7-1.7.1 ]; then
+  %__mv -f %{?buildroot}%{_docdir}/libtqscintilla7-1.7.1 %{?buildroot}%{_docdir}/libtqscintilla7
+fi
+
+
 # Fix headers location
 %__mv "%{?buildroot}%{_includedir}/tqt3" "%{?buildroot}%{_includedir}/tqscintilla"
 
diff --git a/redhat/docker/el6/Dockerfile.x86_64 b/redhat/docker/el6/Dockerfile.x86_64
index 96ed1d420..5b5199e50 100644
--- a/redhat/docker/el6/Dockerfile.x86_64
+++ b/redhat/docker/el6/Dockerfile.x86_64
@@ -12,6 +12,7 @@ RUN echo "proxy=http://proxy:3128" >>"/etc/yum.conf" \
  && rpm -Uvh http://repo/repo/archives/centos/6/os/x86_64/Packages/wget-1.12-10.el6.x86_64.rpm \
  && rm -fv /etc/yum.repos.d/*.repo \
  && wget -P /etc/yum.repos.d -nv http://repo/repo/{centos6,epel6}.repo \
+ && sed -i /etc/yum.repos.d/*.repo -e "s|https://|http://|g" \
  && yum -y clean all \
  && yum -y update \
  && rpm -Uvh --nodeps https://download1.rpmfusion.org/free/el/rpmfusion-free-release-6.noarch.rpm \
diff --git a/redhat/docker/el7/packages b/redhat/docker/el7/packages
index 46c7034d9..5ba929a4c 100644
--- a/redhat/docker/el7/packages
+++ b/redhat/docker/el7/packages
@@ -10,6 +10,7 @@ bison
 bluez-libs-devel
 boost-devel
 bzip2-devel
+byacc
 ccache
 cdparanoia
 cdparanoia-devel
@@ -19,6 +20,7 @@ clamav
 clamav-devel
 clucene-core-devel
 cmake
+cmake3
 cpp
 cppunit-devel
 createrepo
@@ -174,6 +176,7 @@ pigz
 pilot-link-devel
 pkcs11-helper-devel
 pkgconfig(pygtk-2.0)
+polkit-devel
 poppler-devel
 postgresql-devel
 ppp
diff --git a/redhat/docker/el7/rpmmacros b/redhat/docker/el7/rpmmacros
index b76d30014..e0a64de43 100644
--- a/redhat/docker/el7/rpmmacros
+++ b/redhat/docker/el7/rpmmacros
@@ -1,3 +1,4 @@
 %dist .el7
 %_smp_mflags -j8
 %jobs 8
+%cmake %cmake3
diff --git a/redhat/docker/el8/Dockerfile.x86_64 b/redhat/docker/el8/Dockerfile.x86_64
index 697a1decd..1306a7b30 100644
--- a/redhat/docker/el8/Dockerfile.x86_64
+++ b/redhat/docker/el8/Dockerfile.x86_64
@@ -1,4 +1,4 @@
-FROM centos:8
+FROM rockylinux:8
 
 ARG TDE_VERSION=14.0.11
 ARG ARCH=x86_64
diff --git a/redhat/docker/f35/packages b/redhat/docker/f35/packages
index f541aa930..f6d605f1a 100644
--- a/redhat/docker/f35/packages
+++ b/redhat/docker/f35/packages
@@ -115,6 +115,7 @@ libofx-devel
 libogg-devel
 libotr-devel
 libpaper-devel
+libpqxx-devel
 libqalculate-devel
 libraw1394-devel
 librsvg2
@@ -187,6 +188,7 @@ perl(XML::Parser)
 pilot-link-devel
 pkcs11-helper-devel
 pkgconfig(pygtk-2.0)
+polkit-devel
 poppler-devel
 postgresql
 postgresql-devel
diff --git a/redhat/docker/mga8/packages.i686 b/redhat/docker/mga8/packages.i686
index af6c6feb7..da94c63f9 100644
--- a/redhat/docker/mga8/packages.i686
+++ b/redhat/docker/mga8/packages.i686
@@ -213,6 +213,7 @@ pinentry-gtk2
 pkgconfig(audiofile)
 pkgconfig(libpng16)
 polkit-agent-none
+polkit-devel
 postgresql13
 postgresql13-devel
 ppp
diff --git a/redhat/docker/mga8/packages.x86_64 b/redhat/docker/mga8/packages.x86_64
index ad8802b2c..442497141 100644
--- a/redhat/docker/mga8/packages.x86_64
+++ b/redhat/docker/mga8/packages.x86_64
@@ -216,6 +216,7 @@ pinentry-gtk2
 pkgconfig(audiofile)
 pkgconfig(libpng16)
 polkit-agent-none
+polkit-devel
 postgresql13
 postgresql13-devel
 ppp
diff --git a/redhat/docker/oss153/packages b/redhat/docker/oss153/packages
index 78c263029..fccdfb384 100644
--- a/redhat/docker/oss153/packages
+++ b/redhat/docker/oss153/packages
@@ -164,7 +164,9 @@ perl-PAR-Packer
 perl-pcsc
 pkcs11-helper-devel
 pkgconfig(pygtk-2.0)
+polkit-devel
 postgresql10
+postgresql10-devel
 python-devel
 python3-devel
 python3-sip-devel
diff --git a/redhat/docker/osstw/Dockerfile.x86_64 b/redhat/docker/osstw/Dockerfile.x86_64
index 574d18973..58222751b 100644
--- a/redhat/docker/osstw/Dockerfile.x86_64
+++ b/redhat/docker/osstw/Dockerfile.x86_64
@@ -28,3 +28,7 @@ RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
 # Add GeoIP
 RUN rpmbuild --rebuild https://ftp.lysator.liu.se/pub/opensuse/source/distribution/leap/15.3/repo/oss/src/GeoIP-1.6.12-6.3.1.src.rpm \
  && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/*GeoIP*.rpm
+
+# Add Jasper
+RUN sudo rpm -e libjasper-devel libjasper6 \
+ && sudo rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/distribution/leap/15.3/repo/oss/x86_64/{jasper,libjasper-devel,libjasper4}-2.0.14-3.19.1.x86_64.rpm
diff --git a/redhat/docker/osstw/packages b/redhat/docker/osstw/packages
index 8a8f664f1..fc55cae1c 100644
--- a/redhat/docker/osstw/packages
+++ b/redhat/docker/osstw/packages
@@ -9,7 +9,6 @@ bison
 bluez-devel
 boost-devel
 brp-check-suse
-brp-extract-appdata
 ccache
 cdparanoia
 cdparanoia-devel
@@ -93,6 +92,7 @@ libical-devel
 libidn-devel
 libiw-devel
 libjack-devel
+libjasper6
 libjasper-devel
 liblcms2-devel
 liblo-devel
@@ -121,7 +121,6 @@ librsvg-devel
 libsamplerate-devel
 libSDL-devel
 libsensors4-devel
-libsmbclient-devel
 libsndfile-devel
 libtag-devel
 libtheora-devel
@@ -129,7 +128,6 @@ libtiff-devel
 libtirpc-devel
 libtool
 libtwolame-devel
-libudev-devel
 libudisks2-0-devel
 libv4l-devel
 libvisual-devel
@@ -197,6 +195,7 @@ swig
 sword-devel
 texlive-adjustbox
 texlive-etoc
+texlive-float
 texlive-hanging
 texlive-metafont-bin
 texlive-multirow
diff --git a/redhat/extras/trinity-filesystem/trinity-filesystem.spec b/redhat/extras/trinity-filesystem/trinity-filesystem.spec
index 462d17b0d..5c985180c 100644
--- a/redhat/extras/trinity-filesystem/trinity-filesystem.spec
+++ b/redhat/extras/trinity-filesystem/trinity-filesystem.spec
@@ -62,6 +62,8 @@ This package installs the Trinity directory structure.
 %defattr(-,root,root,-)
 %dir %{tde_prefix}
 
+%dir %{_datadir}/apps
+
 %dir %{tde_bindir}
 
 %dir %{tde_datadir}
@@ -137,6 +139,8 @@ This package installs the Trinity directory structure.
 %build
 
 %install
+%__install -d -m 755 %{?buildroot}%{_datadir}/apps
+
 %__install -d -m 755 %{?buildroot}%{tde_prefix}
 
 %__install -d -m 755 %{?buildroot}%{tde_bindir}