rpms/kdebase3/devel kdebase3.spec,1.2,1.3

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16104

Modified Files:
	kdebase3.spec 
Log Message:
* Sat Dec 08 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.8-17
- omit pam configs (f9+)



Index: kdebase3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase3/devel/kdebase3.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kdebase3.spec	4 Dec 2007 18:26:56 -0000	1.2
+++ kdebase3.spec	8 Dec 2007 19:01:04 -0000	1.3
@@ -22,7 +22,7 @@
 %endif
 
 Version: 3.5.8
-Release: 16%{?dist}
+Release: 17%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase3
@@ -376,19 +376,6 @@
 # Fix up permissions on some things
 chmod 755 %{buildroot}%{_bindir}/kdesud
 
-## install pam configuration files
-%if 0%{?fedora} > 4 || 0%{?rhel} > 4
-install -p -m644 -D %{SOURCE5}    $RPM_BUILD_ROOT/etc/pam.d/kdm-np
-install -p -m644 -D %{SOURCE1001} $RPM_BUILD_ROOT/etc/pam.d/kdm
-install -p -m644 -D %{SOURCE1001} $RPM_BUILD_ROOT/etc/pam.d/kscreensaver
-install -p -m644 -D %{SOURCE1001} $RPM_BUILD_ROOT/etc/pam.d/kcheckpass
-%else
-install -p -m644 -D %{SOURCE50}   $RPM_BUILD_ROOT/etc/pam.d/kdm-np
-install -p -m644 -D %{SOURCE1002} $RPM_BUILD_ROOT/etc/pam.d/kdm
-install -p -m644 -D %{SOURCE1002} $RPM_BUILD_ROOT/etc/pam.d/kscreensaver
-install -p -m644 -D %{SOURCE1002} $RPM_BUILD_ROOT/etc/pam.d/kcheckpass
-%endif
-
 # Nuke man2html - we get it from man
 find %{buildroot} -name "man2html*" | xargs rm -rf
 
@@ -459,8 +446,24 @@
 # exclude fonts.dir
 rm -f %{buildroot}%{_datadir}/fonts/override/fonts.dir
 
+%if "%{name}" == "kdebase"
+
+## install pam configuration files
+%if 0%{?fedora} > 4 || 0%{?rhel} > 4
+install -p -m644 -D %{SOURCE5}    $RPM_BUILD_ROOT/etc/pam.d/kdm-np
+install -p -m644 -D %{SOURCE1001} $RPM_BUILD_ROOT/etc/pam.d/kdm
+install -p -m644 -D %{SOURCE1001} $RPM_BUILD_ROOT/etc/pam.d/kscreensaver
+install -p -m644 -D %{SOURCE1001} $RPM_BUILD_ROOT/etc/pam.d/kcheckpass
+%else
+install -p -m644 -D %{SOURCE50}   $RPM_BUILD_ROOT/etc/pam.d/kdm-np
+install -p -m644 -D %{SOURCE1002} $RPM_BUILD_ROOT/etc/pam.d/kdm
+install -p -m644 -D %{SOURCE1002} $RPM_BUILD_ROOT/etc/pam.d/kscreensaver
+install -p -m644 -D %{SOURCE1002} $RPM_BUILD_ROOT/etc/pam.d/kcheckpass
+%endif
+
+%else
 # FIXME/TODO: initial removal. Check if the simple rm breaks anything.
-%if "%{name}" != "kdebase"
+
 # remove conflicts with kdebase-workspace
 pushd %{buildroot}%{_bindir}
 rm -f genkdmconf kaccess kappfinder kapplymousetheme kate kbookmarkmerger \
@@ -773,6 +776,9 @@
 
 
 %changelog
+* Sat Dec 08 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.8-17
+- omit pam configs (f9+)
+
 * Tue Dec 04 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.8-16
 - disable kioslave/smb (f9+, samba-3.2.x/gplv3 ickiness)
 - omit kde_settings optionals