diff options
| -rw-r--r-- | redhat/tdebase/tdebase-3.5.13.2.spec | 42 |
1 files changed, 15 insertions, 27 deletions
diff --git a/redhat/tdebase/tdebase-3.5.13.2.spec b/redhat/tdebase/tdebase-3.5.13.2.spec index 7ed043177..cf1cb3cfa 100644 --- a/redhat/tdebase/tdebase-3.5.13.2.spec +++ b/redhat/tdebase/tdebase-3.5.13.2.spec @@ -74,8 +74,14 @@ Source7: tdm.service%{?dist} Source7: xdm.oss114 %endif -# Fedora 17: special selinux policy required -%if 0%{?fedora} >= 17 || 0%{?rhel} == 6 +# Fedora >= 17: special selinux policy required for TDM +# If login through TDM takes ages, then look at '/var/log/audit/audit.log'. +# Locate the line containing 'USER_AVC' and dbus stuff. +# Put this line into a temporary file, then (e.g for Fedora 17): +# audit2allow -i /tmp/file -m tdm.fc17 >tdm.fc17.te +# audit2allow -i /tmp/file -M tdm.fc17 + +%if 0%{?fedora} >= 17 || 0%{?rhel} >= 6 %define with_selinux_policy 1 Source8: tdm%{?dist}.pp %endif @@ -349,12 +355,7 @@ BuildRequires: glib2-devel BuildRequires: pcre-devel # SASL support -%if 0%{?mageia} || 0%{?mandriva} || 0%{?pclinuxos} -BuildRequires: %{_lib}sasl2-devel -%endif -%if 0%{?suse_version} BuildRequires: cyrus-sasl-devel -%endif # LIBUSB support BuildRequires: pam-devel @@ -2040,7 +2041,6 @@ Provides: service(graphical-login) # Required for Mandriva's installer %if 0%{?mgaversion} || 0%{?mdkversion} Provides: dm -Provides: tdm %endif %description -n trinity-tdm @@ -2636,6 +2636,7 @@ ever launching another application. %exclude %{tde_datadir}/apps/konqueror/servicemenus/installfont.desktop %{tde_datadir}/apps/konqueror/servicemenus/*.desktop %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase +%{_sysconfdir}/alternatives/media_safelyremove.desktop_tdebase %{tde_datadir}/apps/konqueror/tiles/*.png %{tde_datadir}/autostart/konqy_preload.desktop %{tde_datadir}/config.kcfg/keditbookmarks.kcfg @@ -2899,7 +2900,7 @@ TDE will start, but many good defaults will not be set. %{tde_datadir}/apps/kconf_update/move_session_config.sh %{tde_datadir}/apps/ksmserver/pics/shutdownkonq.png -# Remove conflicts with KDE4 +# Remove conflicts with redhat-menus %if "%{?tde_prefix}" != "/usr" %{tde_bindir}/plasma-desktop %endif @@ -3377,21 +3378,6 @@ Windows and Samba shares. %__sed -i "kdm/kfrontend/genkdmconf.c" -e "s|/etc/X11/Xsession|/etc/X11/xdm/Xsession|" %endif -# Reboot command location may vary on some distributions -if [ -x "/usr/bin/reboot" ]; then - POWEROFF="/usr/bin/poweroff" - REBOOT="/usr/bin/reboot" -fi -if [ -n "${REBOOT}" ]; then - %__sed -i \ - "doc/tdm/index.docbook" \ - "doc/kcontrol/tdm/index.docbook" \ - "kcontrol/tdm/tdm-shut.cpp" \ - "tdm/config.def" \ - -e "s|/sbin/poweroff|${POWEROFF}|g" \ - -e "s|/sbin/reboot|${REBOOT}|g" -fi - %build unset QTDIR QTINC QTLIB @@ -3434,7 +3420,6 @@ fi -DSYSCONF_INSTALL_DIR="%{_sysconfdir}/trinity" \ -DXDG_MENU_INSTALL_DIR="%{_sysconfdir}/xdg/menus" \ \ - -DWITH_ALL_OPTIONS=ON \ -DWITH_SASL=ON \ -DWITH_LDAP=ON \ -DWITH_SAMBA=ON \ @@ -3535,7 +3520,7 @@ EOF # TDM configuration %__sed -i "%{?buildroot}%{_sysconfdir}/trinity/kdm/kdmrc" \ -%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 +%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1220 -e "s/^#*MinShowUID=.*/MinShowUID=1000/" %else -e "s/^#*MinShowUID=.*/MinShowUID=500/" @@ -3551,8 +3536,11 @@ EOF # Makes 'media_safelyremove.desktop' an alternative %__mv -f "%{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop" "%{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase" +%__ln_s "%{_sysconfdir}/alternatives/media_safelyremove.desktop_tdebase" "%{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop" +%__mkdir_p "%{?buildroot}%{_sysconfdir}/alternatives" +%__ln_s "%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase" "%{?buildroot}%{_sysconfdir}/alternatives/media_safelyremove.desktop_tdebase" -# SUSE >= 12 : creates DM config file, used by '/etc/init.d/xdm' +# SUSE: creates DM config file, used by '/etc/init.d/xdm' # You must set 'DISPLAYMANAGER=tdm' in '/etc/sysconfig/displaymanager' %if 0%{?suse_version} >= 1210 %__install -D -m 644 "%{SOURCE6}" "%{?buildroot}/usr/lib/X11/displaymanagers/tdm" |