RPM: synchronize redhat directory with r14.1.x branch

Signed-off-by: François Andriot <albator78@libertysurf.fr>

1 files changed, 67 insertions, 36 deletions

diff --git a/redhat/libraries/libksquirrel/libksquirrel.spec b/redhat/libraries/libksquirrel/libksquirrel.spec
index f20dcbf71..8168d4711 100644
--- a/redhat/libraries/libksquirrel/libksquirrel.spec
+++ b/redhat/libraries/libksquirrel/libksquirrel.spec
@@ -26,7 +26,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
 %endif
 %define tde_pkg libksquirrel
 %define tde_prefix /opt/trinity
@@ -71,8 +71,8 @@ BuildRequires:	desktop-file-utils
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
-# AUTOTOOLS
-BuildRequires: automake autoconf libtool
+# CMAKE
+BuildRequires: cmake libtool
 %if 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	%{_lib}ltdl-devel
 %endif
@@ -92,33 +92,49 @@ BuildRequires:	gettext
 BuildRequires:	gettext-devel
 
 # OPENEXR support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}openexr-devel
+%else
 BuildRequires:	OpenEXR-devel
+%endif
 
 # TIFF support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}tiff-devel
+%else
 BuildRequires:	libtiff-devel
+%endif
 
 # GIF support
 %if 0%{?suse_version} || 0%{?fedora} >= 28 || 0%{?rhel} >= 8
-BuildRequires:	giflib-devel
+BuildRequires: giflib-devel
 %else
-BuildRequires:	libungif-devel
+%if 0%{?mdkver}
+BuildRequires: %{_lib}gif-devel
+%else
+BuildRequires: libungif-devel
+%endif
 %endif
 
 # MNG support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}mng-devel
+%else
 BuildRequires: libmng-devel
+%endif
 
 # DJVU support
-%if 0%{?fedora} || 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
 %define with_djvu 1
 BuildRequires:	djvulibre
 %endif
 
 # XMEDCON support
-%if 0%{?fedora}
-%define with_xmedcon 1
-BuildRequires:	xmedcon
-BuildRequires:	xmedcon-devel
-%endif
+#if 0%{?fedora}
+#define with_xmedcon 1
+#BuildRequires:	xmedcon
+#BuildRequires:	xmedcon-devel
+#endif
 
 # RSVG support
 %if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
@@ -133,6 +149,9 @@ BuildRequires:	librsvg2
 BuildRequires:	librsvg2-tools
 %endif
 %if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}rsvg2-devel
+%endif
 BuildRequires:	librsvg
 %endif
 %if 0%{?suse_version}
@@ -170,7 +189,11 @@ BuildRequires: freetype-devel
 %endif
 
 # WMF support
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
+BuildRequires:	%{_lib}wmf-devel
+%else
 BuildRequires:	libwmf-devel
+%endif
 
 # XML2 support
 BuildRequires:	libxml2-devel
@@ -244,6 +267,8 @@ This package contains the runtime libraries for KSquirrel.
 %{tde_libdir}/ksquirrel-libs/libkls_mdl.so.0.8.0
 %{tde_libdir}/ksquirrel-libs/libkls_mng.so.0
 %{tde_libdir}/ksquirrel-libs/libkls_mng.so.0.8.0
+%{tde_libdir}/ksquirrel-libs/libkls_msp.so.0
+%{tde_libdir}/ksquirrel-libs/libkls_msp.so.0.8.0
 %{tde_libdir}/ksquirrel-libs/libkls_mtv.so.0
 %{tde_libdir}/ksquirrel-libs/libkls_mtv.so.0.8.0
 %{tde_libdir}/ksquirrel-libs/libkls_neo.so.0
@@ -311,7 +336,7 @@ This package contains the runtime libraries for KSquirrel.
 %{tde_libdir}/ksquirrel-libs/libkls_xwd.so.0
 %{tde_libdir}/ksquirrel-libs/libkls_xwd.so.0.8.0
 %{tde_libdir}/libksquirrel-libs-png.so.0
-%{tde_libdir}/libksquirrel-libs-png.so.0.0.0
+%{tde_libdir}/libksquirrel-libs-png.so.0.8.0
 %{tde_libdir}/libksquirrel-libs.so.0
 %{tde_libdir}/libksquirrel-libs.so.0.8.0
 %dir %{tde_datadir}/ksquirrel-libs
@@ -362,6 +387,7 @@ This package contains the development libraries for KSquirrel.
 %{tde_includedir}/ksquirrel-libs/fmt_defs.h
 %{tde_includedir}/ksquirrel-libs/fmt_types.h
 %{tde_includedir}/ksquirrel-libs/fmt_utils.h
+%{tde_includedir}/ksquirrel-libs/ksquirrel_libs_export.h
 %{tde_includedir}/ksquirrel-libs/settings.h
 %{tde_libdir}/ksquirrel-libs/libkls_avs.la
 %{tde_libdir}/ksquirrel-libs/libkls_avs.so
@@ -417,6 +443,8 @@ This package contains the development libraries for KSquirrel.
 %{tde_libdir}/ksquirrel-libs/libkls_mdl.so
 %{tde_libdir}/ksquirrel-libs/libkls_mng.la
 %{tde_libdir}/ksquirrel-libs/libkls_mng.so
+%{tde_libdir}/ksquirrel-libs/libkls_msp.la
+%{tde_libdir}/ksquirrel-libs/libkls_msp.so
 %{tde_libdir}/ksquirrel-libs/libkls_mtv.la
 %{tde_libdir}/ksquirrel-libs/libkls_mtv.so
 %{tde_libdir}/ksquirrel-libs/libkls_neo.la
@@ -543,44 +571,47 @@ if [ -r /usr/include/freetype2/ftbitmap.h ]; then
   %__sed -i "kernel/kls_ttf/ttf2pnm.cpp" -e "s|freetype/config/|freetype2/config/|"
 fi
 
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
 
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
 
-%if 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8 || 0%{?fedora} >= 34
-CXXFLAGS="${CXXFLAGS} -std=c++11"
-%endif
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
+  %__mkdir_p build
+  cd build
+fi
 
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --includedir=%{tde_includedir} \
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
+  -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
+  -DINCLUDE_INSTALL_DIR="%{tde_includedir}" \
+  -DLIB_INSTALL_DIR="%{tde_libdir}" \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility \
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_GCC_VISIBILITY=ON \
   \
-  %{?with_djvu:--enable-djvu}
+  -DBUILD_ALL=ON \
+  -DBUILD_DICOM=OFF \
+  -DBUILD_PICT=OFF \
+  ..
 
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
 
 
 %install
 export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make -C build install DESTDIR=%{buildroot}
 
 
 %clean