summaryrefslogtreecommitdiffstats
path: root/redhat/main
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/main')
-rw-r--r--redhat/main/tdeaddons/tdeaddons.spec11
-rw-r--r--redhat/main/tdebase/pamd.kcheckpass-trinity.mga85
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity-np.mga811
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity.mga815
-rw-r--r--redhat/main/tdebase/pamd.kscreensaver-trinity.mga85
-rw-r--r--redhat/main/tdebase/tdebase.spec4
-rw-r--r--redhat/main/tdebase/tdm.service.mga812
-rw-r--r--redhat/main/tdebindings/tdebindings.spec4
-rw-r--r--redhat/main/tdeedu/tdeedu.spec4
-rw-r--r--redhat/main/tdegames/tdegames.spec2
-rw-r--r--redhat/main/tdelibs/tdelibs.spec2
-rw-r--r--redhat/main/tdesdk/tdesdk.spec4
-rw-r--r--redhat/main/tdevelop/tdevelop.spec15
13 files changed, 79 insertions, 15 deletions
diff --git a/redhat/main/tdeaddons/tdeaddons.spec b/redhat/main/tdeaddons/tdeaddons.spec
index 79e25bfa8..60086f993 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}
@@ -667,7 +666,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 0d5139fbb..67d78d852 100644
--- a/redhat/main/tdebase/tdebase.spec
+++ b/redhat/main/tdebase/tdebase.spec
@@ -780,7 +780,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}
@@ -1491,7 +1491,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 81783c492..f5d4b33c5 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 042811997..735435573 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 77a00fd4a..e16e57b8e 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 502ae9fe6..a3614b501 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 0cea687d0..eeb166d8e 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 2f2705d5c..41071bd12 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}"
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-22 10:36:54 +0000