SPECS: kde4-kdebase.spec - kill stupid -common subpackages - moved dirs to ...

[shadzik]

Author: shadzik                      Date: Fri Jun 20 17:45:01 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- kill stupid -common subpackages
- moved dirs to kde4-kdelibs

---- Files affected:
SPECS:
   kde4-kdebase.spec (1.58 -> 1.59) 

---- Diffs:

================================================================
Index: SPECS/kde4-kdebase.spec
diff -u SPECS/kde4-kdebase.spec:1.58 SPECS/kde4-kdebase.spec:1.59
--- SPECS/kde4-kdebase.spec:1.58	Fri Jun 20 18:17:29 2008
+++ SPECS/kde4-kdebase.spec	Fri Jun 20 19:44:55 2008
@@ -132,30 +132,6 @@
 (kcheckpass, kikbd, kscreensaver, kcontrol, kfind, kfontmanager,
 kmenuedit, kappfinder).
 
-%package common
-Summary:	KDE4 common directories
-Summary(pl.UTF-8):	Wspólne pliki KDE4.
-Group:		X11/Libraries
-
-%description common
-KDE4 common directories.
-
-%description common -l pl.UTF-8
-Wspólne katalogi KDE4.
-
-%package common-konsole
-Summary:	Common files for konsole and konsolepart
-Summary(pl.UTF-8):	Pliki wspólne dla konsole i konsolepart
-Group:		X11/Applications
-Requires(post,postun):	fontpostinst
-Requires:	kde4-kdelibs >= %{version}
-
-%description common-konsole
-Color schemes, icons, fonts and shell profiles for konsole.
-
-%description common-konsole -l pl.UTF-8
-Schematy kolorów, ikony, czcionki oraz profile sesji dla konsole.
-
 %package core
 Summary:	KDE Core Apps
 Summary(pl.UTF-8):	Podstawowe aplikacje KDE
@@ -258,9 +234,9 @@
 Summary:	KDE Terminal Emulator
 Summary(pl.UTF-8):	Emulator terminala dla KDE
 Group:		X11/Applications
-Requires:	%{name}-common-konsole = %{version}-%{release}
 Requires:	%{name}-core = %{version}-%{release}
-#Obsoletes:	konsole
+Provides:	%{name}-common-konsole
+Obsoletes:	%{name}-common-konsole
 
 %description konsole
 KDE Terminal Emulator.
@@ -273,7 +249,6 @@
 Summary(pl.UTF-8):	Edytor tekstu dla KDE
 Group:		X11/Applications/Editors
 Requires:	%{name}-core = %{version}-%{release}
-#Obsoletes:	kwrite
 
 %description kwrite
 KWrite is a simple texteditor, with syntaxhighlighting, codefolding,
@@ -331,7 +306,6 @@
 Summary:	Konqueror - web browser and file manager
 Summary(pl.UTF-8):	Konqueror - przeglądarka WWW i zarządca plików
 Group:		X11/Applications
-Requires:	%{name}-common = %{version}-%{release}
 Requires:	kde4-konqueror-libs = %{version}-%{release}
 Provides:	wwwbrowser
 Obsoletes:	konqueror < 9:3.0.0
@@ -438,10 +412,10 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post common-konsole
+%post konsole
 %{_bindir}/fontpostinst misc
 
-%postun common-konsole
+%postun konsole
 %{_bindir}/fontpostinst misc
 
 %post	core -p /sbin/ldconfig
@@ -450,15 +424,6 @@
 %post	-n kde4-konqueror-libs	-p /sbin/ldconfig
 %postun	-n kde4-konqueror-libs	-p /sbin/ldconfig
 
-%files common
-%defattr(644,root,root,755)
-%dir %{_desktopdir}/kde4
-%dir %{_datadir}/kde4/services/ServiceMenus
-
-%files common-konsole
-%defattr(644,root,root,755)
-%{_datadir}/apps/konsole
-
 %files core
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/kbookmarkmerger
@@ -563,6 +528,7 @@
 %attr(755,root,root) %{_libdir}/kde4/libkonsolepart.so
 %{_datadir}/kde4/services/ServiceMenus/konsolehere.desktop
 %{_datadir}/kde4/services/konsolepart.desktop
+%{_datadir}/apps/konsole
 %{_desktopdir}/kde4/konsole.desktop
 %{_kdedocdir}/en/konsole
 
@@ -732,6 +698,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.59  2008/06/20 17:44:55  shadzik
+- kill stupid -common subpackages
+- moved dirs to kde4-kdelibs
+
 Revision 1.58  2008/06/20 16:17:29  shadzik
 - 64bit fix
 
================================================================

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