summaryrefslogtreecommitdiffstats
path: root/redhat/core
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2024-06-13 08:37:13 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2024-06-13 08:38:31 +0200
commitac47c91c6c011631186592695e4251a3bb97dcca (patch)
treed91e4e98d96b4b2618d9fb3b879c28b67fc63a8f /redhat/core
parent1488354ed514d043f0c15ddbe8b9aa7c0b43f46c (diff)
downloadtde-packaging-ac47c91c6c011631186592695e4251a3bb97dcca.tar.gz
tde-packaging-ac47c91c6c011631186592695e4251a3bb97dcca.zip
RPM: synchronize redhat directory with r14.1.x branch
Signed-off-by: François Andriot <albator78@libertysurf.fr>
Diffstat (limited to 'redhat/core')
-rw-r--r--redhat/core/tde-i18n/tde-i18n.spec4
-rw-r--r--redhat/core/tdeaccessibility/tdeaccessibility.spec20
-rw-r--r--redhat/core/tdeaddons/tdeaddons.spec26
-rw-r--r--redhat/core/tdeadmin/tdeadmin.spec14
-rw-r--r--redhat/core/tdeartwork/tdeartwork.spec18
-rw-r--r--redhat/core/tdebase/pamd.kcheckpass-trinity.fc385
-rw-r--r--redhat/core/tdebase/pamd.kcheckpass-trinity.fc395
l---------redhat/core/tdebase/pamd.kcheckpass-trinity.fc401
-rw-r--r--redhat/core/tdebase/pamd.kcheckpass-trinity.mga95
-rw-r--r--redhat/core/tdebase/pamd.kdm-trinity-np.fc3816
-rw-r--r--redhat/core/tdebase/pamd.kdm-trinity-np.fc3916
l---------redhat/core/tdebase/pamd.kdm-trinity-np.fc401
-rw-r--r--redhat/core/tdebase/pamd.kdm-trinity-np.mga911
-rw-r--r--redhat/core/tdebase/pamd.kdm-trinity.fc3823
-rw-r--r--redhat/core/tdebase/pamd.kdm-trinity.fc3923
l---------redhat/core/tdebase/pamd.kdm-trinity.fc401
-rw-r--r--redhat/core/tdebase/pamd.kdm-trinity.mga915
-rw-r--r--redhat/core/tdebase/pamd.kscreensaver-trinity.fc385
-rw-r--r--redhat/core/tdebase/pamd.kscreensaver-trinity.fc395
l---------redhat/core/tdebase/pamd.kscreensaver-trinity.fc401
-rw-r--r--redhat/core/tdebase/pamd.kscreensaver-trinity.mga95
-rw-r--r--redhat/core/tdebase/pamd.tde.omv500010
-rw-r--r--redhat/core/tdebase/tdebase.spec150
-rw-r--r--redhat/core/tdebase/tdm.fc38.te11
-rw-r--r--redhat/core/tdebase/tdm.fc39.te30
l---------redhat/core/tdebase/tdm.fc40.te1
-rw-r--r--redhat/core/tdebindings/tdebindings.spec36
-rw-r--r--redhat/core/tdeedu/tdeedu.spec18
-rw-r--r--redhat/core/tdegames/tdegames.spec19
-rw-r--r--redhat/core/tdegraphics/tdegraphics.spec50
-rw-r--r--redhat/core/tdelibs/tdelibs.spec88
-rw-r--r--redhat/core/tdemultimedia/tdemultimedia.spec65
-rw-r--r--redhat/core/tdenetwork/tdenetwork.spec43
-rw-r--r--redhat/core/tdepim/tdepim.spec44
-rw-r--r--redhat/core/tdesdk/tdesdk.spec23
-rw-r--r--redhat/core/tdetoys/tdetoys.spec12
-rw-r--r--redhat/core/tdeutils/tdeutils.spec36
-rw-r--r--redhat/core/tdevelop/tdevelop.spec21
-rw-r--r--redhat/core/tdewebdev/tdewebdev.spec17
39 files changed, 761 insertions, 133 deletions
diff --git a/redhat/core/tde-i18n/tde-i18n.spec b/redhat/core/tde-i18n/tde-i18n.spec
index 3884089c7..34bbf3a4b 100644
--- a/redhat/core/tde-i18n/tde-i18n.spec
+++ b/redhat/core/tde-i18n/tde-i18n.spec
@@ -18,7 +18,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 tde-i18n
%define tde_prefix /opt/trinity
@@ -1432,7 +1432,7 @@ for l in %{TDE_LANGS}; do
ln -s ../cmake cmake
fi
- if ! rpm -E %%cmake|grep -q "cd build"; then
+ if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/core/tdeaccessibility/tdeaccessibility.spec b/redhat/core/tdeaccessibility/tdeaccessibility.spec
index 7034a5984..35b6e2804 100644
--- a/redhat/core/tdeaccessibility/tdeaccessibility.spec
+++ b/redhat/core/tdeaccessibility/tdeaccessibility.spec
@@ -22,7 +22,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 tdeaccessibility
%define tde_prefix /opt/trinity
@@ -95,11 +95,23 @@ BuildRequires: trinity-akode-devel
%endif
# ALSA support
-BuildRequires: alsa-lib-devel
+%if 0%{?mdkver}
+BuildRequires: %{_lib}asound-devel
+%else
+BuildRequires: alsa-lib-devel
+%endif
# GLIB2 support
BuildRequires: glib2-devel
+# JPEG support
+%if 0%{?mdkver}
+%define libjpeg %{_lib}jpeg
+%else
+%define libjpeg libjpeg
+%endif
+BuildRequires: %{libjpeg}-devel
+
# XCB support
%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?pclinuxos}
BuildRequires: libxcb-devel
@@ -401,7 +413,7 @@ Summary: Development files for tdeaccessibility
Group: Development/Libraries/X11
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: trinity-tdelibs-devel >= %{version}
-Requires: libjpeg-devel
+Requires: %{libjpeg}-devel
Requires: libpng-devel
Obsoletes: trinity-kdeaccessibility-devel < %{?epoch:%{epoch}:}%{version}-%{release}
@@ -439,7 +451,7 @@ unset QTDIR QTLIB QTINC
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/core/tdeaddons/tdeaddons.spec b/redhat/core/tdeaddons/tdeaddons.spec
index 5b57a05de..a11c0c654 100644
--- a/redhat/core/tdeaddons/tdeaddons.spec
+++ b/redhat/core/tdeaddons/tdeaddons.spec
@@ -21,7 +21,7 @@
# TDE variables
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg tdeaddons
%define tde_prefix /opt/trinity
@@ -87,13 +87,25 @@ BuildRequires: brp-check-trinity
%endif
# SDL support
-BuildRequires: SDL-devel
+%if 0%{?mdkver}
+BuildRequires: %{_lib}SDL-devel
+%else
+BuildRequires: SDL-devel
+%endif
-# ALSA support
+# ALSA supportl
+%if 0%{?mdkver} >= 24090000
+BuildRequires: %{_lib}asound-devel
+%else
BuildRequires: alsa-lib-devel
+%endif
# OPENSSL support
-BuildRequires: openssl-devel
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
+BuildRequires: openssl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
@@ -112,7 +124,11 @@ BuildRequires: pcre-devel
%endif
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# DB4/DB5 support
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1220 || 0%{?mdkversion} || 0%{?mgaversion}
@@ -692,7 +708,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/core/tdeadmin/tdeadmin.spec b/redhat/core/tdeadmin/tdeadmin.spec
index 441e3d866..322b8e869 100644
--- a/redhat/core/tdeadmin/tdeadmin.spec
+++ b/redhat/core/tdeadmin/tdeadmin.spec
@@ -22,7 +22,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 tdeadmin
%define tde_prefix /opt/trinity
@@ -88,13 +88,21 @@ BuildRequires: brp-check-trinity
%endif
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# RPM support
BuildRequires: rpm-devel
@@ -351,7 +359,7 @@ touch /etc/lilo.conf
unset QTDIR QTLIB QTINC
export PATH="%{tde_bindir}:${PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -387,7 +395,7 @@ fi
-DBUILD_SECPOLICY=ON \
-DBUILD_TDEFILE_PLUGINS=ON \
\
-%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7 || 0%{?mageia} >= 4
+%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7 || 0%{?mgaversion} >= 4
-DKU_FIRSTUID="1000" \
-DKU_FIRSTGID="1000" \
%endif
diff --git a/redhat/core/tdeartwork/tdeartwork.spec b/redhat/core/tdeartwork/tdeartwork.spec
index ad15a0c1d..ab1e7c3cb 100644
--- a/redhat/core/tdeartwork/tdeartwork.spec
+++ b/redhat/core/tdeartwork/tdeartwork.spec
@@ -22,7 +22,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 tdeartwork
%define tde_prefix /opt/trinity
@@ -75,10 +75,14 @@ BuildRequires: gettext
BuildRequires: libidn-devel
# ESOUND support
-BuildRequires: esound-devel
+#BuildRequires: esound-devel
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# MESA support
%if 0%{?rhel} || 0%{?fedora}
@@ -86,8 +90,12 @@ BuildRequires: mesa-libGL-devel
BuildRequires: mesa-libGLU-devel
%endif
%if 0%{?mdkversion} || 0%{?mgaversion}
+%if 0%{?mdkver}
+BuildRequires: %{_lib}glu-devel
+%else
BuildRequires: mesaglu-devel
%endif
+%endif
%if 0%{?suse_version}
BuildRequires: Mesa-libGL-devel
BuildRequires: Mesa-libGLU-devel
@@ -172,7 +180,11 @@ BuildRequires: gamin-devel
%endif
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# Metapackage
@@ -740,7 +752,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/core/tdebase/pamd.kcheckpass-trinity.fc38 b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc38
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc38
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth include system-auth
+account include system-auth
+password include system-auth
+session include system-auth
diff --git a/redhat/core/tdebase/pamd.kcheckpass-trinity.fc39 b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc39
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc39
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth include system-auth
+account include system-auth
+password include system-auth
+session include system-auth
diff --git a/redhat/core/tdebase/pamd.kcheckpass-trinity.fc40 b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc40
new file mode 120000
index 000000000..bcd188214
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc40
@@ -0,0 +1 @@
+pamd.kcheckpass-trinity.fc39 \ No newline at end of file
diff --git a/redhat/core/tdebase/pamd.kcheckpass-trinity.mga9 b/redhat/core/tdebase/pamd.kcheckpass-trinity.mga9
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.mga9
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth include system-auth
+account include system-auth
+password include system-auth
+session include system-auth
diff --git a/redhat/core/tdebase/pamd.kdm-trinity-np.fc38 b/redhat/core/tdebase/pamd.kdm-trinity-np.fc38
new file mode 100644
index 000000000..0616e66f6
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.fc38
@@ -0,0 +1,16 @@
+ #%PAM-1.0
+auth required pam_env.so
+auth required pam_permit.so
+auth include postlogin
+account required pam_nologin.so
+account include system-auth
+password include system-auth
+session required pam_selinux.so close
+session required pam_loginuid.so
+session optional pam_console.so
+-session optional pam_ck_connector.so
+session required pam_selinux.so open
+session optional pam_keyinit.so force revoke
+session required pam_namespace.so
+session include system-auth
+session include postlogin
diff --git a/redhat/core/tdebase/pamd.kdm-trinity-np.fc39 b/redhat/core/tdebase/pamd.kdm-trinity-np.fc39
new file mode 100644
index 000000000..0616e66f6
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.fc39
@@ -0,0 +1,16 @@
+ #%PAM-1.0
+auth required pam_env.so
+auth required pam_permit.so
+auth include postlogin
+account required pam_nologin.so
+account include system-auth
+password include system-auth
+session required pam_selinux.so close
+session required pam_loginuid.so
+session optional pam_console.so
+-session optional pam_ck_connector.so
+session required pam_selinux.so open
+session optional pam_keyinit.so force revoke
+session required pam_namespace.so
+session include system-auth
+session include postlogin
diff --git a/redhat/core/tdebase/pamd.kdm-trinity-np.fc40 b/redhat/core/tdebase/pamd.kdm-trinity-np.fc40
new file mode 120000
index 000000000..9d4df92f4
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.fc40
@@ -0,0 +1 @@
+pamd.kdm-trinity-np.fc39 \ No newline at end of file
diff --git a/redhat/core/tdebase/pamd.kdm-trinity-np.mga9 b/redhat/core/tdebase/pamd.kdm-trinity-np.mga9
new file mode 100644
index 000000000..f884c1de6
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.mga9
@@ -0,0 +1,11 @@
+#%PAM-1.0
+auth required pam_env.so
+auth required pam_permit.so
+account required pam_nologin.so
+account include system-auth
+password include system-auth
+session required pam_loginuid.so
+session optional pam_console.so
+session optional pam_keyinit.so force revoke
+session required pam_namespace.so
+session include system-auth
diff --git a/redhat/core/tdebase/pamd.kdm-trinity.fc38 b/redhat/core/tdebase/pamd.kdm-trinity.fc38
new file mode 100644
index 000000000..4e760760f
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kdm-trinity.fc38
@@ -0,0 +1,23 @@
+#%PAM-1.0
+auth [success=done ignore=ignore default=bad] pam_selinux_permit.so
+auth required pam_env.so
+auth substack system-auth
+-auth optional pam_gnome_keyring.so
+-auth optional pam_kwallet.so
+-auth optional pam_kwallet5.so
+auth include postlogin
+account required pam_nologin.so
+account include system-auth
+password include system-auth
+session required pam_selinux.so close
+session required pam_loginuid.so
+session optional pam_console.so
+-session optional pam_ck_connector.so
+session required pam_selinux.so open
+session optional pam_keyinit.so force revoke
+session required pam_namespace.so
+session include system-auth
+-session optional pam_gnome_keyring.so auto_start
+-session optional pam_kwallet.so
+-session optional pam_kwallet5.so
+session include postlogin
diff --git a/redhat/core/tdebase/pamd.kdm-trinity.fc39 b/redhat/core/tdebase/pamd.kdm-trinity.fc39
new file mode 100644
index 000000000..4e760760f
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kdm-trinity.fc39
@@ -0,0 +1,23 @@
+#%PAM-1.0
+auth [success=done ignore=ignore default=bad] pam_selinux_permit.so
+auth required pam_env.so
+auth substack system-auth
+-auth optional pam_gnome_keyring.so
+-auth optional pam_kwallet.so
+-auth optional pam_kwallet5.so
+auth include postlogin
+account required pam_nologin.so
+account include system-auth
+password include system-auth
+session required pam_selinux.so close
+session required pam_loginuid.so
+session optional pam_console.so
+-session optional pam_ck_connector.so
+session required pam_selinux.so open
+session optional pam_keyinit.so force revoke
+session required pam_namespace.so
+session include system-auth
+-session optional pam_gnome_keyring.so auto_start
+-session optional pam_kwallet.so
+-session optional pam_kwallet5.so
+session include postlogin
diff --git a/redhat/core/tdebase/pamd.kdm-trinity.fc40 b/redhat/core/tdebase/pamd.kdm-trinity.fc40
new file mode 120000
index 000000000..5022f14ef
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kdm-trinity.fc40
@@ -0,0 +1 @@
+pamd.kdm-trinity.fc39 \ No newline at end of file
diff --git a/redhat/core/tdebase/pamd.kdm-trinity.mga9 b/redhat/core/tdebase/pamd.kdm-trinity.mga9
new file mode 100644
index 000000000..cb0982c9a
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kdm-trinity.mga9
@@ -0,0 +1,15 @@
+#%PAM-1.0
+auth required pam_env.so
+auth required pam_succeed_if.so
+auth sufficient pam_succeed_if.so user ingroup nopasswdlogin
+auth substack system-auth
+-auth optional pam_kwallet.so
+account required pam_nologin.so
+account include system-auth
+password include system-auth
+session required pam_loginuid.so
+session optional pam_console.so
+session optional pam_keyinit.so force revoke
+session required pam_namespace.so
+session include system-auth
+-session optional pam_kwallet.so
diff --git a/redhat/core/tdebase/pamd.kscreensaver-trinity.fc38 b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc38
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc38
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth include system-auth
+account include system-auth
+password include system-auth
+session include system-auth
diff --git a/redhat/core/tdebase/pamd.kscreensaver-trinity.fc39 b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc39
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc39
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth include system-auth
+account include system-auth
+password include system-auth
+session include system-auth
diff --git a/redhat/core/tdebase/pamd.kscreensaver-trinity.fc40 b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc40
new file mode 120000
index 000000000..a7b20accd
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc40
@@ -0,0 +1 @@
+pamd.kscreensaver-trinity.fc39 \ No newline at end of file
diff --git a/redhat/core/tdebase/pamd.kscreensaver-trinity.mga9 b/redhat/core/tdebase/pamd.kscreensaver-trinity.mga9
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.mga9
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth include system-auth
+account include system-auth
+password include system-auth
+session include system-auth
diff --git a/redhat/core/tdebase/pamd.tde.omv5000 b/redhat/core/tdebase/pamd.tde.omv5000
new file mode 100644
index 000000000..9e0557414
--- /dev/null
+++ b/redhat/core/tdebase/pamd.tde.omv5000
@@ -0,0 +1,10 @@
+#%PAM-1.0
+auth required pam_env.so
+auth sufficient pam_succeed_if.so user ingroup nopasswdlogin
+auth include system-auth
+account include system-auth
+password include system-auth
+session optional pam_keyinit.so force revoke
+session required pam_namespace.so
+session include system-auth
+session required pam_loginuid.so
diff --git a/redhat/core/tdebase/tdebase.spec b/redhat/core/tdebase/tdebase.spec
index 9648593b8..c1dcce65c 100644
--- a/redhat/core/tdebase/tdebase.spec
+++ b/redhat/core/tdebase/tdebase.spec
@@ -18,7 +18,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 tdebase
%define tde_prefix /opt/trinity
@@ -63,10 +63,14 @@ Source1: %{name}-rpmlintrc
# Pam configuration files for RHEL / Fedora
%if 0%{?suse_version} == 0
-Source2: pamd.kdm-trinity%{?dist}
-Source3: pamd.kdm-trinity-np%{?dist}
-Source4: pamd.kcheckpass-trinity%{?dist}
-Source5: pamd.kscreensaver-trinity%{?dist}
+%if 0%{?mdkver}
+Source2: pamd.tde.omv5000
+%else
+Source2: pamd.kdm-trinity%{?pamd_suffix}
+Source3: pamd.kdm-trinity-np%{?pamd_suffix}
+Source4: pamd.kcheckpass-trinity%{?pamd_suffix}
+Source5: pamd.kscreensaver-trinity%{?pamd_suffix}
+%endif
%endif
# openSUSE: configuration file for TDM
@@ -187,6 +191,12 @@ Requires: mandriva-theme
%define tde_starticon /usr/share/icons/mandriva.png
%endif
+# OpenMandriva
+%if 0%{?mdkver}
+Requires: distro-release-theme
+%define tde_bg /usr/share/wallpapers/default.png
+%endif
+
# PCLINUXOS
%if 0%{?pclinuxos}
Requires: desktop-common-data
@@ -202,7 +212,7 @@ Requires: hicolor-icon-theme-branding
%endif
# OpenSuse TW Theme
-%if "%{?suse_version}" == "1550"
+%if "%{?suse_version}" == "1699"
Requires: wallpaper-branding
%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
Requires: hicolor-icon-theme-branding
@@ -221,19 +231,36 @@ BuildRequires: fdupes
BuildRequires: htdig
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# AUDIOFILE support
BuildRequires: audiofile-devel
# ALSA supportl
-BuildRequires: alsa-lib-devel
+%if 0%{?mdkver}
+BuildRequires: %{_lib}asound-devel
+%else
+BuildRequires: alsa-lib-devel
+%endif
# RAW1394 support
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
+BuildRequires: %{_lib}raw1394-devel
+%else
BuildRequires: libraw1394-devel
+%endif
# VORBIS support
-BuildRequires: libvorbis-devel
+%if 0%{?mdkver} || 0%{?mgaversion}
+%define libvorbis_devel %{_lib}vorbis-devel
+%else
+%define libvorbis_devel libvorbis-devel
+%endif
+BuildRequires: %{libvorbis_devel}
# GLIB2 support
BuildRequires: glib2-devel
@@ -242,9 +269,13 @@ BuildRequires: glib2-devel
BuildRequires: pcre-devel
# SASL support
-%if 0%{?mageia} || 0%{?mandriva} || 0%{?pclinuxos}
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
+%if 0%{?mdkver}
+BuildRequires: %{_lib}sasl-devel
+%else
BuildRequires: %{_lib}sasl2-devel
%endif
+%endif
%if 0%{?suse_version}
BuildRequires: cyrus-sasl-devel
%endif
@@ -266,10 +297,10 @@ BuildRequires: libusb-devel
%endif
# ESOUND support
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
-%define with_esound 1
-BuildRequires: esound-devel
-%endif
+#if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
+#define with_esound 1
+#BuildRequires: esound-devel
+#endif
# IDN support
BuildRequires: libidn-devel
@@ -283,8 +314,12 @@ BuildRequires: gamin-devel
# OPENLDAP support
%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
+%if 0%{?mdkver}
+BuildRequires: lib64ldap-devel
+%else
BuildRequires: openldap-devel
%endif
+%endif
%if 0%{?suse_version}
BuildRequires: openldap2-devel
%endif
@@ -306,13 +341,21 @@ BuildRequires: libsensors4-devel
%if 0%{?suse_version} >= 1310
BuildRequires: udev
%endif
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: %{_lib}udev-devel
+%else
BuildRequires: libudev-devel
+%endif
%define with_tsak 1
%define with_tdehwlib 1
%endif
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# XRANDR support
# On RHEL5, xrandr library is too old.
@@ -337,8 +380,12 @@ BuildRequires: hal-devel >= 0.5
# Disabled on RHEL4
%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
%define with_exr 1
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openexr-devel
+%else
BuildRequires: OpenEXR-devel
%endif
+%endif
# XSCREENSAVER support
# RHEL 4: disabled
@@ -396,8 +443,12 @@ BuildRequires: mesa-libGL-devel
BuildRequires: mesa-libGLU-devel
%endif
%if 0%{?mdkversion} || 0%{?mgaversion}
+%if 0%{?mdkver}
+BuildRequires: %{_lib}glu-devel
+%else
BuildRequires: mesaglu-devel
%endif
+%endif
%if 0%{?suse_version}
BuildRequires: Mesa-libGL-devel
BuildRequires: Mesa-libGLU-devel
@@ -428,8 +479,12 @@ BuildRequires: libart_lgpl-devel
BuildRequires: samba-common
%endif
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
+%if 0%{?mdkver}
+BuildRequires: %{_lib}smbclient-devel
+%else
BuildRequires: libsmbclient-devel
%endif
+%endif
# IMAKE
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} >= 1220
@@ -441,8 +496,15 @@ BuildRequires: imake
BuildRequires: xorg-x11-libxkbfile-devel
%endif
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} >= 1210
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: %{_lib}xkbfile-devel
+%else
BuildRequires: libxkbfile-devel
%endif
+%if 0%{?fedora} || 0%{?mdkver} || 0%{?rhel} >= 7
+BuildRequires: xkeyboard-config-devel
+%endif
+%endif
# XDMCP support
%if 0%{?mgaversion} || 0%{?mdkversion}
@@ -514,16 +576,22 @@ BuildRequires: font-util
BuildRequires: bdftopcf
%endif
+%if 0%{?mdkver} < 24090000
%if 0%{?mdkversion} || 0%{?mgaversion}
BuildRequires: drakconf
%endif
+%endif
# LIBCONFIG support
# Needed for "compton" stuff
%if 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora}
%define with_libconfig 1
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires: %{_lib}config-devel
+%else
BuildRequires: libconfig-devel
%endif
+%endif
# KBDLEDSYNC support
%if 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora}
@@ -553,7 +621,12 @@ BuildRequires: libnsl-devel
%endif
# ATTR support
-BuildRequires: libattr-devel
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%define libattr_devel %{_lib}attr-devel
+%else
+%define libattr_devel libattr-devel
+%endif
+BuildRequires: %{libattr_devel}
# SELINUX support
%if 0%{?rhel} >= 6 || 0%{?fedora}
@@ -728,6 +801,7 @@ Such as the desktop right-click-"Create New" list
%files runtime-data-common
%defattr(-,root,root,-)
+%{tde_datadir}/apps/kxkb/
%{tde_datadir}/desktop-directories/
%{tde_datadir}/icons/hicolor/*/apps/kxkb.png
%{tde_datadir}/icons/hicolor/*/apps/knetattach.*
@@ -1145,11 +1219,9 @@ plugdev group.
%{tde_tdedocdir}/HTML/en/tdefontview/
# tdehwtray
-%if "%{?tde_version}" == "14.1.0"
%{tde_bindir}/tdehwdevicetray
%{tde_tdeappdir}/tdehwdevicetray.desktop
%{tde_datadir}/autostart/tdehwdevicetray-autostart.desktop
-%endif
# The following features are not compiled under RHEL 5 and older
%if 0%{?with_tderandrtray}
@@ -1835,11 +1907,9 @@ group.
%{tde_tdelibdir}/media_propsdlgplugin.so
%{tde_datadir}/services/media_propsdlgplugin.desktop
-%if "%{tde_version}" == "14.1.0"
%{tde_tdelibdir}/ktrashpropsdlgplugin.la
%{tde_tdelibdir}/ktrashpropsdlgplugin.so
%{tde_datadir}/services/ktrashpropsdlgplugin.desktop
-%endif
##########
@@ -2096,10 +2166,7 @@ already. Most users won't need this.
%{tde_mandir}/man1/tdmctl.1*
%{tde_mandir}/man1/tdm_config.1*
%{tde_mandir}/man1/tdm_greet.1*
-
-%if "%{?tde_version}" == "14.1.0"
%{tde_bindir}/tdecryptocardwatcher
-%endif
# XDG user faces
%dir %{_datadir}/faces
@@ -2116,10 +2183,10 @@ already. Most users won't need this.
%if 0%{?suse_version} >= 1210
/usr/lib/X11/displaymanagers/
%endif
-%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 || 0%{?mgaversion} >= 6
+%if 0%{?fedora} >= 18 || 0%{?mdkver} || 0%{?mgaversion} >= 6 || 0%{?rhel} >= 7
/usr/lib/systemd/system/tdm.service
%endif
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} || 0%{?mgaversion} >= 6
+%if 0%{?fedora} || 0%{?mdkver} || 0%{?mgaversion} >= 6 || 0%{?rhel} || 0%{?suse_version}
%{_datadir}/xsessions/tde.desktop
%endif
@@ -2616,8 +2683,10 @@ ever launching another application.
%exclude %{tde_datadir}/apps/konqueror/servicemenus/kdesktopSetAsBackground.desktop
%exclude %{tde_datadir}/apps/konqueror/servicemenus/installfont.desktop
%{tde_datadir}/apps/konqueror/servicemenus/*.desktop
+%if 0%{?mdkver} < 24090000
%ghost %{_sysconfdir}/alternatives/media_safelyremove.desktop
%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase
+%endif
%{tde_datadir}/apps/konqueror/tiles/
%{tde_datadir}/autostart/konqy_preload.desktop
%{tde_datadir}/config.kcfg/keditbookmarks.kcfg
@@ -2636,6 +2705,8 @@ ever launching another application.
%{tde_mandir}/man1/kfmclient.1*
%{tde_mandir}/man1/konqueror.1*
+%if 0%{?mdkver} < 24090000
+
%post -n trinity-konqueror
if [ $1 -eq 1 ]; then
update-alternatives --install \
@@ -2652,6 +2723,8 @@ if [ $1 -eq 0 ]; then
%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase || :
fi
+%endif
+
##########
%package -n trinity-konqueror-devel
@@ -2826,10 +2899,6 @@ TDE will start, but many good defaults will not be set.
%{tde_mandir}/man1/starttde.1*
%post -n trinity-ksmserver
-%if 0%{?mdkversion} || 0%{?mgaversion}
-fndSession
-%endif
-
# openSUSE 15.0 alternatives
%if 0%{?suse_version} >= 1500
update-alternatives --install /usr/share/xsessions/default.desktop default-xsession.desktop /usr/share/xsessions/tde.desktop 30 || :
@@ -2837,8 +2906,10 @@ update-alternatives --install /usr/share/xsessions/default.desktop default-xsess
%postun -n trinity-ksmserver
%if 0%{?mdkversion} || 0%{?mgaversion}
+%if 0%{?mdkver} < 24090000
fndSession
%endif
+%endif
# openSUSE 15.0 alternatives
%if 0%{?suse_version} >= 1500
@@ -3007,6 +3078,7 @@ This package contains the default X window manager for TDE.
%{tde_tdeappdir}/twinoptions.desktop
%{tde_tdeappdir}/twinrules.desktop
%{tde_datadir}/applnk/.hidden/twinactions.desktop
+%{tde_datadir}/applnk/.hidden/twinactiveborders.desktop
%{tde_datadir}/applnk/.hidden/twinadvanced.desktop
%{tde_datadir}/applnk/.hidden/twinfocus.desktop
%{tde_datadir}/applnk/.hidden/twinmoving.desktop
@@ -3200,6 +3272,9 @@ Windows and Samba shares.
if [ -x "/usr/bin/reboot" ]; then
POWEROFF="/usr/bin/poweroff"
REBOOT="/usr/bin/reboot"
+elif [ -x "/usr/sbin/reboot" ]; then
+ POWEROFF="/usr/sbin/poweroff"
+ REBOOT="/usr/sbin/reboot"
fi
if [ -n "${REBOOT}" ]; then
%__sed -i \
@@ -3260,7 +3335,7 @@ if [ -d "/usr/include/tirpc" ]; then
RPM_OPT_FLAGS="$(pkg-config --cflags --libs libtirpc) ${RPM_OPT_FLAGS}"
fi
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -3332,7 +3407,7 @@ fi
%if 0%{?fedora} >= 22 || 0%{?suse_version} >= 1320
-DHTDIG_SEARCH_BINARY="/usr/bin/htdig" \
%endif
-%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 || 0%{?mgaversion} >= 6
+%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 || 0%{?mgaversion} >= 6 || 0%{?mdkver}
-DBUILD_TDM_SYSTEMD_UNIT_FILE="ON" \
%endif
..
@@ -3351,7 +3426,7 @@ fi
# Adds a GDM/KDM/XDM session called 'TDE'
# Under RHEL/Fedora/Suse, static 'xsessions' files go to '/usr/share/xsessions'.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} || 0%{?mgaversion} >= 6
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} || 0%{?mdkver} || 0%{?mgaversion} >= 6
%__install -D -m 644 \
"%{?buildroot}%{tdm_datadir}/sessions/tde.desktop" \
"%{?buildroot}%{_datadir}/xsessions/tde.desktop"
@@ -3381,24 +3456,29 @@ FNDSESSION_EXEC="/usr/sbin/chksession -k"
%else
%if 0%{?mgaversion} >= 6
FNDSESSION_EXEC="/usr/sbin/chksession -l"
-%else
-FNDSESSION_EXEC="/usr/sbin/chksession --generate=/usr/share/xsessions"
-%endif
%endif
EOF
%endif
+%endif
# PAM configuration files (except openSUSE)
%if 0%{?suse_version} == 0
+%if 0%{?mdkver}
+%__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/tdm-trinity"
+%__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/tdm-trinity-np"
+%__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/kcheckpass-trinity"
+%__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/tdescreensaver-trinity"
+%else
%__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/tdm-trinity"
%__install -D -m 644 "%{SOURCE3}" "%{?buildroot}%{_sysconfdir}/pam.d/tdm-trinity-np"
%__install -D -m 644 "%{SOURCE4}" "%{?buildroot}%{_sysconfdir}/pam.d/kcheckpass-trinity"
%__install -D -m 644 "%{SOURCE5}" "%{?buildroot}%{_sysconfdir}/pam.d/tdescreensaver-trinity"
%endif
+%endif
# TDM configuration
%__sed -i "%{?buildroot}%{tde_confdir}/%{tdm}/%{tdm}rc" \
-%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7 || 0%{?mageia} >= 4
+%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7 || 0%{?mgaversion} >= 4 || 0%{?mdkver}
-e "s/^#*MinShowUID=.*/MinShowUID=1000/"
%else
-e "s/^#*MinShowUID=.*/MinShowUID=500/"
@@ -3413,11 +3493,13 @@ elif [ -r "/usr/share/hwdata/usb.ids" ]; then
%__ln_s -f "/usr/share/hwdata/usb.ids" "%{?buildroot}%{tde_datadir}/apps/usb.ids"
fi
+%if 0%{?mdkver} < 24090000
# Makes 'media_safelyremove.desktop' an alternative.
# This allows the use of 'tdeio-umountwrapper' package.
%__mv -f "%{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop" "%{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase"
%__mkdir_p "%{buildroot}%{_sysconfdir}/alternatives"
%__ln_s "media_safelyremove.desktop_tdebase" "%{buildroot}%{_sysconfdir}/alternatives/media_safelyremove.desktop"
+%endif
# SUSE >= 12 : creates DM config file, used by '/etc/init.d/xdm'
# You must set 'DISPLAYMANAGER=tdm' in '/etc/sysconfig/displaymanager'
diff --git a/redhat/core/tdebase/tdm.fc38.te b/redhat/core/tdebase/tdm.fc38.te
new file mode 100644
index 000000000..afe6de52a
--- /dev/null
+++ b/redhat/core/tdebase/tdm.fc38.te
@@ -0,0 +1,11 @@
+
+module tdm 1.0;
+
+require {
+ type fprintd_t;
+ type init_t;
+ class dbus send_msg;
+}
+
+#============= fprintd_t ==============
+allow fprintd_t init_t:dbus send_msg;
diff --git a/redhat/core/tdebase/tdm.fc39.te b/redhat/core/tdebase/tdm.fc39.te
new file mode 100644
index 000000000..f3bcb40d4
--- /dev/null
+++ b/redhat/core/tdebase/tdm.fc39.te
@@ -0,0 +1,30 @@
+
+module tdm 1.0;
+
+require {
+ type etc_t;
+ type fprintd_t;
+ type init_t;
+ type tmp_t;
+ type unconfined_service_t;
+ type unconfined_t;
+ type var_lib_t;
+ type var_run_t;
+ type xdm_t;
+ class capability2 mac_admin;
+ class dbus send_msg;
+ class fifo_file { getattr open read setattr unlink };
+ class file { create entrypoint getattr lock map open read rename unlink write };
+ class lnk_file unlink;
+ class process transition;
+}
+
+allow fprintd_t init_t:dbus send_msg;
+allow unconfined_service_t unconfined_t:process transition;
+allow unconfined_t self:capability2 mac_admin;
+allow xdm_t etc_t:file { create rename unlink write };
+allow xdm_t tmp_t:fifo_file { getattr open read setattr unlink };
+allow xdm_t tmp_t:file { map open unlink };
+allow xdm_t tmp_t:lnk_file unlink;
+allow xdm_t var_lib_t:file { unlink };
+allow xdm_t var_run_t:file { getattr lock open read write };
diff --git a/redhat/core/tdebase/tdm.fc40.te b/redhat/core/tdebase/tdm.fc40.te
new file mode 120000
index 000000000..6d3f39b54
--- /dev/null
+++ b/redhat/core/tdebase/tdm.fc40.te
@@ -0,0 +1 @@
+tdm.fc39.te \ No newline at end of file
diff --git a/redhat/core/tdebindings/tdebindings.spec b/redhat/core/tdebindings/tdebindings.spec
index 9f3bf5d1b..f194d330e 100644
--- a/redhat/core/tdebindings/tdebindings.spec
+++ b/redhat/core/tdebindings/tdebindings.spec
@@ -27,7 +27,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 tdebindings
%define tde_prefix /opt/trinity
@@ -107,8 +107,12 @@ Requires: evolution28-pango
BuildRequires: evolution28-atk-devel
Requires: evolution28-atk
%else
+%if 0%{?mdkver}
+BuildRequires: %{_lib}gtk+2.0-devel
+%else
BuildRequires: gtk2-devel
%endif
+%endif
# XULRUNNER support
%if 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} >= 1220
@@ -119,7 +123,11 @@ BuildRequires: mozilla-xulrunner20-devel
%endif
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# GTK1 support
%if 0%{?fedora} || (0%{?rhel} >= 5 && 0%{?rhel} <= 7)
@@ -161,8 +169,12 @@ BuildRequires: mesa-libGL-devel
BuildRequires: mesa-libGLU-devel
%endif
%if 0%{?mdkversion} || 0%{?mgaversion}
+%if 0%{?mdkver}
+BuildRequires: %{_lib}glu-devel
+%else
BuildRequires: mesaglu-devel
%endif
+%endif
%if 0%{?suse_version}
BuildRequires: Mesa-libGL-devel
BuildRequires: Mesa-libGLU-devel
@@ -185,13 +197,13 @@ BuildRequires: rubypick
%endif
# Check for Ruby library directory
-%if "%{?ruby_libarchdir}" != ""
+%if "%{?ruby_libarchdir}" != "" && "%{?ruby_libarchdir}" != "%{_libdir}/%{name}"
%define ruby_arch %{?ruby_libarchdir}
%else
%if "%{?rb_archdir}" != ""
%define ruby_arch %{?rb_archdir}
%else
-%if "%{%ruby_archdir}" != ""
+%if "%{?ruby_archdir}" != ""
%define ruby_arch %{?ruby_archdir}
%else
%{!?ruby_arch: %define ruby_arch %(ruby -rrbconfig -e 'puts Config::CONFIG["archdir"]' || ruby -rrbconfig -e 'puts RbConfig::CONFIG["archdir"]')}
@@ -686,7 +698,7 @@ This package is part of the official TDE bindings module.
%defattr(-,root,root,-)
%{python_sitearch}/pcop.la
%{python_sitearch}/pcop.so
-%if 0%{?rhel} == 7 || 0%{?suse_version}
+%if 0%{?mdkver} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version}
%{python_sitearch}/pydcop.py*
%if 0%{?rhel} == 7
%{python_sitearch}/__pycache__/pydcop.*.pyc
@@ -1076,6 +1088,10 @@ exit 2
exit 3
%endif
+%if 0%{?mdkver}
+touch config.h.in
+%endif
+
# [tdebindings] Function 'rb_frame_this_func' does not exist in RHEL4/5
%if 0%{?rhel} >= 4 && 0%{?rhel} <= 5
%__sed -i "qtruby/rubylib/qtruby/Qt.cpp" \
@@ -1102,7 +1118,7 @@ exit 3
%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"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__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"
@@ -1139,9 +1155,8 @@ EXTRA_INCLUDES="/usr/include/ruby-%{rb20_ver}:/usr/include/ruby-%{rb20_ver}/%{_t
EXTRA_INCLUDES="/usr/include/ruby-%{rb_ver}:/usr/include/ruby-%{rb_ver}/%{_target}-gnu"
%endif
-if [ -d "/usr/include/python3.6m" ]; then
- EXTRA_INCLUDES="/usr/include/python3.6m:${EXTRA_INCLUDES}"
-fi
+# Force python version
+export PYTHON=%{__python}
# Warning: GCC visibility causes FTBFS [Bug #1285]
%configure \
@@ -1171,6 +1186,11 @@ fi
%{?with_java:--with-java=%{java_home}} %{!?with_java:--without-java} \
%{?with_qscintilla:--enable-qscintilla} %{!?with_qscintilla:--disable-qscintilla}
+# Ensure python was detected properly
+if grep "LIBPYTHON=''" "config.log"; then
+ exit 1
+fi
+
# Build dcopperl with specific options
pushd dcopperl
CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL INSTALLDIRS=vendor INSTALLVENDORMAN3DIR=%{tde_mandir}/man3
diff --git a/redhat/core/tdeedu/tdeedu.spec b/redhat/core/tdeedu/tdeedu.spec
index 7bbef35e9..7cb4d8318 100644
--- a/redhat/core/tdeedu/tdeedu.spec
+++ b/redhat/core/tdeedu/tdeedu.spec
@@ -22,7 +22,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 tdeedu
%define tde_prefix /opt/trinity
@@ -81,13 +81,21 @@ BuildRequires: fdupes
BuildRequires: doxygen
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# LIBUSB support
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
@@ -103,7 +111,7 @@ BuildRequires: libusb-devel
%endif
# PYTHON3 support
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150100 || 0%{?mgaversion} >= 8
+%if 0%{?rhel} >= 7 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150100 || 0%{?mgaversion} >= 8
%global python python3
%global __python %__python3
%global python_sitearch %{python3_sitearch}
@@ -123,8 +131,12 @@ BuildRequires: %{_lib}boost_python3-devel
BuildRequires: libboost_%{python}-devel
%endif
%if 0%{?fedora} || 0%{?rhel}
+%if 0%{?rhel} == 7
+BuildRequires: boost-python36-devel
+%else
BuildRequires: boost-%{python}-devel
%endif
+%endif
# OCAML support
%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
@@ -1153,7 +1165,7 @@ sed -i "kig/pykig/pykig.py" \
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/core/tdegames/tdegames.spec b/redhat/core/tdegames/tdegames.spec
index 273705e9f..26bb8d057 100644
--- a/redhat/core/tdegames/tdegames.spec
+++ b/redhat/core/tdegames/tdegames.spec
@@ -22,7 +22,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 tdegames
%define tde_prefix /opt/trinity
@@ -97,13 +97,26 @@ BuildRequires: gamin-devel
%endif
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# ATTR support
-BuildRequires: libattr-devel
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%define libattr_devel %{_lib}attr-devel
+%else
+%define libattr_devel libattr-devel
+%endif
+BuildRequires: %{libattr_devel}
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -1183,7 +1196,7 @@ if [ -d "/usr/X11R6" ]; then
export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/core/tdegraphics/tdegraphics.spec b/redhat/core/tdegraphics/tdegraphics.spec
index 1be2d079d..67a60e45f 100644
--- a/redhat/core/tdegraphics/tdegraphics.spec
+++ b/redhat/core/tdegraphics/tdegraphics.spec
@@ -18,7 +18,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 tdegraphics
%define tde_prefix /opt/trinity
@@ -95,29 +95,49 @@ BuildRequires: libusb-devel
%endif
# MNG support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}mng-devel
+%else
BuildRequires: libmng-devel
+%endif
# TIFF support
-BuildRequires: libtiff-devel
+%if 0%{?mdkver}
+BuildRequires: %{_lib}tiff-devel
+%else
+BuildRequires: libtiff-devel
+%endif
# PCRE support
BuildRequires: pcre-devel
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# GIF support
%if 0%{?suse_version} || 0%{?fedora} >= 28 || 0%{?rhel} >= 8
BuildRequires: giflib-devel
%else
+%if 0%{?mdkver}
+BuildRequires: %{_lib}gif-devel
+%else
BuildRequires: libungif-devel
%endif
+%endif
# GPHOTO2 support
-%if 0%{?suse_version}
-BuildRequires: libgphoto2-devel
+%if 0%{?rhel} == 4 || 0%{?rhel} == 5 || 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mdkver}
+BuildRequires: %{_lib}gphoto-devel
%else
-BuildRequires: gphoto2-devel
+BuildRequires: gphoto2-devel
+%endif
+%else
+BuildRequires: libgphoto2-devel
%endif
# PAPER support
@@ -169,7 +189,7 @@ BuildRequires: xorg-x11-libXmu-devel
BuildRequires: libXmu-devel
%endif
%if 0%{?mdkversion} || 0%{?mgaversion} >= 4
-BuildRequires: libxmu-devel
+BuildRequires: %{_lib}xmu-devel
%endif
%if 0%{?mgaversion} == 2 || 0%{?mgaversion} == 3
BuildRequires: %{_lib}xmu%{?mgaversion:6}-devel
@@ -181,8 +201,12 @@ BuildRequires: mesa-libGL-devel
BuildRequires: mesa-libGLU-devel
%endif
%if 0%{?mdkversion} || 0%{?mgaversion}
+%if 0%{?mdkver} >= 24090000
+BuildRequires: %{_lib}glu-devel
+%else
BuildRequires: mesaglu-devel
%endif
+%endif
%if 0%{?suse_version}
BuildRequires: Mesa-libGL-devel
BuildRequires: Mesa-libGLU-devel
@@ -195,11 +219,19 @@ BuildRequires: xorg-x11-Mesa-libGLU
%if 0%{?rhel} == 4
BuildRequires: xorg-x11-devel
%else
+%if 0%{?mdkver}
+BuildRequires: %{_lib}drm-devel
+%else
BuildRequires: libdrm-devel
%endif
+%endif
# OPENEXR support
+%if 0%{?mdkver} >= 24090000
+BuildRequires: %{_lib}openexr-devel
+%else
BuildRequires: OpenEXR-devel
+%endif
# POPPLER support
%define with_pdf 1
@@ -231,7 +263,11 @@ BuildRequires: lcms-devel
BuildRequires: fribidi-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# kamera
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
@@ -1058,7 +1094,7 @@ if [ -d /usr/X11R6 ]; then
export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/core/tdelibs/tdelibs.spec b/redhat/core/tdelibs/tdelibs.spec
index e66e5d75c..df2eaf1d3 100644
--- a/redhat/core/tdelibs/tdelibs.spec
+++ b/redhat/core/tdelibs/tdelibs.spec
@@ -22,7 +22,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 tdelibs
%define tde_prefix /opt/trinity
@@ -105,25 +105,49 @@ BuildRequires: brp-check-trinity
BuildRequires: krb5-devel
# XSLT support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}xslt-devel
+%else
BuildRequires: libxslt-devel
+%endif
# ALSA support
-BuildRequires: alsa-lib-devel
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires: %{_lib}asound-devel
+%else
+BuildRequires: alsa-lib-devel
+%endif
# IDN support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires: %{_lib}idn-devel
+%else
BuildRequires: libidn-devel
+%endif
# CUPS support
BuildRequires: cups-devel
# TIFF support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires: %{_lib}tiff-devel
+%else
BuildRequires: libtiff-devel
+%endif
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# ACL support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# GLIB2 support
BuildRequires: glib2-devel
@@ -148,8 +172,12 @@ BuildRequires: gamin-devel
# PCRE support
%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%define with_pcre 1
+%if 0%{?mgaversion} >= 9
+BuildRequires: %{_lib}pcre-devel
+%else
BuildRequires: pcre-devel
%endif
+%endif
# INOTIFY support
%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
@@ -214,7 +242,12 @@ Requires: avahi
# OPENEXR support
%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%define with_openexr 1
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openexr-devel
+%else
BuildRequires: OpenEXR-devel
+%endif
+
%if 0%{?pclinuxos}
BuildRequires: libpthread-stubs
%endif
@@ -241,10 +274,12 @@ BuildRequires: xorg-x11-devel
%endif
# ICEAUTH
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} >= 1220 || 0%{?fedora} >= 34
+%if 0%{?fedora} >= 34 || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?rhel} >= 9 || 0%{?suse_version} >= 1220
Requires: iceauth
BuildRequires: iceauth
%endif
+
+# Xorg
%if 0%{?rhel} >= 5 || ( 0%{?fedora} && 0%{?fedora} <= 33 )
Requires: xorg-x11-server-utils
BuildRequires: xorg-x11-server-utils
@@ -276,8 +311,8 @@ Requires: ca-certificates
%define cacert %{_sysconfdir}/ssl/certs/ca-certificates.crt
%endif
%endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos} || 0%{?mgaversion} >= 8
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?mdkver}
+%if 0%{?pclinuxos} || 0%{?mgaversion} >= 8 || 0%{?mdkver}
Requires: rootcerts
%define cacert %{_sysconfdir}/pki/tls/certs/ca-bundle.crt
%else
@@ -322,22 +357,26 @@ Requires: %{cacert}
%define xt_devel libXt-devel
%endif
%if 0%{?mgaversion} || 0%{?mdkversion}
-%define xt_devel libxt-devel
+%define xt_devel %{_lib}xt-devel
%endif
%{?xt_devel:BuildRequires: %{xt_devel}}
### New features in TDE R14
# LIBMAGIC support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}magic-devel
+%else
%if 0%{?rhel} != 5
BuildRequires: file-devel
%endif
+%endif
# NETWORKMANAGER support
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?suse_version}
%define with_nm 1
%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?mgaversion} != 8
+%if 0%{?mgaversion} && 0%{?mgaversion} <= 7
BuildRequires: %{_lib}nm-util-devel
%endif
%endif
@@ -356,8 +395,12 @@ BuildRequires: NetworkManager-devel
# UDEV support
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
%define with_tdehwlib 1
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: %{_lib}udev-devel
+%else
BuildRequires: libudev-devel
%endif
+%endif
# HAL support
%if 0%{?rhel} == 5
@@ -377,15 +420,23 @@ Requires: udisks
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 7
%define with_udisks2 1
%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
-BuildRequires: libudisks2-devel
-%else
+%define udisks2 udisks2
+%define udisks2_devel libudisks2-devel
+%endif
%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150300
-BuildRequires: libudisks2-0-devel
-%else
-BuildRequires: udisks2-devel
+%define udisks2 udisks2
+%define udisks2_devel libudisks2-0-devel
%endif
+%if 0%{?mdkversion} || 0%{?mgaversion}
+%define udisks2 udisks2
+%define udisks2_devel udisks2-devel
%endif
-Requires: udisks2
+%if 0%{?mdkver}
+%define udisks2 udisks
+%define udisks2_devel %{_lib}udisks-devel
+%endif
+Requires: %{udisks2}
+BuildRequires: %{udisks2_devel}
%endif
# DEVICEKIT POWER support
@@ -443,7 +494,12 @@ BuildRequires: libr-devel >= 0.6.0
%endif
# ATTR support
-BuildRequires: libattr-devel
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%define libattr_devel %{_lib}attr-devel
+%else
+%define libattr_devel libattr-devel
+%endif
+BuildRequires: %{libattr_devel}
# INTLTOOL support
BuildRequires: intltool
@@ -593,7 +649,7 @@ Requires: libtqt3-mt-devel >= 3.5.0
Requires: libtqt4-devel = %{tde_epoch}:4.2.0
Requires: trinity-arts-devel >= %{tde_epoch}:1.5.10
Requires: libart_lgpl-devel
-Requires: libattr-devel
+Requires: %{libattr_devel}
Requires: intltool
%{?xcomposite_devel:Requires: %{xcomposite_devel}}
%{?xt_devel:Requires: %{xt_devel}}
@@ -647,7 +703,7 @@ fi
export TDEDIR="%{tde_prefix}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/core/tdemultimedia/tdemultimedia.spec b/redhat/core/tdemultimedia/tdemultimedia.spec
index 08056f129..4aa7a0d1a 100644
--- a/redhat/core/tdemultimedia/tdemultimedia.spec
+++ b/redhat/core/tdemultimedia/tdemultimedia.spec
@@ -22,7 +22,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 tdemultimedia
%define tde_prefix /opt/trinity
@@ -111,21 +111,48 @@ BuildRequires: zlib-devel
#BuildRequires: libmusicbrainz-devel libtunepimp-devel
# Audio libraries
-BuildRequires: libvorbis-devel
BuildRequires: audiofile-devel
-BuildRequires: libtheora-devel
-BuildRequires: alsa-lib-devel
BuildRequires: cdparanoia
#BuildRequires: libmpg123-devel
+# VORBIS support
+%if 0%{?mdkver} || 0%{?mgaversion}
+%define libvorbis_devel %{_lib}vorbis-devel
+%else
+%define libvorbis_devel libvorbis-devel
+%endif
+BuildRequires: %{libvorbis_devel}
+
+# THEORA
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires: %{_lib}theora-devel
+%else
+BuildRequires: libtheora-devel
+%endif
+
+# ALSA support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}asound-devel
+%else
+BuildRequires: alsa-lib-devel
+%endif
+
# CDDA support
%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mdkver}
+BuildRequires: %{_lib}cdda-devel
+%else
BuildRequires: libcdda-devel
%endif
+%endif
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
BuildRequires: cdparanoia-devel
%endif
+# CDIO support
+BuildRequires: libcdio-devel
+BuildRequires: libcdio-paranoia-devel
+
# FLAC support
%if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?pclinuxos}
@@ -140,9 +167,14 @@ BuildRequires: flac-devel
# GSTREAMER support
%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mdkver}
+BuildRequires: %{_lib}gstreamer-devel
+BuildRequires: %{_lib}gst-plugins-base1.0-devel
+%else
BuildRequires: %{_lib}gstreamer1.0-devel
BuildRequires: %{_lib}gstreamer-plugins-base1.0-devel
%endif
+%endif
%if 0%{?rhel} == 4
BuildRequires: gstreamer-devel
BuildRequires: gstreamer-plugins-devel
@@ -178,8 +210,12 @@ BuildRequires: libXxf86vm-devel
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} || 0%{?suse_version}
%define with_xine 1
%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
+%if 0%{?mdkver}
+BuildRequires: %{_lib}xine-devel
+%else
BuildRequires: %{_lib}xine1.2-devel
%endif
+%endif
%if 0%{?fedora} || 0%{?rhel}
BuildRequires: xine-lib-devel
%endif
@@ -212,13 +248,26 @@ BuildRequires: libmp3lame-devel
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# ATTR support
-BuildRequires: libattr-devel
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%define libattr_devel %{_lib}attr-devel
+%else
+%define libattr_devel libattr-devel
+%endif
+BuildRequires: %{libattr_devel}
%if 0%{?fedora} || 0%{?rhel}
BuildRequires: lame-devel
@@ -787,6 +836,7 @@ This package contains audiofile plugins for aRts.
##########
%if 0%{?with_mpeg}
+
%package -n trinity-libarts-mpeglib
Summary: Mpeglib plugin for aRts, supporting mp3 and mpeg audio/video
Group: Productivity/Multimedia/Other
@@ -800,7 +850,7 @@ This is the arts (TDE Sound daemon) plugin.
%files -n trinity-libarts-mpeglib
%defattr(-,root,root,-)
%{tde_bindir}/mpeglibartsplay
-%{tde_libdir}/libarts_mpeglib-0.3.0.so*
+%{tde_libdir}/libarts_mpeglib-0.3.0.so.*
%{tde_libdir}/libarts_mpeglib.la
%{tde_libdir}/libarts_splay.so.*
%{tde_libdir}/libarts_splay.la
@@ -1004,6 +1054,7 @@ noatun plugins.
%{tde_libdir}/libarts_audiofile.so
%if 0%{?with_mpeg}
%{tde_libdir}/libarts_mpeglib.so
+%{tde_libdir}/libarts_mpeglib-0.3.0.so
%{tde_libdir}/libarts_splay.so
%endif
%if 0%{?with_xine}
@@ -1067,7 +1118,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/core/tdenetwork/tdenetwork.spec b/redhat/core/tdenetwork/tdenetwork.spec
index 2dd26ce3e..0a6e431ca 100644
--- a/redhat/core/tdenetwork/tdenetwork.spec
+++ b/redhat/core/tdenetwork/tdenetwork.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 tdenetwork
%define tde_prefix /opt/trinity
@@ -114,7 +114,11 @@ Requires: avahi
%endif
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# TLS support
BuildRequires: gnutls-devel
@@ -129,8 +133,12 @@ BuildRequires: sqlite-devel
# GADU support
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
%define with_gadu 1
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires: %{_lib}gadu-devel
+%else
BuildRequires: libgadu-devel
%endif
+%endif
# PCRE support
BuildRequires: pcre-devel
@@ -158,7 +166,7 @@ BuildRequires: xorg-x11-libXmu-devel
BuildRequires: libXmu-devel
%endif
%if 0%{?mdkversion} || 0%{?mgaversion} >= 4
-BuildRequires: libxmu-devel
+BuildRequires: %{_lib}xmu-devel
%endif
%if 0%{?mgaversion} == 2 || 0%{?mgaversion} == 3
BuildRequires: %{_lib}xmu%{?mgaversion:6}-devel
@@ -177,18 +185,24 @@ BuildRequires: libXxf86vm-devel
#define _with_xmms --with-xmms
# Wifi support
-%define with_wifi 1
%if 0%{?fedora} >= 6 || 0%{?rhel} >= 5
-BuildRequires: wireless-tools-devel
+%define wifi_devel wireless-tools-devel
%endif
%if 0%{?mgaversion} == 2 || 0%{?mdkversion}
-BuildRequires: %{_lib}iw29-devel
+%define wifi_devel %{_lib}iw29-devel
%endif
%if 0%{?rhel} == 5 || 0%{?suse_version}
-BuildRequires: wireless-tools
+%define wifi_devel wireless-tools
%endif
%if 0%{?suse_version} || 0%{?mgaversion} >= 3
-BuildRequires: libiw-devel
+%define wifi_devel libiw-devel
+%endif
+%if 0%{?mdkver}
+%define wifi_devel %nil
+%endif
+%if "%{wifi_devel}" != ""
+%define with_wifi 1
+BuildRequires: %{wifi_devel}
%endif
# OpenSLP support
@@ -217,7 +231,13 @@ BuildRequires: kernel-headers
# XML support
BuildRequires: libxml2-devel
+
+# XSLT support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}xslt-devel
+%else
BuildRequires: libxslt-devel
+%endif
#jabber
BuildRequires: libidn-devel
@@ -234,7 +254,11 @@ BuildRequires: speex-devel
#Requires: jasper
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# MEANWHILE support
%if 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?fedora} >= 15 || 0%{?suse_version}
@@ -715,7 +739,7 @@ Support for more IM protocols can be added through a plugin system.
%endif
# smpp plugin for kopete
%{tde_datadir}/config.kcfg/smpppdcs.kcfg
-# aim support is deprecated in TDE 14.1.0
+# aim support is deprecated in TDE 14.1.x
%if 0%{?with_aim}
%{tde_datadir}/icons/crystalsvg/*/apps/aim_protocol.png
%{tde_datadir}/icons/crystalsvg/*/actions/aim_away.png
@@ -1062,6 +1086,7 @@ A tdeioslave and tded module that provide Zeroconf support. Try
%{tde_datadir}/apps/zeroconf/_nfs._tcp
%{tde_datadir}/apps/zeroconf/_ssh._tcp
%{tde_datadir}/apps/zeroconf/_rfb._tcp
+%{tde_datadir}/apps/zeroconf/_sftp-ssh._tcp
%{tde_tdelibdir}/tdeio_zeroconf.so
%{tde_tdelibdir}/tdeio_zeroconf.la
%{tde_tdelibdir}/kded_dnssdwatcher.so
@@ -1099,7 +1124,7 @@ if [ -d /usr/X11R6 ]; then
export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/core/tdepim/tdepim.spec b/redhat/core/tdepim/tdepim.spec
index e3a9f483e..de1c98944 100644
--- a/redhat/core/tdepim/tdepim.spec
+++ b/redhat/core/tdepim/tdepim.spec
@@ -22,7 +22,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 tdepim
%define tde_prefix /opt/trinity
@@ -75,15 +75,38 @@ BuildRequires: desktop-file-utils
BuildRequires: make
BuildRequires: gpgme-devel
-BuildRequires: libgpg-error-devel
BuildRequires: flex
-BuildRequires: libical-devel
BuildRequires: boost-devel
BuildRequires: pcre-devel
BuildRequires: libidn-devel
+# ICAL support
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: %{_lib}ical-devel
+%else
+BuildRequires: libical-devel
+%endif
+
+# GPG-ERROR support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}gpg-error-devel
+%else
+BuildRequires: libgpg-error-devel
+%endif
+
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
+
+# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
+BuildRequires: libacl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -126,8 +149,12 @@ BuildRequires: curl-devel
BuildRequires: glib2-devel
# SASL support
-%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
+%if 0%{?mdkver}
+BuildRequires: %{_lib}sasl-devel
+%else
BuildRequires: %{_lib}sasl2-devel
+%endif
%else
BuildRequires: cyrus-sasl-devel
%endif
@@ -187,9 +214,6 @@ BuildRequires: xscreensaver-gl
%endif
%endif
-# ACL support
-BuildRequires: libacl-devel
-
Requires: trinity-libtdepim = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: %{name}-kfile-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -835,8 +859,12 @@ Requires: gnupg2
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
Requires: pinentry
+%if 0%{?mdkver}
+Requires: gnupg
+%else
Requires: dirmngr
%endif
+%endif
%description -n trinity-kleopatra
Kleopatra is the TDE tool for managing X.509 certificates in the gpgsm
@@ -1845,7 +1873,7 @@ if [ -d "/usr/X11R6" ]; then
export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/core/tdesdk/tdesdk.spec b/redhat/core/tdesdk/tdesdk.spec
index 53dfffc6e..8d1ac42b6 100644
--- a/redhat/core/tdesdk/tdesdk.spec
+++ b/redhat/core/tdesdk/tdesdk.spec
@@ -22,7 +22,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 tdesdk
%define tde_prefix /opt/trinity
@@ -80,7 +80,11 @@ BuildRequires: brp-check-trinity
%endif
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
@@ -117,12 +121,21 @@ BuildRequires: libdb-4_8-devel
# kbabel, F-7+: flex >= 2.5.33-9
BuildRequires: flex
+%if 0%{?mdkver}
+BuildRequires: flex-devel
+%endif
# umbrello
-BuildRequires: libxslt-devel
BuildRequires: libxml2-devel
BuildRequires: subversion-devel
BuildRequires: neon-devel
+# XSLT support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}xslt-devel
+%else
+BuildRequires: libxslt-devel
+%endif
+
# PERL support
BuildRequires: perl
%if 0%{?fedora} >= 19
@@ -130,7 +143,11 @@ BuildRequires: perl-podlators
%endif
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# PYTHON support
%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30 || 0%{?mgaversion} >= 8
@@ -1092,7 +1109,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/core/tdetoys/tdetoys.spec b/redhat/core/tdetoys/tdetoys.spec
index eb823346d..48cf7218a 100644
--- a/redhat/core/tdetoys/tdetoys.spec
+++ b/redhat/core/tdetoys/tdetoys.spec
@@ -21,7 +21,7 @@
# TDE variables
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg tdetoys
%define tde_prefix /opt/trinity
@@ -93,13 +93,21 @@ BuildRequires: gamin-devel
%endif
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# PCRE support
BuildRequires: pcre-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
Obsoletes: trinity-kdetoys < %{?epoch:%{epoch}:}%{version}-%{release}
@@ -399,7 +407,7 @@ This package is part of Trinity, and a component of the TDE toys module.
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/core/tdeutils/tdeutils.spec b/redhat/core/tdeutils/tdeutils.spec
index eb42326d0..cd0c99dd7 100644
--- a/redhat/core/tdeutils/tdeutils.spec
+++ b/redhat/core/tdeutils/tdeutils.spec
@@ -21,7 +21,7 @@
# TDE variables
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg tdeutils
%define tde_prefix /opt/trinity
@@ -85,7 +85,9 @@ BuildRequires: net-snmp-devel
BuildRequires: gmp-devel
# PYTHON support
+%if "%{python}" == ""
%global python python3
+%endif
%global __python %__python3
%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
BuildRequires: %{python}
@@ -139,7 +141,11 @@ BuildRequires: pcre-devel
%endif
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# XSCREENSAVER support
# RHEL 8: available in EPEL
@@ -159,7 +165,11 @@ BuildRequires: %{_lib}xscrnsaver%{?mgaversion:1}-devel
%endif
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# CONSOLEHELPER (usermode) support
%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
@@ -169,9 +179,8 @@ BuildRequires: openssl-devel
%define dont_relink 1
%endif
-%if "%{?tde_version}" == "14.1.0"
+%define build_superkaramba 1
%define build_tdefilereplace 1
-%endif
Requires: trinity-ark = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: trinity-kcalc = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -191,7 +200,9 @@ Requires: trinity-kregexpeditor = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: trinity-ksim = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: trinity-ktimer = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: trinity-tdewalletmanager = %{?epoch:%{epoch}:}%{version}-%{release}
+%if 0%{?build_superkaramba}
Requires: trinity-superkaramba = %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
%if 0%{?build_tdefilereplace}
Requires: trinity-tdefilereplace = %{?epoch:%{epoch}:}%{version}-%{release}
%endif
@@ -756,6 +767,8 @@ keeps a master password to all wallets.
##########
+%if 0%{?build_superkaramba}
+
%package -n trinity-superkaramba
Summary: A program based on karamba improving the eyecandy of TDE
Group: Applications/Utilities
@@ -785,6 +798,8 @@ Here are just some examples of the things that can be done:
%{tde_tdedocdir}/HTML/en/superkaramba/
%{tde_mandir}/man1/superkaramba.1*
+%endif
+
##########
%if 0%{?build_tdefilereplace}
@@ -870,7 +885,7 @@ This package contains the development files for tdeutils.
%prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-%if 0%{?rhel} == 5
+%if 0%{?rhel} == 5 && 0%{?build_superkaramba}
# Reverts some older Python stuff
%__sed -i "superkaramba/src/"*".cpp" \
-e "s|PyBytes_CheckExact|PyString_CheckExact|g" \
@@ -890,7 +905,7 @@ if [ -d "/usr/X11R6" ]; then
export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -914,6 +929,11 @@ fi
-DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
-DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
\
+%if 0%{?fedora} == 39
+ -DPYTHON_LIBRARY="%{_libdir}/libpython3.11.so.1.0" \
+ -DPYTHON_INCLUDE_DIR="%{_includedir}/python3.11" \
+%endif
+ \
-DWITH_DPMS=ON \
%{?with_xscreensaver:-DWITH_XSCREENSAVER=ON} \
-DWITH_ASUS=ON \
@@ -928,6 +948,8 @@ fi
-DWITH_TDENEWSTUFF=ON \
-DBUILD_ALL=ON \
%{?!build_klaptopdaemon:-DBUILD_KLAPTOPDAEMON=OFF} \
+ %{?!build_superkaramba:-DBUILD_SUPERKARAMBA=OFF} \
+ %{?!build_tdefilereplace:-DBUILD_TDEFILEREPLACE=OFF} \
..
%__make %{?_smp_mflags} || %__make
@@ -971,14 +993,18 @@ export PATH="%{tde_bindir}:${PATH}"
# Fix desktop shortcut location
if [ -d "%{?buildroot}%{tde_datadir}/applnk" ]; then
%__mkdir_p "%{?buildroot}%{tde_tdeappdir}"
+%if 0%{?build_superkaramba}
%__mv "%{?buildroot}%{tde_datadir}/applnk/Utilities/superkaramba.desktop" "%{?buildroot}%{tde_tdeappdir}/superkaramba.desktop"
+%endif
%__rm -rf "%{?buildroot}%{tde_datadir}/applnk"
fi
# Updates applications categories for openSUSE
%if 0%{?suse_version}
%suse_update_desktop_file KEdit Utility TextEditor
+%if 0%{?build_superkaramba}
%suse_update_desktop_file superkaramba Utility DesktopUtility
+%endif
%suse_update_desktop_file KCharSelect Utility Accessibility
%suse_update_desktop_file khexedit Utility Editor
%suse_update_desktop_file Kjots Utility TimeUtility
diff --git a/redhat/core/tdevelop/tdevelop.spec b/redhat/core/tdevelop/tdevelop.spec
index 5730a8207..3f718693b 100644
--- a/redhat/core/tdevelop/tdevelop.spec
+++ b/redhat/core/tdevelop/tdevelop.spec
@@ -22,7 +22,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 tdevelop
%define tde_prefix /opt/trinity
@@ -137,8 +137,12 @@ BuildRequires: neon-devel
# OPENLDAP support
%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
+%if 0%{?mdkver}
+BuildRequires: lib64ldap-devel
+%else
BuildRequires: openldap-devel
%endif
+%endif
%if 0%{?suse_version}
BuildRequires: openldap2-devel
%endif
@@ -148,11 +152,20 @@ BuildRequires: openldap24-libs-devel
# LIBACL support
%if 0%{?suse_version} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
%endif
+%endif
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# PYTHON support
%global python python3
@@ -317,8 +330,6 @@ individual needs.
%{tde_tdelibdir}/libkdevphpsupport.so
%{tde_tdelibdir}/libkdevpythonsupport.la
%{tde_tdelibdir}/libkdevpythonsupport.so
-%{tde_tdelibdir}/libkdevqt4importer.la
-%{tde_tdelibdir}/libkdevqt4importer.so
%{tde_tdelibdir}/libkdevqtimporter.la
%{tde_tdelibdir}/libkdevqtimporter.so
%{tde_tdelibdir}/libkdevquickopen.la
@@ -437,7 +448,6 @@ individual needs.
%{tde_datadir}/services/kdevpghpfoptions.desktop
%{tde_datadir}/services/kdevphpsupport.desktop
%{tde_datadir}/services/kdevpythonsupport.desktop
-%{tde_datadir}/services/kdevqt4importer.desktop
%{tde_datadir}/services/kdevqtimporter.desktop
%{tde_datadir}/services/kdevquickopen.desktop
%{tde_datadir}/services/kdevrbdebugger.desktop
@@ -520,7 +530,6 @@ individual needs.
%{tde_libdir}/libkinterfacedesigner.so.0.0.0
%{tde_tdelibdir}/libkdevvisualboyadvance.la
%{tde_tdelibdir}/libkdevvisualboyadvance.so
-%{tde_datadir}/apps/kdevdesignerpart/pics/
%{tde_datadir}/apps/kdevvisualboyadvance/
%{tde_tdedocdir}/HTML/en/tde_app_devel/
%{tde_datadir}/mimelnk/text/x-fortran.desktop
@@ -625,7 +634,7 @@ if [ -d "/usr/include/openldap24" ]; then
fi
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/core/tdewebdev/tdewebdev.spec b/redhat/core/tdewebdev/tdewebdev.spec
index 58bc4c371..d0ce64cce 100644
--- a/redhat/core/tdewebdev/tdewebdev.spec
+++ b/redhat/core/tdewebdev/tdewebdev.spec
@@ -22,7 +22,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 tdewebdev
%define tde_prefix /opt/trinity
@@ -82,7 +82,12 @@ BuildRequires: update-desktop-files
BuildRequires: brp-check-trinity
%endif
+# XSLT support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}xslt-devel
+%else
BuildRequires: libxslt-devel
+%endif
%if 0%{?rhel} == 4
# a bogus dep in libexslt.la file from EL-4 (WONTFIX bug http://bugzilla.redhat.com/142241)
@@ -99,14 +104,16 @@ BuildRequires: libxml2-devel
#endif
# ICU support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}icu-devel
+%else
BuildRequires: libicu-devel
+%endif
# Readline support
BuildRequires: readline-devel
-%if "%{?tde_version}" != "14.1.0"
-%define build_tdefilereplace 1
-%endif
+%define build_tdefilereplace 0
Obsoletes: trinity-kdewebdev-libs < %{?epoch:%{epoch}:}%{version}-%{release}
Provides: trinity-kdewebdev-libs = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -460,7 +467,7 @@ Requires: trinity-kommander-devel = %{?epoch:%{epoch}:}%{version}-%{release}
unset QTDIR QTLIB QTINC
export PATH="%{tde_bindir}:${PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi