From b7bc75a7f79015c615ee5403f9fd459e846c05ac Mon Sep 17 00:00:00 2001
From: albator <albator@arcadia.vtf>
Date: Sat, 12 Nov 2011 17:25:41 +0100
Subject: [PATCH] Updates kdebase for Fedora 16

---
 .../kdebase-3.5.12-kickoff_unstable.patch      | 13 +++++++++++++
 .../kdebase-3.5.13-mediamanager_ftbfs.patch    | 10 ++++++++++
 redhat/kdebase/pamd.kcheckpass-trinity.fc16    |  5 +++++
 redhat/kdebase/pamd.kdm-trinity-np.fc16        | 15 +++++++++++++++
 redhat/kdebase/pamd.kdm-trinity.fc16           | 18 ++++++++++++++++++
 redhat/kdebase/pamd.kscreensaver-trinity.fc16  |  5 +++++
 6 files changed, 66 insertions(+)
 create mode 100644 redhat/kdebase/kdebase-3.5.12-kickoff_unstable.patch
 create mode 100644 redhat/kdebase/kdebase-3.5.13-mediamanager_ftbfs.patch
 create mode 100644 redhat/kdebase/pamd.kcheckpass-trinity.fc16
 create mode 100644 redhat/kdebase/pamd.kdm-trinity-np.fc16
 create mode 100644 redhat/kdebase/pamd.kdm-trinity.fc16
 create mode 100644 redhat/kdebase/pamd.kscreensaver-trinity.fc16

diff --git a/redhat/kdebase/kdebase-3.5.12-kickoff_unstable.patch b/redhat/kdebase/kdebase-3.5.12-kickoff_unstable.patch
new file mode 100644
index 000000000..2a58f0020
--- /dev/null
+++ b/redhat/kdebase/kdebase-3.5.12-kickoff_unstable.patch
@@ -0,0 +1,13 @@
+Index: ui/k_new_mnu.cpp
+===================================================================
+--- ui/k_new_mnu.cpp	(revision 1259264)
++++ ui/k_new_mnu.cpp	(working copy)
+@@ -3502,6 +3502,8 @@
+                                   descr, "system:/media/" + name, nId++, -1 );
+ 
+         ++it; // skip separator
++	++it;
++	++it;
+     }
+ }
+ 
diff --git a/redhat/kdebase/kdebase-3.5.13-mediamanager_ftbfs.patch b/redhat/kdebase/kdebase-3.5.13-mediamanager_ftbfs.patch
new file mode 100644
index 000000000..1d72b2378
--- /dev/null
+++ b/redhat/kdebase/kdebase-3.5.13-mediamanager_ftbfs.patch
@@ -0,0 +1,10 @@
+--- kdebase/kioslave/media/mediamanager/CMakeLists.txt.ORI	2011-11-08 15:00:40.248406596 -0500
++++ kdebase/kioslave/media/mediamanager/CMakeLists.txt	2011-11-08 15:00:56.417996538 -0500
+@@ -20,6 +20,7 @@
+   ${TDE_INCLUDE_DIR}
+   ${TQT_INCLUDE_DIRS}
+   ${HAL_INCLUDE_DIRS}
++  ${DBUS_TQT_INCLUDE_DIRS}
+ )
+ 
+ link_directories(
diff --git a/redhat/kdebase/pamd.kcheckpass-trinity.fc16 b/redhat/kdebase/pamd.kcheckpass-trinity.fc16
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/kdebase/pamd.kcheckpass-trinity.fc16
@@ -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/kdebase/pamd.kdm-trinity-np.fc16 b/redhat/kdebase/pamd.kdm-trinity-np.fc16
new file mode 100644
index 000000000..96fcfe378
--- /dev/null
+++ b/redhat/kdebase/pamd.kdm-trinity-np.fc16
@@ -0,0 +1,15 @@
+ #%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    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/kdebase/pamd.kdm-trinity.fc16 b/redhat/kdebase/pamd.kdm-trinity.fc16
new file mode 100644
index 000000000..ff7b155c6
--- /dev/null
+++ b/redhat/kdebase/pamd.kdm-trinity.fc16
@@ -0,0 +1,18 @@
+#%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       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    required    pam_selinux.so open
+session    optional    pam_keyinit.so force revoke
+session    required    pam_namespace.so
+-session    optional    pam_gnome_keyring.so auto_start
+session    include     system-auth
+session    include     postlogin
diff --git a/redhat/kdebase/pamd.kscreensaver-trinity.fc16 b/redhat/kdebase/pamd.kscreensaver-trinity.fc16
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/kdebase/pamd.kscreensaver-trinity.fc16
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth       include	system-auth
+account    include	system-auth
+password   include	system-auth
+session    include	system-auth