RPM: update for building 14.1.4

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

10 files changed, 56 insertions, 48 deletions

diff --git a/redhat/applications/settings/kima/kima.spec b/redhat/applications/settings/kima/kima.spec
index 5565798d5..008defd38 100644
--- a/redhat/applications/settings/kima/kima.spec
+++ b/redhat/applications/settings/kima/kima.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.1.3
+%define tde_version 14.1.4
 %endif
 %define tde_pkg kima
 %define tde_prefix /opt/trinity
@@ -110,7 +110,7 @@ panel.
 
 ##########
 
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%if 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
diff --git a/redhat/applications/settings/kiosktool/kiosktool.spec b/redhat/applications/settings/kiosktool/kiosktool.spec
index 59c3f32ca..4b41f0ec8 100644
--- a/redhat/applications/settings/kiosktool/kiosktool.spec
+++ b/redhat/applications/settings/kiosktool/kiosktool.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.1.3
+%define tde_version 14.1.4
 %endif
 %define tde_pkg kiosktool
 %define tde_prefix /opt/trinity
@@ -104,7 +104,7 @@ groups of users.
 
 ##########
 
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%if 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
diff --git a/redhat/applications/settings/kkbswitch/kkbswitch.spec b/redhat/applications/settings/kkbswitch/kkbswitch.spec
index b16c72e5f..149714cf9 100644
--- a/redhat/applications/settings/kkbswitch/kkbswitch.spec
+++ b/redhat/applications/settings/kkbswitch/kkbswitch.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.1.3
+%define tde_version 14.1.4
 %endif
 %define tde_pkg kkbswitch
 %define tde_prefix /opt/trinity
@@ -115,7 +115,7 @@ Features include:
 
 ##########
 
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%if 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
diff --git a/redhat/applications/settings/klcddimmer/klcddimmer.spec b/redhat/applications/settings/klcddimmer/klcddimmer.spec
index 599e73ed3..3d5a65f1b 100644
--- a/redhat/applications/settings/klcddimmer/klcddimmer.spec
+++ b/redhat/applications/settings/klcddimmer/klcddimmer.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.1.3
+%define tde_version 14.1.4
 %endif
 %define tde_pkg klcddimmer
 %define tde_prefix /opt/trinity
@@ -92,7 +92,7 @@ BuildRequires:	brp-check-trinity
 
 ##########
 
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%if 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
diff --git a/redhat/applications/settings/kmyfirewall/kmyfirewall.spec b/redhat/applications/settings/kmyfirewall/kmyfirewall.spec
index 83fa6dc5d..c4ce51382 100644
--- a/redhat/applications/settings/kmyfirewall/kmyfirewall.spec
+++ b/redhat/applications/settings/kmyfirewall/kmyfirewall.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.1.3
+%define tde_version 14.1.4
 %endif
 %define tde_pkg kmyfirewall
 %define tde_prefix /opt/trinity
@@ -136,7 +136,7 @@ university etc.)
 %{tde_datadir}/apps/kmfsystray/
 %{tde_datadir}/apps/kmyfirewall/
 %{tde_datadir}/config.kcfg/kmfconfig.kcfg
-%config(noreplace) %{tde_confdir}/kmyfirewallrc
+%config(noreplace) %{_sysconfdir}/kmyfirewallrc
 %{tde_tdedocdir}/HTML/en/kmyfirewall/
 %{tde_datadir}/icons/hicolor/*/apps/kmyfirewall.png
 %{tde_datadir}/icons/locolor/*/apps/kmyfirewall.png
@@ -147,6 +147,10 @@ university etc.)
 %{tde_datadir}/services/kmf*.desktop
 %{tde_datadir}/servicetypes/kmf*.desktop
 %{tde_mandir}/man1/kmyfirewall.1*
+%lang(it) %{tde_datadir}/locale/it/LC_MESSAGES/kmfsystray.mo
+%lang(ka) %{tde_datadir}/locale/ka/LC_MESSAGES/kmfsystray.mo
+%lang(nl) %{tde_datadir}/locale/nl/LC_MESSAGES/kmfsystray.mo
+%lang(nl) %{tde_datadir}/locale/nl/LC_MESSAGES/kmyfirewall.mo
 
 ##########
 
@@ -167,7 +171,7 @@ Requires:		%{name} = %{version}-%{release}
 
 ##########
 
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%if 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
@@ -177,40 +181,48 @@ Requires:		%{name} = %{version}-%{release}
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__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}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
+  %__mkdir_p build
+  cd build
+fi
+
+%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} \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DDATA_INSTALL_DIR=%{tde_datadir}/apps \
+  -DMIME_INSTALL_DIR=%{tde_datadir}/mimelnk \
+  -DXDG_APPS_INSTALL_DIR=%{tde_tdeappdir} \
+  -DSHARE_INSTALL_PREFIX="%{tde_datadir}"\
+  -DDOC_INSTALL_DIR=%{tde_tdedocdir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
+  -DBUILD_DOC=ON \
+  -DBUILD_ALL=ON \
+  ..
 
-%__make %{?_smp_mflags}
+# Not SMP safe !
+%__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}
diff --git a/redhat/applications/settings/tde-guidance/tde-guidance.spec b/redhat/applications/settings/tde-guidance/tde-guidance.spec
index 352fb53ac..c01cd0e4e 100644
--- a/redhat/applications/settings/tde-guidance/tde-guidance.spec
+++ b/redhat/applications/settings/tde-guidance/tde-guidance.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.1.3
+%define tde_version 14.1.4
 %endif
 %define tde_pkg tde-guidance
 %define tde_prefix /opt/trinity
@@ -321,7 +321,7 @@ suspend using HAL.
 
 ##########
 
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%if 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
diff --git a/redhat/applications/settings/tde-systemsettings/tde-systemsettings.spec b/redhat/applications/settings/tde-systemsettings/tde-systemsettings.spec
index b56f76f6b..3c2c768a3 100644
--- a/redhat/applications/settings/tde-systemsettings/tde-systemsettings.spec
+++ b/redhat/applications/settings/tde-systemsettings/tde-systemsettings.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.1.3
+%define tde_version 14.1.4
 %endif
 %define tde_pkg tde-systemsettings
 %define tde_prefix /opt/trinity
@@ -95,7 +95,7 @@ Control Centre with an improved user interface.
 
 ##########
 
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%if 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
diff --git a/redhat/applications/settings/tdenetworkmanager/tdenetworkmanager.spec b/redhat/applications/settings/tdenetworkmanager/tdenetworkmanager.spec
index 6beebf289..a0ced6807 100644
--- a/redhat/applications/settings/tdenetworkmanager/tdenetworkmanager.spec
+++ b/redhat/applications/settings/tdenetworkmanager/tdenetworkmanager.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.1.3
+%define tde_version 14.1.4
 %endif
 %define tde_pkg tdenetworkmanager
 %define tde_prefix /opt/trinity
@@ -217,7 +217,7 @@ Development headers for tdenetworkmanager
 
 ##########
 
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%if 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
@@ -267,10 +267,6 @@ fi
 %suse_update_desktop_file -r %{tde_pkg} Utility TrayIcon System Applet
 %endif
 
-%if 0%{?fedora} >= 43
-%__mv %{?buildroot}/opt/trinity/etc/ %{?buildroot}/etc/
-%endif
-
 
 %clean
 %__rm -rf $RPM_BUILD_ROOT
diff --git a/redhat/applications/settings/tdesudo/tdesudo.spec b/redhat/applications/settings/tdesudo/tdesudo.spec
index 320dcecb6..23a6eb40a 100644
--- a/redhat/applications/settings/tdesudo/tdesudo.spec
+++ b/redhat/applications/settings/tdesudo/tdesudo.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.1.3
+%define tde_version 14.1.4
 %endif
 %define tde_pkg tdesudo
 %define tde_prefix /opt/trinity
@@ -105,7 +105,7 @@ It allows you to run programs as another user by entering your password.
 
 ##########
 
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%if 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
diff --git a/redhat/applications/settings/wlassistant/wlassistant.spec b/redhat/applications/settings/wlassistant/wlassistant.spec
index 389e33999..18078908e 100644
--- a/redhat/applications/settings/wlassistant/wlassistant.spec
+++ b/redhat/applications/settings/wlassistant/wlassistant.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.1.3
+%define tde_version 14.1.4
 %endif
 %define tde_pkg wlassistant
 %define tde_prefix /opt/trinity
@@ -130,7 +130,7 @@ remembered so next time the user won't have to enter them again.
 
 ##########
 
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%if 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif