From 12dcc700a83c4c76187e9bbcd046a032a202872e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Tue, 2 Mar 2021 19:50:55 +0100 Subject: RPM: add support for Mageia 8 --- redhat/main/tdeaddons/tdeaddons.spec | 11 +++++------ redhat/main/tdebase/pamd.kcheckpass-trinity.mga8 | 5 +++++ redhat/main/tdebase/pamd.kdm-trinity-np.mga8 | 11 +++++++++++ redhat/main/tdebase/pamd.kdm-trinity.mga8 | 15 +++++++++++++++ redhat/main/tdebase/pamd.kscreensaver-trinity.mga8 | 5 +++++ redhat/main/tdebase/tdebase.spec | 4 +++- redhat/main/tdebase/tdm.service.mga8 | 12 ++++++++++++ redhat/main/tdebindings/tdebindings.spec | 4 +--- redhat/main/tdeedu/tdeedu.spec | 4 ++-- redhat/main/tdegames/tdegames.spec | 2 +- redhat/main/tdelibs/tdelibs.spec | 2 ++ redhat/main/tdesdk/tdesdk.spec | 4 ++-- redhat/main/tdevelop/tdevelop.spec | 15 +++++++++++++++ 13 files changed, 79 insertions(+), 15 deletions(-) create mode 100644 redhat/main/tdebase/pamd.kcheckpass-trinity.mga8 create mode 100644 redhat/main/tdebase/pamd.kdm-trinity-np.mga8 create mode 100644 redhat/main/tdebase/pamd.kdm-trinity.mga8 create mode 100644 redhat/main/tdebase/pamd.kscreensaver-trinity.mga8 create mode 100644 redhat/main/tdebase/tdm.service.mga8 (limited to 'redhat/main') diff --git a/redhat/main/tdeaddons/tdeaddons.spec b/redhat/main/tdeaddons/tdeaddons.spec index e72a720b8..86758cc50 100644 --- a/redhat/main/tdeaddons/tdeaddons.spec +++ b/redhat/main/tdeaddons/tdeaddons.spec @@ -137,11 +137,10 @@ BuildRequires: db4-devel #BuildRequires: xmms-devel #%endif -# PYTHON support -%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30 -%define python python3 -%else -%define python python +# PYTHON2 support +%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30 || 0%{?mgaversion} >= 8 +%global python %python2 +%global __python %__python2 %endif Requires: trinity-atlantikdesigner = %{version}-%{release} @@ -666,7 +665,7 @@ of user interfaces, playlists and visualisation plugins. %prep %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} -%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 +%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 || 0%{?mgaversion} >= 8 # Fix shebangs sed -i "knewsticker-scripts/sportscores.py" \ "konq-plugins/imagerotation/orient.py" \ diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.mga8 b/redhat/main/tdebase/pamd.kcheckpass-trinity.mga8 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.mga8 @@ -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/main/tdebase/pamd.kdm-trinity-np.mga8 b/redhat/main/tdebase/pamd.kdm-trinity-np.mga8 new file mode 100644 index 000000000..f884c1de6 --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity-np.mga8 @@ -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/main/tdebase/pamd.kdm-trinity.mga8 b/redhat/main/tdebase/pamd.kdm-trinity.mga8 new file mode 100644 index 000000000..cb0982c9a --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity.mga8 @@ -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/main/tdebase/pamd.kscreensaver-trinity.mga8 b/redhat/main/tdebase/pamd.kscreensaver-trinity.mga8 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.mga8 @@ -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/main/tdebase/tdebase.spec b/redhat/main/tdebase/tdebase.spec index f8f5131f1..48a837c3e 100644 --- a/redhat/main/tdebase/tdebase.spec +++ b/redhat/main/tdebase/tdebase.spec @@ -775,7 +775,7 @@ BuildRequires: libr-devel >= 0.6.0 %endif # RPC support -%if 0%{?fedora} >= 28 || 0%{?suse_version} >= 1500 +%if 0%{?fedora} >= 28 || 0%{?suse_version} >= 1500 || 0%{?mgaversion} >= 8 BuildRequires: libtirpc-devel BuildRequires: rpcgen %if 0%{?fedora} @@ -1486,7 +1486,9 @@ TDE applications, particularly those in the TDE base module. %{tde_libdir}/libtdeinit_kxkb.la %{tde_libdir}/libtdeinit_kxkb.so %{tde_libdir}/libkhotkeys_shared.so.* +%if "%{?tde_version}" != "14.0.9" %{tde_tdeappdir}/kdcop.desktop +%endif %{tde_tdeappdir}/keyboard.desktop %{tde_tdeappdir}/keyboard_layout.desktop %{tde_tdeappdir}/khotkeys.desktop diff --git a/redhat/main/tdebase/tdm.service.mga8 b/redhat/main/tdebase/tdm.service.mga8 new file mode 100644 index 000000000..eda2906e2 --- /dev/null +++ b/redhat/main/tdebase/tdm.service.mga8 @@ -0,0 +1,12 @@ +[Unit] +Description=Trinity Display Manager +Documentation=man:tdm(1) +Conflicts=getty@tty1.service +After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service systemd-logind.service + +[Service] +ExecStart=/opt/trinity/bin/tdm +Restart=always + +[Install] +Alias=display-manager.service diff --git a/redhat/main/tdebindings/tdebindings.spec b/redhat/main/tdebindings/tdebindings.spec index 56fa574eb..3ad5c7b30 100644 --- a/redhat/main/tdebindings/tdebindings.spec +++ b/redhat/main/tdebindings/tdebindings.spec @@ -169,12 +169,10 @@ BuildRequires: Mesa-libGLU-devel %endif # PYTHON support -%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 +%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8 %global python python2 %global __python %__python2 %global python_sitearch %{python2_sitearch} -%else -%global python python %endif %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} BuildRequires: %{python} diff --git a/redhat/main/tdeedu/tdeedu.spec b/redhat/main/tdeedu/tdeedu.spec index 8600f114f..5bc1dfcc9 100644 --- a/redhat/main/tdeedu/tdeedu.spec +++ b/redhat/main/tdeedu/tdeedu.spec @@ -98,7 +98,7 @@ BuildRequires: libusb-devel %endif # PYTHON3 support -%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150100 +%if 0%{?rhel} >= 8 || 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} @@ -1137,7 +1137,7 @@ This package contains the development files for tdeedu. %prep %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} -%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 +%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 || 0%{?mgaversion} >= 8 # Fix shebangs sed -i "kig/pykig/pykig.py" \ -e "s|env python|env %{python}|" diff --git a/redhat/main/tdegames/tdegames.spec b/redhat/main/tdegames/tdegames.spec index 1d5bd97b2..1abe6ffbc 100644 --- a/redhat/main/tdegames/tdegames.spec +++ b/redhat/main/tdegames/tdegames.spec @@ -191,7 +191,6 @@ TDE desktop. %defattr(-,root,root,-) %{tde_datadir}/cmake/libtdegames.cmake %{tde_libdir}/pkgconfig/libtdegames.pc -%{tde_mandir}/man*/atlantik.* ########## @@ -279,6 +278,7 @@ This package is part of Trinity, and a component of the TDE games module. %{tde_datadir}/icons/hicolor/*/apps/atlantik.png %{tde_datadir}/apps/atlantik/ %{tde_tdedocdir}/HTML/en/atlantik/ +%{tde_mandir}/man*/atlantik.* ########## diff --git a/redhat/main/tdelibs/tdelibs.spec b/redhat/main/tdelibs/tdelibs.spec index d926a3883..8d08a808e 100644 --- a/redhat/main/tdelibs/tdelibs.spec +++ b/redhat/main/tdelibs/tdelibs.spec @@ -335,8 +335,10 @@ BuildRequires: file-devel %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 BuildRequires: %{_lib}nm-util-devel %endif +%endif %if 0%{?rhel} >= 6 || 0%{?fedora} %if 0%{?fedora} >= 29 || 0%{?rhel} >= 8 BuildRequires: NetworkManager-libnm-devel diff --git a/redhat/main/tdesdk/tdesdk.spec b/redhat/main/tdesdk/tdesdk.spec index ce219d87b..f69a3adcd 100644 --- a/redhat/main/tdesdk/tdesdk.spec +++ b/redhat/main/tdesdk/tdesdk.spec @@ -133,7 +133,7 @@ BuildRequires: perl-podlators BuildRequires: openssl-devel # PYTHON support -%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30 +%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30 || 0%{?mgaversion} >= 8 %define python python3 %else %define python python @@ -1020,7 +1020,7 @@ This package contains the development files for tdesdk. %prep %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} -%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 +%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 || 0%{?mgaversion} >= 8 # Fix shebangs sed -i "scripts/kdelnk2desktop.py" \ "scripts/zonetab2pot.py" \ diff --git a/redhat/main/tdevelop/tdevelop.spec b/redhat/main/tdevelop/tdevelop.spec index 7ee98f8d6..6839d6113 100644 --- a/redhat/main/tdevelop/tdevelop.spec +++ b/redhat/main/tdevelop/tdevelop.spec @@ -114,9 +114,15 @@ BuildRequires: libdb-devel %else # DB4 support +%if 0%{?mgaversion} || 0%{?mdkversion} +#BuildRequires: %{_lib}db4.8-devel +%endif %if 0%{?rhel} || 0%{?fedora} BuildRequires: db4-devel %endif +%if 0%{?suse_version} +BuildRequires: libdb-4_8-devel +%endif %endif # FLEX support @@ -148,6 +154,14 @@ BuildRequires: libacl-devel # OPENSSL support BuildRequires: openssl-devel +# PYTHON support +%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30 || 0%{?mgaversion} >= 8 +%global python python2 +%global __python python2 +%else +%global __python python2 +%endif + %description The TDevelop Integrated Development Environment provides many features @@ -598,6 +612,7 @@ This package contains the libraries needed for the tdevelop programs. %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} + %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -- cgit v1.2.3