Author: shadzik Date: Sat Aug 29 20:29:54 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- merged -libs to main package
---- Files affected:
packages/kde4-kdelibs:
kde4-kdelibs.spec (1.160 -> 1.161)
---- Diffs:
================================================================
Index: packages/kde4-kdelibs/kde4-kdelibs.spec
diff -u packages/kde4-kdelibs/kde4-kdelibs.spec:1.160
packages/kde4-kdelibs/kde4-kdelibs.spec:1.161
--- packages/kde4-kdelibs/kde4-kdelibs.spec:1.160 Fri Aug 28 15:17:54 2009
+++ packages/kde4-kdelibs/kde4-kdelibs.spec Sat Aug 29 22:29:48 2009
@@ -84,7 +84,6 @@
BuildRequires: zlib-devel
BuildConflicts: kdelibs
BuildConflicts: kdelibs-devel
-Requires: %{name}-libs = %{version}-%{release}
Requires: QtCore >= %{qtver}
Requires: hicolor-icon-theme
Requires: kde-common-dirs >= 0.5
@@ -92,8 +91,10 @@
Requires: xdg-menus
Requires: xorg-app-iceauth
Suggests: kde4-icons
+Provides: %{name}-libs
Provides: %{name}-shared
-Obsoletes: kde4-kdelibs-shared
+Obsoletes: %{name}-libs
+Obsoletes: %{name}-shared
Obsoletes: kdelibs4
Conflicts: kdelibs
Conflicts: kdelibs4
@@ -150,17 +151,6 @@
- kimgio (обробка зображень).
- kspell (перевірка орфографії),
-%package libs
-Summary: KDE libraries
-Summary(pl.UTF-8): Biblioteki KDE
-Group: X11/Libraries
-
-%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
@@ -364,8 +354,6 @@
%lang(en) %{_kdedocdir}/en/common
%lang(en) %{_kdedocdir}/en/kioslave
-%files libs
-%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libkde3support.so.*
%attr(755,root,root) %{_libdir}/libkdecore.so.*
%attr(755,root,root) %{_libdir}/libkdefakes.so.*
@@ -967,6 +955,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.161 2009/08/29 20:29:48 shadzik
+- merged -libs to main package
+
Revision 1.160 2009/08/28 13:17:54 shadzik
- 4.3.1
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdelibs/kde4-kdelibs.spec?r1=1.160&r2=1.161&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
