RPM: update packages to build on Fedora 30, Mageia 7

14 files changed, 122 insertions, 1 deletions

diff --git a/redhat/main/tdeaddons/tdeaddons-14.0.0.spec b/redhat/main/tdeaddons/tdeaddons-14.0.0.spec
index 5d546fb8e..90ddfe3e6 100644
--- a/redhat/main/tdeaddons/tdeaddons-14.0.0.spec
+++ b/redhat/main/tdeaddons/tdeaddons-14.0.0.spec
@@ -664,6 +664,14 @@ of user interfaces, playlists and visualisation plugins.
 %prep
 %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
 
+%if 0%{?fedora} >= 30
+# Fix shebangs
+sed -i "knewsticker-scripts/sportscores.py" \
+       "konq-plugins/imagerotation/orient.py" \
+       "konq-plugins/imagerotation/exif.py" \
+    -e "s|env python|env python3|"
+%endif
+
 
 %build
 unset QTDIR QTINC QTLIB
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc30 b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc30
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc30
@@ -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.kcheckpass-trinity.mga7 b/redhat/main/tdebase/pamd.kcheckpass-trinity.mga7
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.mga7
@@ -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.fc30 b/redhat/main/tdebase/pamd.kdm-trinity-np.fc30
new file mode 100644
index 000000000..0616e66f6
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity-np.fc30
@@ -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/main/tdebase/pamd.kdm-trinity-np.mga7 b/redhat/main/tdebase/pamd.kdm-trinity-np.mga7
new file mode 100644
index 000000000..f884c1de6
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity-np.mga7
@@ -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.fc30 b/redhat/main/tdebase/pamd.kdm-trinity.fc30
new file mode 100644
index 000000000..4e760760f
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity.fc30
@@ -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/main/tdebase/pamd.kdm-trinity.mga7 b/redhat/main/tdebase/pamd.kdm-trinity.mga7
new file mode 100644
index 000000000..cb0982c9a
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity.mga7
@@ -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.fc30 b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc30
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc30
@@ -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.kscreensaver-trinity.mga7 b/redhat/main/tdebase/pamd.kscreensaver-trinity.mga7
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.mga7
@@ -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/tdm.fc30.pp b/redhat/main/tdebase/tdm.fc30.pp
new file mode 100644
index 000000000..d0c0d4be8
--- /dev/null
+++ b/redhat/main/tdebase/tdm.fc30.pp
diff --git a/redhat/main/tdebase/tdm.service.fc30 b/redhat/main/tdebase/tdm.service.fc30
new file mode 100644
index 000000000..4c6136d94
--- /dev/null
+++ b/redhat/main/tdebase/tdm.service.fc30
@@ -0,0 +1,12 @@
+[Unit]
+Description=The Trinity login manager
+Conflicts=getty@tty1.service
+After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service
+
+[Service]
+ExecStart=/opt/trinity/bin/kdm
+Restart=always
+IgnoreSIGPIPE=no
+
+[Install]
+Alias=display-manager.service
diff --git a/redhat/main/tdebindings/tdebindings-14.0.0.spec b/redhat/main/tdebindings/tdebindings-14.0.0.spec
index a70c39b3d..4b9de5a75 100644
--- a/redhat/main/tdebindings/tdebindings-14.0.0.spec
+++ b/redhat/main/tdebindings/tdebindings-14.0.0.spec
@@ -711,6 +711,7 @@ This package is part of the official TDE bindings module.
 %package -n trinity-kjscmd
 Summary:	A script interpreter using the TDE JavaScript library
 Group:		System/Libraries
+Provides:	%{tde_bindir}/kjscmd
 
 %description -n trinity-kjscmd
 This package contains the kjscmd program, which is a standalone
@@ -1022,7 +1023,7 @@ exit 3
        -e "s|SUBDIRS = .*|SUBDIRS = src xpart_notepad|"
 
 # Fix Fedora >= 28 automatic invalid dependency to '/usr/bin/kjscmd'
-%if 0%{?fedora} >= 28
+%if 0%{?fedora} >= 28 || 0%{?mgaversion} >= 7
 %__sed -i "kjsembed/tdescript/swaptabs.js" \
        -i "kjsembed/stdlib/cmdline.js" \
        -e "s|/usr/bin/env kjscmd|%{tde_bindir}/kjscmd|"
diff --git a/redhat/main/tdeedu/tdeedu-14.0.0.spec b/redhat/main/tdeedu/tdeedu-14.0.0.spec
index ca5d13cd8..af7343097 100644
--- a/redhat/main/tdeedu/tdeedu-14.0.0.spec
+++ b/redhat/main/tdeedu/tdeedu-14.0.0.spec
@@ -1062,6 +1062,12 @@ This package contains the development files for tdeedu.
 %prep
 %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
 
+%if 0%{?fedora} >= 30
+# Fix shebangs
+sed -i "kig/pykig/pykig.py" \
+    -e "s|env python|env python3|"
+%endif
+
 # RHEL5 strange FTBFS on V4L stuff
 %if 0%{?rhel} == 5
 %__sed -i "admin/acinclude.m4.in" -e "s|-ansi||"
diff --git a/redhat/main/tdesdk/tdesdk-14.0.0.spec b/redhat/main/tdesdk/tdesdk-14.0.0.spec
index 788bd6107..dac97e526 100644
--- a/redhat/main/tdesdk/tdesdk-14.0.0.spec
+++ b/redhat/main/tdesdk/tdesdk-14.0.0.spec
@@ -1007,6 +1007,15 @@ This package contains the development files for tdesdk.
 %prep
 %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
 
+%if 0%{?fedora} >= 30
+# Fix shebangs
+sed -i "scripts/kdelnk2desktop.py" \
+       "scripts/zonetab2pot.py" \
+       "tdecachegrind/converters/hotshot2calltree" \
+       "umbrello/umbrello/headings/heading.py" \
+    -e "s|env python|env python3|"
+%endif
+
 
 %build
 unset QTDIR QTINC QTLIB