summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoralbator <albator@arcadia.vtf>2011-10-31 23:02:16 +0100
committeralbator <albator@arcadia.vtf>2011-10-31 23:02:16 +0100
commit9867fcbf8cecdd2bcdef4eaa288d173dccff1059 (patch)
tree0e760c262c39ea19352893e1aee14568bf0678d8
parent8695886e97b271cba9f587a94d5ee8368a11a6db (diff)
downloadtde-packaging-9867fcbf8cecdd2bcdef4eaa288d173dccff1059.tar.gz
tde-packaging-9867fcbf8cecdd2bcdef4eaa288d173dccff1059.zip
kdebase 3.5.13: global Xsession script is /etc/X11/xinit/Xsession under RHEL/Fedora, not /etc/X11/Xsession.v3.5.13
-rw-r--r--redhat/kdebase/kdebase-3.5.13-genkdmconf_Xsession_location.patch11
-rwxr-xr-xredhat/kdebase/trinity-kdebase-3.5.13.spec7
2 files changed, 17 insertions, 1 deletions
diff --git a/redhat/kdebase/kdebase-3.5.13-genkdmconf_Xsession_location.patch b/redhat/kdebase/kdebase-3.5.13-genkdmconf_Xsession_location.patch
new file mode 100644
index 000000000..d0efe3ef8
--- /dev/null
+++ b/redhat/kdebase/kdebase-3.5.13-genkdmconf_Xsession_location.patch
@@ -0,0 +1,11 @@
+--- kdebase/kdm/kfrontend/genkdmconf.c.ORI 2011-11-01 21:59:14.450046357 +0100
++++ kdebase/kdm/kfrontend/genkdmconf.c 2011-11-01 21:59:34.449045801 +0100
+@@ -676,7 +676,7 @@
+ " ;;\n"
+ "esac\n"
+ "# invoke global X session script\n"
+-". /etc/X11/Xsession\n";
++". /etc/X11/xinit/Xsession\n";
+
+ static const char def_background[] =
+ "[Desktop0]\n"
diff --git a/redhat/kdebase/trinity-kdebase-3.5.13.spec b/redhat/kdebase/trinity-kdebase-3.5.13.spec
index 64b3dffc0..9675530b0 100755
--- a/redhat/kdebase/trinity-kdebase-3.5.13.spec
+++ b/redhat/kdebase/trinity-kdebase-3.5.13.spec
@@ -53,8 +53,10 @@ Source5: pamd.kscreensaver-trinity%{?dist}
Patch3: kdebase-3.5.13-kdesu-noignorebutton.patch
# [kdebase/kdesktop] Modifies "open terminal here" on desktop
Patch5: kdebase-3.5.12-desktop-openterminalhere.patch
-# [kdebase/kioslave]: Forces HAL backend to use HAL mount options
+# [kdebase/kioslave] Forces HAL backend to use HAL mount options
Patch6: kdebase-3.5.12-halmountoptions.patch
+# [kdebase/kdm/kfrontend] Global Xsession file is '/etc/X11/xinit/Xsession'
+Patch7: kdebase-3.5.13-genkdmconf_Xsession_location.patch
BuildRequires: tqtinterface-devel
BuildRequires: trinity-arts-devel
@@ -92,6 +94,8 @@ Requires: qt%{?_qt_suffix}
Requires: openssl
Requires: avahi avahi-qt3
Requires: dbus-tqt
+# Provides the global Xsession script (/etc/X11/xinit/Xsession)
+Requires: xorg-x11-xinit
# RHEL 6 Configuration files are provided in separate packages
@@ -166,6 +170,7 @@ Protocol handlers (KIOslaves) for personal information management, including:
%patch3 -p1
%patch5 -p1
%patch6 -p1
+%patch7 -p1
%build