Author: shadzik Date: Mon Oct 20 00:39:41 2008 GMT Module: SPECS Tag: DEVEL ---- Log message: - no more -core package, all core stuff went to main package which for the first time isn't empty
---- Files affected: SPECS: kde4-kdebase.spec (1.73.2.18 -> 1.73.2.19) ---- Diffs: ================================================================ Index: SPECS/kde4-kdebase.spec diff -u SPECS/kde4-kdebase.spec:1.73.2.18 SPECS/kde4-kdebase.spec:1.73.2.19 --- SPECS/kde4-kdebase.spec:1.73.2.18 Mon Oct 20 02:29:34 2008 +++ SPECS/kde4-kdebase.spec Mon Oct 20 02:39:36 2008 @@ -20,7 +20,7 @@ Summary(zh_CN.UTF-8): KDE核心 Name: kde4-kdebase Version: 4.1.70 -Release: 1 +Release: 2 License: GPL Group: X11/Applications Source0: ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2 @@ -44,7 +44,6 @@ BuildRequires: jasper-devel BuildRequires: kde4-kdebase-workspace-devel >= %{version} BuildRequires: kde4-kdelibs-devel >= %{version} -BuildRequires: kde4-kdelibs-shared >= %{version} BuildRequires: kde4-kdepimlibs-devel >= %{version} BuildRequires: lame-libs-devel BuildRequires: libjpeg-devel @@ -84,7 +83,9 @@ BuildRequires: xorg-util-imake BuildConflicts: kdebase-konqueror-libs Provides: kde4-kdebase-common +Provides: kde4-kdebase-core Obsoletes: kde4-kdebase-common +Obsoletes: kde4-kdebase-core Obsoletes: kdebase4 Conflicts: kdebase4 Conflicts: kdelibs < 9:3.1.94.040110-1 @@ -134,30 +135,6 @@ (kcheckpass, kikbd, kscreensaver, kcontrol, kfind, kfontmanager, kmenuedit, kappfinder). -%package core -Summary: KDE Core Apps -Summary(pl.UTF-8): Podstawowe aplikacje KDE -Group: X11/Applications -Requires: kde4-kdelibs >= %{version} -#Requires: sudo -#Requires: xdg-menus - -%description core -KDE Core apps. This package contains: -- Control Center; -- Help Center; -- Print System; -- Crash Handlers; -- A Frontend for "su" program. - -%description core -l pl.UTF-8 -Podstawowe aplikacje środowiska KDE. Pakiet ten zawiera: -- Centrum sterowania; -- System drukowania; -- System pomocy; -- Programy obsługi błędów; -- Frontend dla programu "su". - %package devel Summary: Include files to develop KDE applications Summary(pl.UTF-8): Pliki nagłówkowe potrzebne do tworzenia aplikacji KDE @@ -182,7 +159,7 @@ Summary: KDE Info Center Summary(pl.UTF-8): Centrum informacji o systemie dla KDE Group: X11/Applications -Requires: %{name}-core = %{version}-%{release} +Requires: %{name} = %{version}-%{release} #Requires: pciutils Obsoletes: kde4-kdebase-workspace-infocenter @@ -236,7 +213,7 @@ Summary: KDE Terminal Emulator Summary(pl.UTF-8): Emulator terminala dla KDE Group: X11/Applications -Requires: %{name}-core = %{version}-%{release} +Requires: %{name} = %{version}-%{release} Provides: %{name}-common-konsole Obsoletes: kde4-kdebase-common-konsole @@ -250,7 +227,7 @@ Summary: KDE Text Editor Summary(pl.UTF-8): Edytor tekstu dla KDE Group: X11/Applications/Editors -Requires: %{name}-core = %{version}-%{release} +Requires: %{name} = %{version}-%{release} %description kwrite KWrite is a simple texteditor, with syntaxhighlighting, codefolding, @@ -267,7 +244,7 @@ Summary(pl.UTF-8): Demon do KDE obsługujący wymianę wiadomości za pomocą write Group: X11/Applications # With functional reasons -Requires: %{name}-core = %{version}-%{release} +Requires: %{name} = %{version}-%{release} #Obsoletes: kdebase < 8:3.5.5 %description kwrited @@ -420,8 +397,8 @@ %postun konsole %{_bindir}/fontpostinst misc -%post core -p /sbin/ldconfig -%postun core -p /sbin/ldconfig +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig %post -n kde4-konqueror %update_browser_plugins @@ -434,7 +411,7 @@ %post -n kde4-konqueror-libs -p /sbin/ldconfig %postun -n kde4-konqueror-libs -p /sbin/ldconfig -%files core +%files %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/kbookmarkmerger %attr(755,root,root) %{_libdir}/kde4/libkcminit_nsplugins.so @@ -705,6 +682,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.73.2.19 2008/10/20 00:39:36 shadzik +- no more -core package, all core stuff went to main package which for the first time isn't empty + Revision 1.73.2.18 2008/10/20 00:29:34 shadzik - removed all those redundand dirs from last two commits - paszczus i'll kill you :P ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kde4-kdebase.spec?r1=1.73.2.18&r2=1.73.2.19&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
