rpms/kdebase-workspace/devel .cvsignore, 1.44, 1.45 kdebase-workspace.spec, 1.335, 1.336 sources, 1.52, 1.53

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1230

Modified Files:
	.cvsignore kdebase-workspace.spec sources 
Log Message:
* Wed Jan 06 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.90-1
- kde-4.3.85 (4.4rc1)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- .cvsignore	18 Dec 2009 16:04:37 -0000	1.44
+++ .cvsignore	6 Jan 2010 22:11:42 -0000	1.45
@@ -1 +1 @@
-kdebase-workspace-4.3.85.tar.bz2
+kdebase-workspace-4.3.90.tar.bz2


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.335
retrieving revision 1.336
diff -u -p -r1.335 -r1.336
--- kdebase-workspace.spec	5 Jan 2010 15:20:19 -0000	1.335
+++ kdebase-workspace.spec	6 Jan 2010 22:11:42 -0000	1.336
@@ -5,12 +5,19 @@
 %define polkit_09 1
 %endif
 
+%if 0%{?fedora} > 12
+# TODO/FIXME: handle the new plymouth --ping style/case
+%define plymouth_hack_ping 1
+%else
+%define plymouth_hack_spool 1
+%endif
+
 %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Summary: KDE Workspace
 Name:    kdebase-workspace
-Version: 4.3.85
-Release: 3%{?dist}
+Version: 4.3.90
+Release: 1%{?dist}
 
 License: GPLv2
 Group:   User Interface/Desktops
@@ -87,7 +94,6 @@ BuildRequires: libcaptury-devel
 %endif
 BuildRequires: glib2-devel
 BuildRequires: kdelibs4-devel >= %{version}
-BuildRequires: kdelibs-experimental-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
 BuildRequires: libutempter-devel
 BuildRequires: libxklavier-devel
@@ -279,7 +285,9 @@ Requires: akonadi
 %patch15 -p1 -b .kio_sysinfo
 %patch16 -p1 -b .showremainingtime
 %patch17 -p1 -b .classicmenu-logout
+%if 0%{?plymouth_hack_spool}
 %patch19 -p1 -b .kdm_plymouth
+%endif
 %patch20 -p1 -b .xsession_errors_O_APPEND
 %patch21 -p1 -b .no_malloc_check
 
@@ -638,6 +646,9 @@ fi
 
 
 %changelog
+* Wed Jan 06 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.90-1
+- kde-4.3.85 (4.4rc1)
+
 * Tue Jan 05 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.85-3
 - F13+: don't Obsoletes: PolicyKit-kde, let polkit-kde obsolete it
 - F13+: explicitly require polkit-kde instead of PolicyKit-authentication-agent


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- sources	18 Dec 2009 16:04:38 -0000	1.52
+++ sources	6 Jan 2010 22:11:42 -0000	1.53
@@ -1 +1 @@
-b727b668858a4ddbe4649643f62ebd4a  kdebase-workspace-4.3.85.tar.bz2
+21c77cd85d4c47553678d6fde8300947  kdebase-workspace-4.3.90.tar.bz2