TDE 3.5.13 final more small fixes before release (RHEL/Fedora)

18 files changed, 412 insertions, 2 deletions

diff --git a/redhat/applications/gwenview/gwenview-3.5.13-jpegint-ftbfs.patch b/redhat/applications/gwenview/gwenview-3.5.13-jpegint-ftbfs.patch
new file mode 100644
index 000000000..0cd290983
--- /dev/null
+++ b/redhat/applications/gwenview/gwenview-3.5.13-jpegint-ftbfs.patch
@@ -0,0 +1,254 @@
+diff -Nuar gwenview.ORI/src/imageutils/jpegint.h gwenview/src/imageutils/jpegint.h
+--- gwenview.ORI/src/imageutils/jpegint.h	2011-05-26 23:04:57.000000000 +0200
++++ gwenview/src/imageutils/jpegint.h	2011-11-01 20:45:15.494165195 +0100
+@@ -43,9 +43,9 @@
+ 
+ /* Master control module */
+ struct jpeg_comp_master {
+-  JTQT_METHOD(void, prepare_for_pass, (j_compress_ptr cinfo));
+-  JTQT_METHOD(void, pass_startup, (j_compress_ptr cinfo));
+-  JTQT_METHOD(void, finish_pass, (j_compress_ptr cinfo));
++  JMETHOD(void, prepare_for_pass, (j_compress_ptr cinfo));
++  JMETHOD(void, pass_startup, (j_compress_ptr cinfo));
++  JMETHOD(void, finish_pass, (j_compress_ptr cinfo));
+ 
+   /* State variables made visible to other modules */
+   boolean call_pass_startup;	/* True if pass_startup must be called */
+@@ -54,16 +54,16 @@
+ 
+ /* Main buffer control (downsampled-data buffer) */
+ struct jpeg_c_main_controller {
+-  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
+-  JTQT_METHOD(void, process_data, (j_compress_ptr cinfo,
++  JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
++  JMETHOD(void, process_data, (j_compress_ptr cinfo,
+ 			       JSAMPARRAY input_buf, JDIMENSION *in_row_ctr,
+ 			       JDIMENSION in_rows_avail));
+ };
+ 
+ /* Compression preprocessing (downsampling input buffer control) */
+ struct jpeg_c_prep_controller {
+-  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
+-  JTQT_METHOD(void, pre_process_data, (j_compress_ptr cinfo,
++  JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
++  JMETHOD(void, pre_process_data, (j_compress_ptr cinfo,
+ 				   JSAMPARRAY input_buf,
+ 				   JDIMENSION *in_row_ctr,
+ 				   JDIMENSION in_rows_avail,
+@@ -74,23 +74,23 @@
+ 
+ /* Coefficient buffer control */
+ struct jpeg_c_coef_controller {
+-  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
+-  JTQT_METHOD(boolean, compress_data, (j_compress_ptr cinfo,
++  JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
++  JMETHOD(boolean, compress_data, (j_compress_ptr cinfo,
+ 				   JSAMPIMAGE input_buf));
+ };
+ 
+ /* Colorspace conversion */
+ struct jpeg_color_converter {
+-  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo));
+-  JTQT_METHOD(void, color_convert, (j_compress_ptr cinfo,
++  JMETHOD(void, start_pass, (j_compress_ptr cinfo));
++  JMETHOD(void, color_convert, (j_compress_ptr cinfo,
+ 				JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
+ 				JDIMENSION output_row, int num_rows));
+ };
+ 
+ /* Downsampling */
+ struct jpeg_downsampler {
+-  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo));
+-  JTQT_METHOD(void, downsample, (j_compress_ptr cinfo,
++  JMETHOD(void, start_pass, (j_compress_ptr cinfo));
++  JMETHOD(void, downsample, (j_compress_ptr cinfo,
+ 			     JSAMPIMAGE input_buf, JDIMENSION in_row_index,
+ 			     JSAMPIMAGE output_buf,
+ 			     JDIMENSION out_row_group_index));
+@@ -100,9 +100,9 @@
+ 
+ /* Forward DCT (also controls coefficient quantization) */
+ struct jpeg_forward_dct {
+-  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo));
++  JMETHOD(void, start_pass, (j_compress_ptr cinfo));
+   /* perhaps this should be an array??? */
+-  JTQT_METHOD(void, forward_DCT, (j_compress_ptr cinfo,
++  JMETHOD(void, forward_DCT, (j_compress_ptr cinfo,
+ 			      jpeg_component_info * compptr,
+ 			      JSAMPARRAY sample_data, JBLOCKROW coef_blocks,
+ 			      JDIMENSION start_row, JDIMENSION start_col,
+@@ -111,23 +111,23 @@
+ 
+ /* Entropy encoding */
+ struct jpeg_entropy_encoder {
+-  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo, boolean gather_statistics));
+-  JTQT_METHOD(boolean, encode_mcu, (j_compress_ptr cinfo, JBLOCKROW *MCU_data));
+-  JTQT_METHOD(void, finish_pass, (j_compress_ptr cinfo));
++  JMETHOD(void, start_pass, (j_compress_ptr cinfo, boolean gather_statistics));
++  JMETHOD(boolean, encode_mcu, (j_compress_ptr cinfo, JBLOCKROW *MCU_data));
++  JMETHOD(void, finish_pass, (j_compress_ptr cinfo));
+ };
+ 
+ /* Marker writing */
+ struct jpeg_marker_writer {
+-  JTQT_METHOD(void, write_file_header, (j_compress_ptr cinfo));
+-  JTQT_METHOD(void, write_frame_header, (j_compress_ptr cinfo));
+-  JTQT_METHOD(void, write_scan_header, (j_compress_ptr cinfo));
+-  JTQT_METHOD(void, write_file_trailer, (j_compress_ptr cinfo));
+-  JTQT_METHOD(void, write_tables_only, (j_compress_ptr cinfo));
++  JMETHOD(void, write_file_header, (j_compress_ptr cinfo));
++  JMETHOD(void, write_frame_header, (j_compress_ptr cinfo));
++  JMETHOD(void, write_scan_header, (j_compress_ptr cinfo));
++  JMETHOD(void, write_file_trailer, (j_compress_ptr cinfo));
++  JMETHOD(void, write_tables_only, (j_compress_ptr cinfo));
+   /* These routines are exported to allow insertion of extra markers */
+   /* Probably only COM and APPn markers should be written this way */
+-  JTQT_METHOD(void, write_marker_header, (j_compress_ptr cinfo, int marker,
++  JMETHOD(void, write_marker_header, (j_compress_ptr cinfo, int marker,
+ 				      unsigned int datalen));
+-  JTQT_METHOD(void, write_marker_byte, (j_compress_ptr cinfo, int val));
++  JMETHOD(void, write_marker_byte, (j_compress_ptr cinfo, int val));
+ };
+ 
+ 
+@@ -135,8 +135,8 @@
+ 
+ /* Master control module */
+ struct jpeg_decomp_master {
+-  JTQT_METHOD(void, prepare_for_output_pass, (j_decompress_ptr cinfo));
+-  JTQT_METHOD(void, finish_output_pass, (j_decompress_ptr cinfo));
++  JMETHOD(void, prepare_for_output_pass, (j_decompress_ptr cinfo));
++  JMETHOD(void, finish_output_pass, (j_decompress_ptr cinfo));
+ 
+   /* State variables made visible to other modules */
+   boolean is_dummy_pass;	/* True during 1st pass for 2-pass quant */
+@@ -144,10 +144,10 @@
+ 
+ /* Input control module */
+ struct jpeg_input_controller {
+-  JTQT_METHOD(int, consume_input, (j_decompress_ptr cinfo));
+-  JTQT_METHOD(void, reset_input_controller, (j_decompress_ptr cinfo));
+-  JTQT_METHOD(void, start_input_pass, (j_decompress_ptr cinfo));
+-  JTQT_METHOD(void, finish_input_pass, (j_decompress_ptr cinfo));
++  JMETHOD(int, consume_input, (j_decompress_ptr cinfo));
++  JMETHOD(void, reset_input_controller, (j_decompress_ptr cinfo));
++  JMETHOD(void, start_input_pass, (j_decompress_ptr cinfo));
++  JMETHOD(void, finish_input_pass, (j_decompress_ptr cinfo));
+ 
+   /* State variables made visible to other modules */
+   boolean has_multiple_scans;	/* True if file has multiple scans */
+@@ -156,18 +156,18 @@
+ 
+ /* Main buffer control (downsampled-data buffer) */
+ struct jpeg_d_main_controller {
+-  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));
+-  JTQT_METHOD(void, process_data, (j_decompress_ptr cinfo,
++  JMETHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));
++  JMETHOD(void, process_data, (j_decompress_ptr cinfo,
+ 			       JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
+ 			       JDIMENSION out_rows_avail));
+ };
+ 
+ /* Coefficient buffer control */
+ struct jpeg_d_coef_controller {
+-  JTQT_METHOD(void, start_input_pass, (j_decompress_ptr cinfo));
+-  JTQT_METHOD(int, consume_data, (j_decompress_ptr cinfo));
+-  JTQT_METHOD(void, start_output_pass, (j_decompress_ptr cinfo));
+-  JTQT_METHOD(int, decompress_data, (j_decompress_ptr cinfo,
++  JMETHOD(void, start_input_pass, (j_decompress_ptr cinfo));
++  JMETHOD(int, consume_data, (j_decompress_ptr cinfo));
++  JMETHOD(void, start_output_pass, (j_decompress_ptr cinfo));
++  JMETHOD(int, decompress_data, (j_decompress_ptr cinfo,
+ 				 JSAMPIMAGE output_buf));
+   /* Pointer to array of coefficient virtual arrays, or NULL if none */
+   jvirt_barray_ptr *coef_arrays;
+@@ -175,8 +175,8 @@
+ 
+ /* Decompression postprocessing (color quantization buffer control) */
+ struct jpeg_d_post_controller {
+-  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));
+-  JTQT_METHOD(void, post_process_data, (j_decompress_ptr cinfo,
++  JMETHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));
++  JMETHOD(void, post_process_data, (j_decompress_ptr cinfo,
+ 				    JSAMPIMAGE input_buf,
+ 				    JDIMENSION *in_row_group_ctr,
+ 				    JDIMENSION in_row_groups_avail,
+@@ -187,12 +187,12 @@
+ 
+ /* Marker reading & parsing */
+ struct jpeg_marker_reader {
+-  JTQT_METHOD(void, reset_marker_reader, (j_decompress_ptr cinfo));
++  JMETHOD(void, reset_marker_reader, (j_decompress_ptr cinfo));
+   /* Read markers until SOS or EOI.
+    * Returns same codes as are defined for jpeg_consume_input:
+    * JPEG_SUSPENDED, JPEG_REACHED_SOS, or JPEG_REACHED_EOI.
+    */
+-  JTQT_METHOD(int, read_markers, (j_decompress_ptr cinfo));
++  JMETHOD(int, read_markers, (j_decompress_ptr cinfo));
+   /* Read a restart marker --- exported for use by entropy decoder only */
+   jpeg_marker_parser_method read_restart_marker;
+ 
+@@ -207,8 +207,8 @@
+ 
+ /* Entropy decoding */
+ struct jpeg_entropy_decoder {
+-  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo));
+-  JTQT_METHOD(boolean, decode_mcu, (j_decompress_ptr cinfo,
++  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
++  JMETHOD(boolean, decode_mcu, (j_decompress_ptr cinfo,
+ 				JBLOCKROW *MCU_data));
+ 
+   /* This is here to share code between baseline and progressive decoders; */
+@@ -217,21 +217,21 @@
+ };
+ 
+ /* Inverse DCT (also performs dequantization) */
+-typedef JTQT_METHOD(void, inverse_DCT_method_ptr,
++typedef JMETHOD(void, inverse_DCT_method_ptr,
+ 		(j_decompress_ptr cinfo, jpeg_component_info * compptr,
+ 		 JCOEFPTR coef_block,
+ 		 JSAMPARRAY output_buf, JDIMENSION output_col));
+ 
+ struct jpeg_inverse_dct {
+-  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo));
++  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
+   /* It is useful to allow each component to have a separate IDCT method. */
+   inverse_DCT_method_ptr inverse_DCT[MAX_COMPONENTS];
+ };
+ 
+ /* Upsampling (note that upsampler must also call color converter) */
+ struct jpeg_upsampler {
+-  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo));
+-  JTQT_METHOD(void, upsample, (j_decompress_ptr cinfo,
++  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
++  JMETHOD(void, upsample, (j_decompress_ptr cinfo,
+ 			   JSAMPIMAGE input_buf,
+ 			   JDIMENSION *in_row_group_ctr,
+ 			   JDIMENSION in_row_groups_avail,
+@@ -244,20 +244,20 @@
+ 
+ /* Colorspace conversion */
+ struct jpeg_color_deconverter {
+-  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo));
+-  JTQT_METHOD(void, color_convert, (j_decompress_ptr cinfo,
++  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
++  JMETHOD(void, color_convert, (j_decompress_ptr cinfo,
+ 				JSAMPIMAGE input_buf, JDIMENSION input_row,
+ 				JSAMPARRAY output_buf, int num_rows));
+ };
+ 
+ /* Color quantization or color precision reduction */
+ struct jpeg_color_quantizer {
+-  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo, boolean is_pre_scan));
+-  JTQT_METHOD(void, color_quantize, (j_decompress_ptr cinfo,
++  JMETHOD(void, start_pass, (j_decompress_ptr cinfo, boolean is_pre_scan));
++  JMETHOD(void, color_quantize, (j_decompress_ptr cinfo,
+ 				 JSAMPARRAY input_buf, JSAMPARRAY output_buf,
+ 				 int num_rows));
+-  JTQT_METHOD(void, finish_pass, (j_decompress_ptr cinfo));
+-  JTQT_METHOD(void, new_color_map, (j_decompress_ptr cinfo));
++  JMETHOD(void, finish_pass, (j_decompress_ptr cinfo));
++  JMETHOD(void, new_color_map, (j_decompress_ptr cinfo));
+ };
+ 
+ 
diff --git a/redhat/applications/gwenview/trinity-gwenview-3.5.13.spec b/redhat/applications/gwenview/trinity-gwenview-3.5.13.spec
index 2a33baba9..e709120d5 100644
--- a/redhat/applications/gwenview/trinity-gwenview-3.5.13.spec
+++ b/redhat/applications/gwenview/trinity-gwenview-3.5.13.spec
@@ -33,9 +33,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
 
+# TDE 3.5.13 on RHEL/Fedora specific patches
+Patch0:		gwenview-3.5.13-jpegint-ftbfs.patch
 
 
 BuildRequires: tqtinterface-devel
+BuildRequires: trinity-arts-devel
 BuildRequires: trinity-kdelibs-devel
 BuildRequires: trinity-kdebase-devel
 BuildRequires: desktop-file-utils
@@ -63,6 +66,7 @@ KIPI image framework.
 
 %prep
 %setup -q -n applications/%{kdecomp}
+%patch0 -p1
 
 # Ugly hack to modify TQT include directory inside autoconf files.
 # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
diff --git a/redhat/components.txt b/redhat/components.txt
index 3c0de8dbb..ee194d47e 100644
--- a/redhat/components.txt
+++ b/redhat/components.txt
@@ -5,6 +5,7 @@ dependencies/tqtinterface
 dependencies/dbus-tqt
 dependencies/arts
 trinity-desktop
+trinity-settings
 kdelibs
 kdebase
 kdebindings
diff --git a/redhat/dependencies/libcaldav/libcaldav.spec b/redhat/dependencies/libcaldav/libcaldav.spec
index 8b505238f..6624409cd 100644
--- a/redhat/dependencies/libcaldav/libcaldav.spec
+++ b/redhat/dependencies/libcaldav/libcaldav.spec
@@ -1,6 +1,11 @@
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?_prefix}" != "/usr"
+%define _variant .opt
+%endif
+
 Name:		libcaldav
 Version:	0.6.5
-Release:	2debian2.1%{?dist}
+Release:	2debian2.1%{?dist}%{?_variant}
 
 Vendor:		Trinity Project
 URL:		http://www.trinitydesktop.org/
diff --git a/redhat/dependencies/libcarddav/libcarddav.spec b/redhat/dependencies/libcarddav/libcarddav.spec
index a2e8c7310..c47f40a49 100644
--- a/redhat/dependencies/libcarddav/libcarddav.spec
+++ b/redhat/dependencies/libcarddav/libcarddav.spec
@@ -1,6 +1,11 @@
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?_prefix}" != "/usr"
+%define _variant .opt
+%endif
+
 Name:		libcarddav
 Version:	0.6.2
-Release:	2debian2.1%{?dist}
+Release:	2debian2.1%{?dist}%{?_variant}
 
 Vendor:		Trinity Project
 URL:		http://www.trinitydesktop.org/
diff --git a/redhat/kdebase/pamd.kcheckpass-trinity.el5 b/redhat/kdebase/pamd.kcheckpass-trinity.el5
new file mode 100644
index 000000000..56939d5a9
--- /dev/null
+++ b/redhat/kdebase/pamd.kcheckpass-trinity.el5
@@ -0,0 +1,9 @@
+#%PAM-1.0
+auth       include     system-auth
+account    required	pam_nologin.so
+account    include     system-auth
+password   include     system-auth
+session    include	system-auth
+session    required    pam_loginuid.so
+session    optional    pam_selinux.so
+session    optional	pam_console.so
diff --git a/redhat/kdebase/pamd.kcheckpass-trinity.el6 b/redhat/kdebase/pamd.kcheckpass-trinity.el6
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/kdebase/pamd.kcheckpass-trinity.el6
@@ -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.kcheckpass-trinity.fc15 b/redhat/kdebase/pamd.kcheckpass-trinity.fc15
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/kdebase/pamd.kcheckpass-trinity.fc15
@@ -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.el5 b/redhat/kdebase/pamd.kdm-trinity-np.el5
new file mode 100644
index 000000000..8dc8ef34d
--- /dev/null
+++ b/redhat/kdebase/pamd.kdm-trinity-np.el5
@@ -0,0 +1,11 @@
+#%PAM-1.0
+auth       required	pam_env.so
+auth       required	pam_nologin.so
+auth       required	pam_permit.so
+account    include	system-auth
+password   include	system-auth
+session	   optional	pam_keyinit.so force revoke
+session    include	system-auth
+session    required     pam_loginuid.so
+session    optional     pam_selinux.so
+session    optional     pam_console.so
diff --git a/redhat/kdebase/pamd.kdm-trinity-np.el6 b/redhat/kdebase/pamd.kdm-trinity-np.el6
new file mode 100644
index 000000000..c3f7172de
--- /dev/null
+++ b/redhat/kdebase/pamd.kdm-trinity-np.el6
@@ -0,0 +1,13 @@
+ #%PAM-1.0
+auth       required    pam_env.so
+auth       required    pam_permit.so
+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
diff --git a/redhat/kdebase/pamd.kdm-trinity-np.fc15 b/redhat/kdebase/pamd.kdm-trinity-np.fc15
new file mode 100644
index 000000000..96fcfe378
--- /dev/null
+++ b/redhat/kdebase/pamd.kdm-trinity-np.fc15
@@ -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.el5 b/redhat/kdebase/pamd.kdm-trinity.el5
new file mode 100644
index 000000000..30a26ae99
--- /dev/null
+++ b/redhat/kdebase/pamd.kdm-trinity.el5
@@ -0,0 +1,10 @@
+#%PAM-1.0
+auth       include     system-auth
+account    required    pam_nologin.so
+account    include     system-auth
+password   include     system-auth
+session    optional    pam_keyinit.so force revoke
+session    include     system-auth
+session    required    pam_loginuid.so
+session    optional    pam_selinux.so
+session    optional    pam_console.so
diff --git a/redhat/kdebase/pamd.kdm-trinity.el6 b/redhat/kdebase/pamd.kdm-trinity.el6
new file mode 100644
index 000000000..14f4aa748
--- /dev/null
+++ b/redhat/kdebase/pamd.kdm-trinity.el6
@@ -0,0 +1,16 @@
+#%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
+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
diff --git a/redhat/kdebase/pamd.kdm-trinity.fc15 b/redhat/kdebase/pamd.kdm-trinity.fc15
new file mode 100644
index 000000000..f1d90f7f3
--- /dev/null
+++ b/redhat/kdebase/pamd.kdm-trinity.fc15
@@ -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.el5 b/redhat/kdebase/pamd.kscreensaver-trinity.el5
new file mode 100644
index 000000000..56939d5a9
--- /dev/null
+++ b/redhat/kdebase/pamd.kscreensaver-trinity.el5
@@ -0,0 +1,9 @@
+#%PAM-1.0
+auth       include     system-auth
+account    required	pam_nologin.so
+account    include     system-auth
+password   include     system-auth
+session    include	system-auth
+session    required    pam_loginuid.so
+session    optional    pam_selinux.so
+session    optional	pam_console.so
diff --git a/redhat/kdebase/pamd.kscreensaver-trinity.el6 b/redhat/kdebase/pamd.kscreensaver-trinity.el6
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/kdebase/pamd.kscreensaver-trinity.el6
@@ -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.kscreensaver-trinity.fc15 b/redhat/kdebase/pamd.kscreensaver-trinity.fc15
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/kdebase/pamd.kscreensaver-trinity.fc15
@@ -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/trinity-kdebase-3.5.13.spec b/redhat/kdebase/trinity-kdebase-3.5.13.spec
index fa2c9bf38..64b3dffc0 100755
--- a/redhat/kdebase/trinity-kdebase-3.5.13.spec
+++ b/redhat/kdebase/trinity-kdebase-3.5.13.spec
@@ -41,6 +41,13 @@ Source0:	kdebase-%{version}.tar.gz
 # Wrapper script to prevent Plasma launch at Trinity Startup
 Source1:	plasma-desktop
 
+# Pam configuration files for RHEL / Fedora
+Source2:	pamd.kdm-trinity%{?dist}
+Source3:	pamd.kdm-trinity-np%{?dist}
+Source4:	pamd.kcheckpass-trinity%{?dist}
+Source5:	pamd.kscreensaver-trinity%{?dist}
+
+
 # TDE for RHEL/Fedora specific patches
 # [kdebase/kdesu] Remove 'ignore' button on 'kdesu' dialog box
 Patch3:		kdebase-3.5.13-kdesu-noignorebutton.patch
@@ -196,6 +203,9 @@ cd build
   -DWITH_I8K=OFF \
   -DWITH_HAL=ON \
   -DBUILD_ALL=ON \
+  -DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" \
+  -DKDM_PAM_SERVICE="kdm-trinity" \
+  -DKSCREENSAVER_PAM_SERVICE="kscreensaver-trinity" \
   ..
 
 %__make %{?_smp_mflags} 
@@ -222,6 +232,13 @@ mv -f %{?buildroot}%{_sysconfdir}/ksysguarddrc %{?buildroot}%{_sysconfdir}/ksysg
 %__cp -f "%{SOURCE1}" "%{?buildroot}%{_bindir}"
 %endif
 
+# PAM configuration files
+%__mkdir_p "%{?buildroot}%{_sysconfdir}/pam.d"
+%__install -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/kdm-trinity"
+%__install -m 644 "%{SOURCE3}" "%{?buildroot}%{_sysconfdir}/pam.d/kdm-trinity-np"
+%__install -m 644 "%{SOURCE4}" "%{?buildroot}%{_sysconfdir}/pam.d/kcheckpass-trinity"
+%__install -m 644 "%{SOURCE5}" "%{?buildroot}%{_sysconfdir}/pam.d/kscreensaver-trinity"
+
 %clean
 %__rm -rf %{?buildroot}
 
@@ -309,6 +326,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %exclude %{_datadir}/applnk/Utilities/kpager.desktop
 %exclude %{_datadir}/icons/hicolor/*/apps/kpager.png
 
+# Pam configuration
+%{_sysconfdir}/pam.d/*
+
 %doc AUTHORS COPYING README
 %{tde_docdir}/HTML/en/*
 %config(noreplace) %{_sysconfdir}/ksysguarddrc.tde