rpms/kdebase-workspace/devel kdebase-workspace-3.97.0-plasma-pager.patch, NONE, 1.1 kdebase-workspace.spec, 1.9, 1.10 kdebase-workspace-3.96.0-plasma-pager.diff, 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-serv4116

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-3.97.0-plasma-pager.patch 
Removed Files:
	kdebase-workspace-3.96.0-plasma-pager.diff 
Log Message:
* Wed Dec 05 2007 Rex Dieter <rdieter[AT]fedoraprojec.torg. 3.97.0-1
- kde-3.97.0
- move pam configs to kde-settings
- Requires: kde-settings-kdm


kdebase-workspace-3.97.0-plasma-pager.patch:

--- NEW FILE kdebase-workspace-3.97.0-plasma-pager.patch ---
diff -up kdebase-workspace-3.97.0/libs/plasma/corona.cpp.plasma-pager kdebase-workspace-3.97.0/libs/plasma/corona.cpp
--- kdebase-workspace-3.97.0/libs/plasma/corona.cpp.plasma-pager	2007-12-05 08:12:41.000000000 -0600
+++ kdebase-workspace-3.97.0/libs/plasma/corona.cpp	2007-12-05 18:40:30.000000000 -0600
@@ -266,6 +266,7 @@ void Corona::loadDefaultSetup()
     panel->addApplet("tasks");
     panel->addApplet("systemtray");
     panel->addApplet("notifier");
+    panel->addApplet("pager");
     panel->addApplet("digital-clock");
 
     // trigger an instant layout so we immediately have a proper geometry rather than waiting around


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- kdebase-workspace.spec	4 Dec 2007 13:42:54 -0000	1.9
+++ kdebase-workspace.spec	6 Dec 2007 04:06:44 -0000	1.10
@@ -4,9 +4,9 @@
 
 Summary: K Desktop Environment - Workspace
 Name: kdebase-workspace
-Version: 3.96.2
+Version: 3.97.0
 
-Release: 3%{?dist}
+Release: 1%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/unstable/3.96.1/src/kdebase-workspace-%{version}.tar.bz2
 Source1: kdm.pam
 Source2: kde.pam
@@ -15,7 +15,7 @@
 URL: http://www.kde.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch0: kdebase-workspace-3.96.0-plasma-pager.diff
+Patch0: kdebase-workspace-3.97.0-plasma-pager.patch
 Patch1: kdebase-workspace-3.96.1-redhat-startkde.patch
 Patch2: kdebase-workspace-3.96.2-consolekit-kdm.patch
 
@@ -37,10 +37,11 @@
 BuildRequires: pam-devel
 BuildRequires: qimageblitz-devel
 
+Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: kde-settings-kdm
+%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires(post): xdg-utils
 Requires(postun): xdg-utils
-%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
-Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 
 #Requires: kdebase-runtime >= %{version}
 #Requires: oxygen-icon-theme
@@ -83,6 +84,7 @@
 %prep
 
 %setup -q
+
 # Use for now to get a more workable desktop
 %patch0 -p1 -b .plasma-pager
 # RH/Fedora-specific startkde changes
@@ -109,11 +111,13 @@
 
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
-# pam
+# 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/
@@ -167,7 +171,6 @@
 %files
 %defattr(-,root,root,-)
 %doc COPYING README
-%config(noreplace) /etc/pam.d/*
 %config(noreplace) %{_kde4_sysconfdir}/ksysguarddrc
 # FIXME/TODO: Consider %config(noreplace)
 %config %{_kde4_sysconfdir}/systemsettingsrc
@@ -205,6 +208,11 @@
 
 
 %changelog
+* Wed Dec 05 2007 Rex Dieter <rdieter[AT]fedoraprojec.torg. 3.97.0-1
+- kde-3.97.0
+- move pam configs to kde-settings
+- Requires: kde-settings-kdm
+
 * Tue Dec 04 2007 Than Ngo <than at redhat.com> 3.96.2-3
 - fix kdm/kcheckpass/kscreensaver to get working
 


--- kdebase-workspace-3.96.0-plasma-pager.diff DELETED ---