RPM packaging: updates for Fedora 28 / OpenSUSE 15.0

11 files changed, 102 insertions, 3 deletions

diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc28 b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc28
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc28
@@ -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.fc28 b/redhat/main/tdebase/pamd.kdm-trinity-np.fc28
new file mode 100644
index 000000000..0616e66f6
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity-np.fc28
@@ -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.fc28 b/redhat/main/tdebase/pamd.kdm-trinity.fc28
new file mode 100644
index 000000000..4e760760f
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity.fc28
@@ -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.kscreensaver-trinity.fc28 b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc28
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc28
@@ -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-14.0.0.spec b/redhat/main/tdebase/tdebase-14.0.0.spec
index 2003bcf57..bc3c29666 100644
--- a/redhat/main/tdebase/tdebase-14.0.0.spec
+++ b/redhat/main/tdebase/tdebase-14.0.0.spec
@@ -224,6 +224,14 @@ Requires:	fedora-logos
 %define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
 %endif
 
+# Fedora 28 Theme
+%if 0%{?fedora} == 28
+Requires:	f28-backgrounds-base
+%define tde_bg /usr/share/backgrounds/f27/default/standard/f28.png
+Requires:	fedora-logos
+%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
+%endif
+
 # RHEL 4 Theme
 %if 0%{?rhel} == 4
 Requires:	desktop-backgrounds-basic
@@ -363,6 +371,14 @@ Requires:	hicolor-icon-theme-branding
 %define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
 %endif
 
+# OpenSuse 15.0 Theme
+%if "%{?suse_version}" == "1500"
+Requires:	wallpaper-branding
+%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
+Requires:	hicolor-icon-theme-branding
+%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
+%endif
+
 BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 
@@ -683,6 +699,12 @@ BuildRequires:	libconfig-devel
 BuildRequires:		libr-devel >= 0.6.0
 %endif
 
+# RPC support
+%if 0%{?fedora} >= 28
+BuildRequires:		libtirpc-devel
+BuildRequires:		rpcgen
+%endif
+
 # tdebase is a metapackage that installs all sub-packages
 Requires: %{name}-runtime-data-common = %{version}-%{release}
 Requires: %{name}-data = %{version}-%{release}
@@ -3280,6 +3302,11 @@ if [ -d "/usr/include/openldap24" ]; then
   RPM_OPT_FLAGS="-I%{_includedir}/openldap24 -L%{_libdir}/openldap24 ${RPM_OPT_FLAGS}"
 fi
 
+# libtirpc (fedora)
+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
   %__mkdir_p build
   cd build
diff --git a/redhat/main/tdebase/tdm.fc28.pp b/redhat/main/tdebase/tdm.fc28.pp
new file mode 100644
index 000000000..d0c0d4be8
--- /dev/null
+++ b/redhat/main/tdebase/tdm.fc28.pp
diff --git a/redhat/main/tdebase/tdm.service.fc28 b/redhat/main/tdebase/tdm.service.fc28
new file mode 100644
index 000000000..4c6136d94
--- /dev/null
+++ b/redhat/main/tdebase/tdm.service.fc28
@@ -0,0 +1,12 @@
+[Unit]
+Description=The Trinity login manager
[email protected]
+After=systemd-user-sessions.service [email protected] 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 3cfbabaeb..47ca29d7e 100644
--- a/redhat/main/tdebindings/tdebindings-14.0.0.spec
+++ b/redhat/main/tdebindings/tdebindings-14.0.0.spec
@@ -999,6 +999,13 @@ exit 1
 %__sed -i "xparts/Makefile.am" \
        -e "s|SUBDIRS = .*|SUBDIRS = src xpart_notepad|"
 
+# Fix Fedora >= 28 automatic invalid dependency to '/usr/bin/kjscmd'
+%if 0%{?fedora} >= 28
+%__sed -i "kjsembed/tdescript/swaptabs.js" \
+       -i "kjsembed/stdlib/cmdline.js" \
+       -e "s|/usr/bin/env kjscmd|%{tde_bindir}/kjscmd|"
+%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"
 %__make -f "admin/Makefile.common"
diff --git a/redhat/main/tdeedu/tdeedu-14.0.0.spec b/redhat/main/tdeedu/tdeedu-14.0.0.spec
index 26d8ede69..bbfd7b881 100644
--- a/redhat/main/tdeedu/tdeedu-14.0.0.spec
+++ b/redhat/main/tdeedu/tdeedu-14.0.0.spec
@@ -94,7 +94,7 @@ BuildRequires: ocaml
 
 # KIG python scripting support
 %if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%if 0%{?suse_version} == 1330
+%if 0%{?suse_version} == 1330 || 0%{?suse_version} == 1500
 %define with_kig 0
 %else
 %define with_kig 1
diff --git a/redhat/main/tdegraphics/tdegraphics-14.0.0.spec b/redhat/main/tdegraphics/tdegraphics-14.0.0.spec
index 5f957cf4d..85e91ba05 100644
--- a/redhat/main/tdegraphics/tdegraphics-14.0.0.spec
+++ b/redhat/main/tdegraphics/tdegraphics-14.0.0.spec
@@ -100,7 +100,7 @@ BuildRequires: pcre-devel
 BuildRequires:	libacl-devel
 
 # GIF support
-%if 0%{?suse_version}
+%if 0%{?suse_version} || 0%{?fedora} >= 28
 BuildRequires: giflib-devel
 %else
 BuildRequires: libungif-devel
@@ -198,8 +198,12 @@ BuildRequires:	OpenEXR-devel
 %define with_pdf 1
 %if 0%{?with_pdf}
 %if 0%{?rhel} >=6 || 0%{?fedora} >= 15 || 0%{?suse_version}
+%if 0%{?suse_version} == 1500
+BuildRequires: libpoppler-devel >= 0.12
+%else
 BuildRequires: poppler-devel >= 0.12
 %endif
+%endif
 %if 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	%{_lib}poppler-devel
 %endif
diff --git a/redhat/main/tdelibs/tdelibs-14.0.0.spec b/redhat/main/tdelibs/tdelibs-14.0.0.spec
index 1c7d5e619..76bc247a6 100644
--- a/redhat/main/tdelibs/tdelibs-14.0.0.spec
+++ b/redhat/main/tdelibs/tdelibs-14.0.0.spec
@@ -371,7 +371,7 @@ Requires:		udisks
 # UDISKS2 support
 %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 7
 %define with_udisks2 1
-%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
+%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 || 0%{?suse_version} >= 1550
 BuildRequires:	libudisks2-devel
 %else
 BuildRequires:	udisks2-devel