packages: kdelibs/kdelibs.spec - drop kdelibs-libs (ooo for what the origin...

[glen]

Author: glen                         Date: Thu Jan 14 16:03:02 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- drop kdelibs-libs (ooo for what the original split was is available on 64bit for long time already); rel 17

---- Files affected:
packages/kdelibs:
   kdelibs.spec (1.587 -> 1.588) 

---- Diffs:

================================================================
Index: packages/kdelibs/kdelibs.spec
diff -u packages/kdelibs/kdelibs.spec:1.587 packages/kdelibs/kdelibs.spec:1.588
--- packages/kdelibs/kdelibs.spec:1.587	Wed Jan  6 16:14:53 2010
+++ packages/kdelibs/kdelibs.spec	Thu Jan 14 17:02:57 2010
@@ -19,7 +19,7 @@
 Summary(uk.UTF-8):	K Desktop Environment - Бібліотеки
 Name:		kdelibs
 Version:	3.5.10
-Release:	16
+Release:	17
 Epoch:		9
 License:	LGPL
 Group:		X11/Libraries
@@ -75,9 +75,9 @@
 # <sys/inotify.h>
 BuildRequires:	glibc-devel >= 6:2.4
 %{?with_apidocs:BuildRequires:	graphviz}
+%{?with_kerberos5:BuildRequires:	heimdal-devel}
 BuildRequires:	hspell-devel
 BuildRequires:	jasper-devel >= 1.600
-%{?with_kerberos5:BuildRequires:	heimdal-devel}
 BuildRequires:	libart_lgpl-devel
 BuildRequires:	libidn-devel
 BuildRequires:	libjpeg-devel
@@ -109,8 +109,8 @@
 BuildConflicts:	kdepim-korganizer-libs
 BuildConflicts:	kdepim-libkdepim < 3:3.3.0
 %endif
-Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 Requires:	arts >= %{artsver}
+Requires:	cups-lib >= 1:1.3.0
 Requires:	docbook-dtd412-xml
 Requires:	docbook-dtd42-xml
 Requires:	docbook-style-xsl
@@ -122,6 +122,7 @@
 Requires:	xorg-app-iceauth
 Obsoletes:	arts-kde
 Obsoletes:	kde-theme-keramik
+Obsoletes:	kdebase-libs < 9:3.5.10-17
 Obsoletes:	kdelibs-kabc
 Obsoletes:	kdelibs-shared
 Obsoletes:	kdelibs-sound
@@ -232,18 +233,6 @@
 - kimgio (обробка зображень).
 - kspell (перевірка орфографії),
 
-%package libs
-Summary:	KDE libraries
-Summary(pl.UTF-8):	Biblioteki KDE
-Group:		Libraries
-Requires:	cups-lib >= 1:1.3.0
-
-%description libs
-KDE libraries.
-
-%description libs -l pl.UTF-8
-Biblioteki KDE.
-
 %package devel
 Summary:	kdelibs - header files and development documentation
 Summary(pl.UTF-8):	kdelibs - pliki nagłówkowe i dokumentacja do kdelibs
@@ -473,8 +462,8 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post	libs -p /sbin/ldconfig
-%postun	libs -p /sbin/ldconfig
+%post	-p /sbin/ldconfig
+%postun	-p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
@@ -715,8 +704,6 @@
 %{_datadir}/services/kresources/kabc
 %{_desktopdir}/kde/kresources.desktop
 
-%files libs
-%defattr(644,root,root,755)
 %dir %{_libdir}/kde3
 %dir %{_libdir}/kde3/plugins
 %dir %{_libdir}/kde3/plugins/designer
@@ -1001,6 +988,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.588  2010/01/14 16:02:57  glen
+- drop kdelibs-libs (ooo for what the original split was is available on 64bit for long time already); rel 17
+
 Revision 1.587  2010/01/06 15:14:53  glen
 - ccache is problem
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kdelibs/kdelibs.spec?r1=1.587&r2=1.588&f=u