rpms/kdebase-workspace/devel kdebase-workspace.spec, 1.11, 1.12 kde.pam, 1.1, NONE kdm.pam, 1.1, NONE

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20577

Modified Files:
	kdebase-workspace.spec 
Removed Files:
	kde.pam kdm.pam 
Log Message:
* Mon Dec 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.97.0-3
- Requires: coreutils dbus-x11 xorg-x11-apps xorg-x11-utils 
            xorg-x11-server-utils (used in startkde)
- drop pam configs that were previously moved to kde-settings



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- kdebase-workspace.spec	11 Dec 2007 11:30:10 -0000	1.11
+++ kdebase-workspace.spec	17 Dec 2007 13:20:56 -0000	1.12
@@ -6,10 +6,8 @@
 Name: kdebase-workspace
 Version: 3.97.0
 
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/unstable/3.96.1/src/kdebase-workspace-%{version}.tar.bz2
-Source1: kdm.pam
-Source2: kde.pam
 License: GPLv2
 Group: User Interface/Desktops
 URL: http://www.kde.org/
@@ -43,9 +41,17 @@
 Requires(post): xdg-utils
 Requires(postun): xdg-utils
 
-#Requires: kdebase-runtime >= %{version}
-#Requires: oxygen-icon-theme
-
+# would much rather these deps be elsewhere, 
+# but adding here doesn't hurt either -- Rex
+Requires: kdebase-runtime >= %{version}
+Requires: oxygen-icon-theme
+
+# startkde references: dbus-launch df mkdir test xmessage xprop xrandr xrdb xset xsetroot
+Requires: coreutils
+Requires: dbus-x11
+Requires: xorg-x11-apps
+Requires: xorg-x11-utils
+Requires: xorg-x11-server-utils
 
 %description
 The KDE Workspace consists of what is the desktop of the 
@@ -111,14 +117,6 @@
 
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
-# pam, include in kde-settings (for now) -- Rex
-%if 0
-mkdir -p %{buildroot}/etc/pam.d/
-install -p -m 644 %{SOURCE1} %{buildroot}/etc/pam.d/kdm
-install -p -m 644 %{SOURCE2} %{buildroot}/etc/pam.d/kcheckpass
-install -p -m 644 %{SOURCE2} %{buildroot}/etc/pam.d/kscreensaver
-%endif
-
 # xsession support
 mkdir -p %{buildroot}%{_datadir}/xsessions/
 ln -s %{_kde4_appsdir}/kdm/sessions/kde.desktop %{buildroot}%{_datadir}/xsessions/kde.desktop
@@ -153,6 +151,7 @@
 %clean
 rm -rf %{buildroot}
 
+
 %post
 xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
 xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
@@ -208,6 +207,11 @@
 
 
 %changelog
+* Mon Dec 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.97.0-3
+- Requires: coreutils dbus-x11 xorg-x11-apps xorg-x11-utils 
+            xorg-x11-server-utils (used in startkde)
+- drop pam configs that were previously moved to kde-settings
+
 * Tue Dec 11 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.97.0-2
 - rebuild for changed _kde4_includedir
 


--- kde.pam DELETED ---


--- kdm.pam DELETED ---