rpms/kdebase-workspace/F-9 .cvsignore, 1.11, 1.12 kdebase-workspace.spec, 1.93, 1.94 sources, 1.13, 1.14

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-workspace/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20624/F-9

Modified Files:
	.cvsignore kdebase-workspace.spec sources 
Log Message:
Sync from devel:

* Wed Jul 23 2008 Than Ngo <than at redhat.com> 4.1.0-1
- 4.1.0

* Wed Jul 23 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.99-5
- F10+: fix circular kdebase<->kdebase-workspace dependency: don't Obsolete or
  Require kdebase, as kdebase now requires kdebase-workspace, obviating the
  upgrade path hack

* Tue Jul 22 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.99-4
- oxygen-cursor-themes, -wallpapers subpkgs


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-9/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	19 Jul 2008 18:15:11 -0000	1.11
+++ .cvsignore	25 Jul 2008 14:02:10 -0000	1.12
@@ -1 +1,2 @@
 kdebase-workspace-4.0.99.tar.bz2
+kdebase-workspace-4.1.0.tar.bz2


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-9/kdebase-workspace.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- kdebase-workspace.spec	19 Jul 2008 20:33:47 -0000	1.93
+++ kdebase-workspace.spec	25 Jul 2008 14:02:10 -0000	1.94
@@ -2,9 +2,9 @@
 
 Summary: K Desktop Environment - Workspace
 Name: kdebase-workspace
-Version: 4.0.99
+Version: 4.1.0
 
-Release: 3%{?dist}
+Release: 1%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -39,10 +39,12 @@
 Provides: kdebase-kdm = 6:%{version}-%{release}
 Provides: kdm = %{version}-%{release}
 
+%if 0%{?fedora} == 9
 # upgrade path: kdebase(3) -> kdebase-workspace
 Obsoletes: kdebase < 6:4
 # so kdebase doesn't get lost on kde3->kde4 upgrade (#444928)
 Requires: kdebase4
+%endif
 
 # kdmtheme's functionality is now provided by kdebase-workspace itself
 Obsoletes: kdmtheme < 1.3
@@ -118,13 +120,26 @@
 %description libs
 %{summary}.
 
+%package wallpapers 
+Summary: KDE wallpapers 
+Group: User Interface/Desktops
+Requires: kde-filesystem
+%description wallpapers 
+%{summary}.
+
 %package -n ksysguardd
 Summary: Performance monitor daemon
 Group:   System Environment/Daemons
-# FIXME -- Rex
 %description -n ksysguardd
 %{summary}.
 
+%package -n oxygen-cursor-themes 
+Summary: Oxygen cursor themes 
+Group: User Interface/Desktops
+%description -n oxygen-cursor-themes 
+%{summary}.
+
+
 
 %prep
 
@@ -235,7 +250,6 @@
 %{_kde4_configdir}/*
 %{_kde4_datadir}/kde4/services/*
 %{_kde4_datadir}/kde4/servicetypes/*
-%{_kde4_datadir}/wallpapers/*
 %{_kde4_datadir}/sounds/*
 %{_kde4_datadir}/autostart/*
 %{_kde4_datadir}/applications/kde4/*
@@ -245,19 +259,8 @@
 %{_kde4_docdir}/HTML/en/*
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/oxygen/*/*/*
-%{_kde4_iconsdir}/Oxygen_Black/
-%{_kde4_iconsdir}/Oxygen_Black_Big/
-%{_kde4_iconsdir}/Oxygen_Blue/
-%{_kde4_iconsdir}/Oxygen_Blue_Big/
-%{_kde4_iconsdir}/Oxygen_White/
-%{_kde4_iconsdir}/Oxygen_White_Big/
-%{_kde4_iconsdir}/Oxygen_Yellow/
-%{_kde4_iconsdir}/Oxygen_Yellow_Big/
-%{_kde4_iconsdir}/Oxygen_Zion/
-%{_kde4_iconsdir}/Oxygen_Zion_Big/
 %{_kde4_libdir}/kde4/*.so
 %{_kde4_libexecdir}/*
-
 %{_libdir}/strigi/
 %{_kde4_libdir}/libkdeinit*.so
 %{_kde4_libdir}/kconf_update_bin/*
@@ -274,13 +277,41 @@
 %{_kde4_libdir}/kde4/plugins/designer/ksysguardwidgets.so
 %exclude %{_kde4_libdir}/libkdeinit*.so
 
+%files wallpapers
+%defattr(-,root,root,-)
+%{_kde4_datadir}/wallpapers/*
+
 %files -n ksysguardd
 %defattr(-,root,root,-)
 %config(noreplace) %{_kde4_sysconfdir}/ksysguarddrc
 %{_kde4_bindir}/ksysguardd
 
+%files -n oxygen-cursor-themes
+%defattr(-,root,root,-)
+%{_kde4_iconsdir}/Oxygen_Black/
+%{_kde4_iconsdir}/Oxygen_Black_Big/
+%{_kde4_iconsdir}/Oxygen_Blue/
+%{_kde4_iconsdir}/Oxygen_Blue_Big/
+%{_kde4_iconsdir}/Oxygen_White/
+%{_kde4_iconsdir}/Oxygen_White_Big/
+%{_kde4_iconsdir}/Oxygen_Yellow/
+%{_kde4_iconsdir}/Oxygen_Yellow_Big/
+%{_kde4_iconsdir}/Oxygen_Zion/
+%{_kde4_iconsdir}/Oxygen_Zion_Big/
+
 
 %changelog
+* Wed Jul 23 2008 Than Ngo <than at redhat.com> 4.1.0-1
+- 4.1.0
+
+* Wed Jul 23 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.99-5
+- F10+: fix circular kdebase<->kdebase-workspace dependency: don't Obsolete or
+  Require kdebase, as kdebase now requires kdebase-workspace, obviating the
+  upgrade path hack
+
+* Tue Jul 22 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.99-4
+- oxygen-cursor-themes, -wallpapers subpkgs
+
 * Sat Jul 19 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.99-3
 - BR soprano-devel (optional dependency of the Plasma Engine Explorer)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-9/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	19 Jul 2008 18:15:11 -0000	1.13
+++ sources	25 Jul 2008 14:02:10 -0000	1.14
@@ -1 +1 @@
-eec3d9d9886a0436672007ab2568a20a  kdebase-workspace-4.0.99.tar.bz2
+3b7db1a9860c68165f2cdc3d301974f6  kdebase-workspace-4.1.0.tar.bz2