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

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	kdebase3.spec 
Log Message:
* Sat Dec 08 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.8-18
- omit pam configs, kdm bits, xsession/gdm support (f9+)



Index: kdebase3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase3/devel/kdebase3.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kdebase3.spec	8 Dec 2007 19:01:04 -0000	1.3
+++ kdebase3.spec	8 Dec 2007 21:29:57 -0000	1.4
@@ -22,7 +22,7 @@
 %endif
 
 Version: 3.5.8
-Release: 17%{?dist}
+Release: 18%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase3
@@ -129,10 +129,6 @@
 # upgrade path for former kde-redhat'ers
 Obsoletes: %{name}-kdm < %{epoch}:%{version}-%{release}
 Provides:  %{name}-kdm = %{epoch}:%{version}-%{release}
-%endif
-
-# FIXME/TODO: Is kde-settings-kdm really not needed in kdebase3?
-%if "%{name}" == "kdebase"
 # when/if -kdm is ever packaged separately
 Requires: kde-settings-kdm
 %endif
@@ -379,20 +375,6 @@
 # Nuke man2html - we get it from man
 find %{buildroot} -name "man2html*" | xargs rm -rf
 
-# install gdm session support
-mkdir -p %{buildroot}%{_datadir}/xsessions
-install -p -m 755 %{SOURCE3} %{buildroot}%{_datadir}/xsessions/
-
-# install logrotate script
-mkdir -p %{buildroot}/etc/logrotate.d
-install -p -m 644 %{SOURCE6} %{buildroot}/etc/logrotate.d/kdm
-
-# own %{_datadir}/apps/kdm/faces
-mkdir -p %{buildroot}%{_datadir}/apps/kdm/faces
-pushd %{buildroot}%{_datadir}/apps/kdm/faces
-ln -sf ../pics/users/default1.png .default.face.icon
-popd
-
 # nuke default kdm setup in favor of our own
 rm -rf  %{buildroot}%{_datadir}/config/kdm
 
@@ -438,16 +420,29 @@
 
 %endif
 
-install -p -m755 -D %{SOURCE8} %{buildroot}%{_sysconfdir}/kde/env/env.sh
-
 # Own Mozilla plugin dir
 mkdir -p %{buildroot}%{_libdir}/mozilla/plugins
 
 # exclude fonts.dir
 rm -f %{buildroot}%{_datadir}/fonts/override/fonts.dir
 
+
 %if "%{name}" == "kdebase"
 
+install -p -m755 -D %{SOURCE8} %{buildroot}%{_sysconfdir}/kde/env/env.sh
+
+# install gdm session support
+install -p -m755 -D %{SOURCE3} %{buildroot}%{_datadir}/xsessions/kde.desktop
+
+# install logrotate script
+install -p -m 644 -D %{SOURCE6} %{buildroot}/etc/logrotate.d/kdm
+
+# own %{_datadir}/apps/kdm/faces
+mkdir -p %{buildroot}%{_datadir}/apps/kdm/faces
+pushd %{buildroot}%{_datadir}/apps/kdm/faces
+ln -sf ../pics/users/default1.png .default.face.icon
+popd
+
 ## install pam configuration files
 %if 0%{?fedora} > 4 || 0%{?rhel} > 4
 install -p -m644 -D %{SOURCE5}    $RPM_BUILD_ROOT/etc/pam.d/kdm-np
@@ -629,7 +624,10 @@
 %doc AUTHORS COPYING README
 %{_docdir}/HTML/en/*
 %if "%{name}" == "kdebase"
+%{_sysconfdir}/kde/env/*
+%config(noreplace) /etc/logrotate.d/kdm
 %config(noreplace) /etc/ksysguarddrc
+%config(noreplace) /etc/pam.d/*
 %config(noreplace) %{_datadir}/xsessions/*
 %{_bindir}/genkdmconf
 %{_bindir}/kaccess
@@ -691,9 +689,6 @@
 %endif
 
 %config(noreplace) /etc/xdg/menus/*
-%config(noreplace) /etc/logrotate.d/kdm
-%{_sysconfdir}/kde/env/*
-%config(noreplace) /etc/pam.d/*
 %dir %{_libdir}/mozilla
 %dir %{_libdir}/mozilla/plugins
 %{_bindir}/appletproxy
@@ -776,8 +771,8 @@
 
 
 %changelog
-* Sat Dec 08 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.8-17
-- omit pam configs (f9+)
+* Sat Dec 08 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.8-18
+- omit pam configs, kdm bits, xsession/gdm support (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)