summaryrefslogtreecommitdiffstats
path: root/redhat/main
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/main')
-rw-r--r--redhat/main/tdeaccessibility/tdeaccessibility-14.0.0.spec5
-rw-r--r--redhat/main/tdeaddons/tdeaddons-14.0.0.spec2
-rw-r--r--redhat/main/tdeaddons/tdeaddons-14.0.1-fix_sdl_detection.patch18
-rw-r--r--redhat/main/tdeartwork/tdeartwork-14.0.0.spec4
-rw-r--r--redhat/main/tdebase/pamd.kcheckpass-trinity.fc235
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity-np.fc2316
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity.fc2321
-rw-r--r--redhat/main/tdebase/pamd.kscreensaver-trinity.fc235
-rw-r--r--redhat/main/tdebase/tdebase-14.0.0.spec16
-rw-r--r--redhat/main/tdebase/tdm.service.fc2312
-rw-r--r--redhat/main/tdegraphics/tdegraphics-14.0.0.spec2
11 files changed, 78 insertions, 28 deletions
diff --git a/redhat/main/tdeaccessibility/tdeaccessibility-14.0.0.spec b/redhat/main/tdeaccessibility/tdeaccessibility-14.0.0.spec
index 89701e8d9..a771ce043 100644
--- a/redhat/main/tdeaccessibility/tdeaccessibility-14.0.0.spec
+++ b/redhat/main/tdeaccessibility/tdeaccessibility-14.0.0.spec
@@ -541,11 +541,6 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot}
-# Move desktop files to correct XDG location
-%__mv -f "%{?buildroot}%{tde_datadir}/applnk/Applications/kmag.desktop" "%{?buildroot}%{tde_tdeappdir}"
-%__mv -f "%{?buildroot}%{tde_datadir}/applnk/Applications/kmousetool.desktop" "%{?buildroot}%{tde_tdeappdir}"
-%__mv -f "%{?buildroot}%{tde_datadir}/applnk/Applications/kmouth.desktop" "%{?buildroot}%{tde_tdeappdir}"
-
# Adds missing icons in 'hicolor' theme
# These icons are copied from 'crystalsvg' theme, provided by 'tdelibs'.
%__mkdir_p "%{?buildroot}%{tde_datadir}/icons/hicolor/"{16x16,22x22,32x32,48x48,64x64,128x128}"/apps/"
diff --git a/redhat/main/tdeaddons/tdeaddons-14.0.0.spec b/redhat/main/tdeaddons/tdeaddons-14.0.0.spec
index 4a913815e..17b36008b 100644
--- a/redhat/main/tdeaddons/tdeaddons-14.0.0.spec
+++ b/redhat/main/tdeaddons/tdeaddons-14.0.0.spec
@@ -61,7 +61,6 @@ Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
-Patch1: tdeaddons-14.0.1-fix_sdl_detection.patch
# Trinity dependencies
@@ -728,7 +727,6 @@ done
%prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-%patch1 -p1 -b .sdl
%build
diff --git a/redhat/main/tdeaddons/tdeaddons-14.0.1-fix_sdl_detection.patch b/redhat/main/tdeaddons/tdeaddons-14.0.1-fix_sdl_detection.patch
deleted file mode 100644
index ca2fe2fcc..000000000
--- a/redhat/main/tdeaddons/tdeaddons-14.0.1-fix_sdl_detection.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
-index 1fedc9a..f3872b9 100644
---- a/ConfigureChecks.cmake
-+++ b/ConfigureChecks.cmake
-@@ -74,7 +74,12 @@ if( BUILD_NOATUN_PLUGINS )
- if( WITH_SDL )
- pkg_search_module( SDL sdl )
- if( NOT SDL_FOUND )
-- tde_message_fatal( "SDL is requested, but was not found on your system" )
-+ check_include_file( SDL/SDL.h HAVE_SDL_H )
-+ if( NOT HAVE_SDL_H )
-+ tde_message_fatal( "SDL is requested, but was not found on your system" )
-+ endif ( )
-+ set ( SDL_INCLUDE_DIRS /usr/include/SDL )
-+ set ( SDL_LIBRARIES SDL pthread )
- endif( )
- endif( WITH_SDL )
-
diff --git a/redhat/main/tdeartwork/tdeartwork-14.0.0.spec b/redhat/main/tdeartwork/tdeartwork-14.0.0.spec
index 2cb253234..1da50dc21 100644
--- a/redhat/main/tdeartwork/tdeartwork-14.0.0.spec
+++ b/redhat/main/tdeartwork/tdeartwork-14.0.0.spec
@@ -744,14 +744,14 @@ This package is part of Trinity, and a component of the TDE artwork module.
%{tde_datadir}/applnk/System/ScreenSavers/tessellimage.desktop
%endif
-%if 0%{?fedora} >= 20 || 0%{?pclinuxos}
+%if 0%{?fedora} >= 20 || 0%{?pclinuxos} || 0%{?mgaversion} >= 5
%{tde_datadir}/applnk/System/ScreenSavers/winduprobot.desktop
%{tde_datadir}/applnk/System/ScreenSavers/binaryring.desktop
%{tde_datadir}/applnk/System/ScreenSavers/cityflow.desktop
%{tde_datadir}/applnk/System/ScreenSavers/geodesicgears.desktop
%endif
-%if 0%{?pclinuxos} || 0%{?fedora} >= 21
+%if 0%{?pclinuxos} || 0%{?fedora} >= 21 || 0%{?mgaversion} >= 5
%{tde_datadir}/applnk/System/ScreenSavers/romanboy.desktop
%{tde_datadir}/applnk/System/ScreenSavers/splitflap.desktop
%endif
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc23 b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc23
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc23
@@ -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.fc23 b/redhat/main/tdebase/pamd.kdm-trinity-np.fc23
new file mode 100644
index 000000000..0616e66f6
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity-np.fc23
@@ -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.fc23 b/redhat/main/tdebase/pamd.kdm-trinity.fc23
new file mode 100644
index 000000000..e72140962
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity.fc23
@@ -0,0 +1,21 @@
+#%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 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 include postlogin
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc23 b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc23
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc23
@@ -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 2eef6ba9f..d079e4a1d 100644
--- a/redhat/main/tdebase/tdebase-14.0.0.spec
+++ b/redhat/main/tdebase/tdebase-14.0.0.spec
@@ -176,6 +176,22 @@ Requires: fedora-logos
%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
%endif
+# Fedora 22 Theme
+%if 0%{?fedora} == 22
+Requires: f22-backgrounds-base
+%define tde_bg /usr/share/backgrounds/f22/default/standard/f22.png
+Requires: fedora-logos
+%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
+%endif
+
+# Fedora 23 Theme
+%if 0%{?fedora} == 23
+Requires: f23-backgrounds-base
+%define tde_bg /usr/share/backgrounds/f23/default/standard/f23.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
diff --git a/redhat/main/tdebase/tdm.service.fc23 b/redhat/main/tdebase/tdm.service.fc23
new file mode 100644
index 000000000..4c6136d94
--- /dev/null
+++ b/redhat/main/tdebase/tdm.service.fc23
@@ -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/tdegraphics/tdegraphics-14.0.0.spec b/redhat/main/tdegraphics/tdegraphics-14.0.0.spec
index e78b50a7c..e3db46141 100644
--- a/redhat/main/tdegraphics/tdegraphics-14.0.0.spec
+++ b/redhat/main/tdegraphics/tdegraphics-14.0.0.spec
@@ -36,7 +36,7 @@
Name: trinity-%{tde_pkg}
Version: %{tde_version}
-Release: %{?!preversion:2}%{?preversion:0_%{preversion}}%{?dist}
+Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Trinity Desktop Environment - Graphics Applications
Group: Productivity/Graphics/Viewers
URL: http://www.trinitydesktop.org/
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 19:00:58 +0000