SPECS (DEVEL): kde4-kdebase-workspace.spec - put old -core packge into main

[shadzik]

Author: shadzik                      Date: Sun Oct 19 19:50:27 2008 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- put old -core packge into main

---- Files affected:
SPECS:
   kde4-kdebase-workspace.spec (1.115.2.20 -> 1.115.2.21) 

---- Diffs:

================================================================
Index: SPECS/kde4-kdebase-workspace.spec
diff -u SPECS/kde4-kdebase-workspace.spec:1.115.2.20 SPECS/kde4-kdebase-workspace.spec:1.115.2.21
--- SPECS/kde4-kdebase-workspace.spec:1.115.2.20	Sun Oct 19 21:10:50 2008
+++ SPECS/kde4-kdebase-workspace.spec	Sun Oct 19 21:50:22 2008
@@ -1,10 +1,9 @@
 # $Revision$, $Date$
 # TODO:
-# - it's real mess, split (especially -core) looks like picking random files
 # - internal deps (really FUBAR currently)
 %define		oname		kdebase-workspace
 %define		_state		unstable
-%define		qt4brver	4.4.1
+%define		qt4brver	4.4.3
 
 Summary:	KDE 4 base workspace components
 Summary(pl.UTF-8):	Podstawowe komponenty środowiska KDE 4
@@ -61,6 +60,10 @@
 Requires:	xorg-app-xprop
 Requires:	xorg-app-xset
 Requires:	xorg-app-xsetroot
+Requires:	kde4-decoration-ozone >= %{version}
+Requires:	kde4-icons-oxygen >= %{version}
+Suggests:	kde4-style-oxygen >= %{version}
+Obsoletes:	kde4-kdebase-workspace-core
 Obsoletes:	kdebase-desktop
 Obsoletes:	kdebase4-workspace
 Conflicts:	kdebase-core
@@ -82,24 +85,6 @@
 - ekrany startowe KDE
 - wiele innych elementów.
 
-%package core
-Summary:	KDE core applications
-Summary(pl.UTF-8):	Podstawowe aplikacje KDE
-Group:		X11/Applications
-Requires:	kde4-decoration-ozone >= %{version}
-Requires:	kde4-icons-oxygen >= %{version}
-Requires:	phonon
-#Requires:	xdg-menus
-Suggests:	kde4-style-oxygen >= %{version}
-#Suggests:	sudo
-#Conflicts:	kttsd <= 040609
-
-%description core
-Some random mess, needs fix.
-
-%description core -l pl.UTF-8
-Przypadkowy zbiór śmieci, do poprawki.
-
 %package libksgrd
 Summary:	ksgrd library
 Summary(pl.UTF-8):	Biblioteka ksgrd
@@ -880,8 +865,7 @@
 %attr(755,root,root) %{_libdir}/liblsofui.so.?
 %attr(755,root,root) %{_libdir}/liblsofui.so.*.*.*
 
-%files core
-%defattr(644,root,root,755)
+#old core
 %dir %{_iconsdir}/oxygen/*/mimetypes
 %dir %{_datadir}/apps/kcminput
 %dir %{_datadir}/apps/kcminput/pics
@@ -1467,6 +1451,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.115.2.21  2008/10/19 19:50:22  shadzik
+- put old -core packge into main
+
 Revision 1.115.2.20  2008/10/19 19:10:50  paszczus
 - and few more
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kde4-kdebase-workspace.spec?r1=1.115.2.20&r2=1.115.2.21&f=u