summaryrefslogtreecommitdiffstats
path: root/redhat/tdebase/tdebase-3.5.13.2.spec
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2013-09-08 12:17:12 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2013-09-08 12:17:12 +0200
commit9165f598d04efce920663e40b398c4388d585d43 (patch)
treee7baa4e798326604a9082c856e4d5f4d1ea9f85b /redhat/tdebase/tdebase-3.5.13.2.spec
parentc51008ebee10edfbccb321d9e473c6b6c24a8e80 (diff)
downloadtde-packaging-9165f598d04efce920663e40b398c4388d585d43.tar.gz
tde-packaging-9165f598d04efce920663e40b398c4388d585d43.zip
RPM Packaging: updates for 3.5.13.2
Diffstat (limited to 'redhat/tdebase/tdebase-3.5.13.2.spec')
-rw-r--r--redhat/tdebase/tdebase-3.5.13.2.spec29
1 files changed, 25 insertions, 4 deletions
diff --git a/redhat/tdebase/tdebase-3.5.13.2.spec b/redhat/tdebase/tdebase-3.5.13.2.spec
index adbb2036b..1e0d6f40a 100644
--- a/redhat/tdebase/tdebase-3.5.13.2.spec
+++ b/redhat/tdebase/tdebase-3.5.13.2.spec
@@ -69,6 +69,11 @@ Source6: suse-displaymanagers-tdm
Source7: tdm.service%{?dist}
%endif
+# openSUSE 11.4: overwrite distribution-provided '/etc/init.d/xdm' !!!
+%if 0%{?suse_version} == 1140
+Source7: xdm.oss114
+%endif
+
# Fedora 17: special selinux policy required
%if 0%{?fedora} >= 17 || 0%{?rhel} == 6
%define with_selinux_policy 1
@@ -102,6 +107,8 @@ Patch11: kdebase-3.5.13.1-fix_tdm_pid_file.patch
Patch12: tdebase-3.5.13.2-kdesu-noignorebutton.patch
## [kdebase/applnk] Fix XDG menu to avoid KDE4 conflict
Patch13: tdebase-3.5.13.2-fix_xdg_menu.patch
+## [kdebase/tdm] Fix USER_PATH variable in TDM
+Patch14: tdebase-3.5.13.2-fix_tdm_user_path.patch
# Patches from Mandriva
Patch101: tdebase-3.5.13.2-vibrate_dialog.patch
@@ -2067,14 +2074,17 @@ already. Most users won't need this.
%config(noreplace) %{_sysconfdir}/pam.d/tdm-trinity
%config(noreplace) %{_sysconfdir}/pam.d/tdm-trinity-np
%endif
-%if 0%{?suse_version}
+
+# Distribution specific stuff
+%if 0%{?suse_version} == 1140
+%{_sysconfdir}/init.d/xdm.tde
+%endif
+%if 0%{?suse_version} >= 1210
/usr/lib/X11/displaymanagers/tdm
%endif
%if 0%{?fedora} >= 18
/usr/lib/systemd/system/tdm.service
%endif
-
-# Distribution specific stuff
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
%{_datadir}/xsessions/tde.desktop
%endif
@@ -2125,6 +2135,11 @@ if [ "$1" = "1" ]; then
%__sed -i "%{_sysconfdir}/trinity/kdm/kdmrc" -e "s|^#*Language=.*|Language=${LANG}|"
fi
fi
+# openSUSE 11.4 tdm's startup script
+if [ -r "%{_sysconfdir}/init.d/xdm.tde" ]; then
+ cat "%{_sysconfdir}/init.d/xdm.tde" >"%{_sysconfdir}/init.d/xdm"
+fi
+
%posttrans -n trinity-tdm
# Make sure that TDM configuration files are now under '/etc/trinity/kdm'
@@ -3293,6 +3308,7 @@ Windows and Samba shares.
%patch11 -p1 -b .tdmpid
%patch12 -p1 -b .kdesunoignorebutton
%patch13 -p1 -b .xdgmenu
+%patch14 -p1 -b .tdmuserpath
%patch101 -p1 -b .vibrate_dialog
%patch102 -p1 -b .kcontrol_menu_entry
@@ -3514,7 +3530,7 @@ EOF
# SUSE: creates DM config file, used by '/etc/init.d/xdm'
# You must set 'DISPLAYMANAGER=tdm' in '/etc/sysconfig/displaymanager'
-%if 0%{?suse_version}
+%if 0%{?suse_version} >= 1210
%__install -D -m 644 "%{SOURCE6}" "%{?buildroot}/usr/lib/X11/displaymanagers/tdm"
%__sed -i "%{?buildroot}/usr/lib/X11/displaymanagers/tdm" -e "s|/opt/trinity/bin|%{tde_bindir}|g"
%endif
@@ -3538,6 +3554,11 @@ EOF
%__install -D -m 644 "%{SOURCE9}" "%{?buildroot}%{tde_datadir}/oxygen/scalable/mgabutton.svg"
%endif
+# openSUSE 11.4: tdm startup script
+%if 0%{?suse_version} == 1140
+%__install -D -m 755 "%{SOURCE7}" "%{?buildroot}%{?_sysconfdir}/init.d/xdm.tde"
+%endif
+
%clean
%__rm -rf %{?buildroot}