Author: shadzik Date: Tue Jan 27 22:03:52 2009 GMT Module: SPECS Tag: HEAD ---- Log message: - 4.2.0 stable (merged from DEVEL)
---- Files affected: SPECS: kde4-kdebase.spec (1.76 -> 1.77) ---- Diffs: ================================================================ Index: SPECS/kde4-kdebase.spec diff -u SPECS/kde4-kdebase.spec:1.76 SPECS/kde4-kdebase.spec:1.77 --- SPECS/kde4-kdebase.spec:1.76 Tue Sep 30 01:35:21 2008 +++ SPECS/kde4-kdebase.spec Tue Jan 27 23:03:47 2009 @@ -7,6 +7,8 @@ # %define _state stable %define orgname kdebase +%define qtver 4.4.3 + Summary: K Desktop Environment - core files Summary(es.UTF-8): K Desktop Environment - archivos básicos Summary(ja.UTF-8): KDEデスクトップ環境 - 基本ファイル @@ -17,22 +19,22 @@ Summary(uk.UTF-8): K Desktop Environment - базові файли Summary(zh_CN.UTF-8): KDE核心 Name: kde4-kdebase -Version: 4.1.1 +Version: 4.2.0 Release: 2 License: GPL Group: X11/Applications Source0: ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2 -# Source0-md5: 33ab20f61aa33ed473fec710ad250ac7 +# Source0-md5: da86a8ad624e86eda3a7509f39272060 URL: http://www.kde.org/ BuildRequires: OpenEXR-devel >= 1.2.2 -BuildRequires: OpenGL-GLU-devel -BuildRequires: QtCore-devel >= 4.4.0 -BuildRequires: QtNetwork-devel >= 4.4.0 +BuildRequires: OpenGL-devel +BuildRequires: QtCore-devel >= %{qtver} +BuildRequires: QtNetwork-devel >= %{qtver} BuildRequires: audiofile-devel -BuildRequires: automoc4 >= 0.9.84 +BuildRequires: automoc4 >= 0.9.88 BuildRequires: bzip2-devel BuildRequires: cdparanoia-III-devel -BuildRequires: cmake +BuildRequires: cmake >= 2.6.2 BuildRequires: cups-devel BuildRequires: cyrus-sasl-devel BuildRequires: db-devel @@ -42,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 @@ -82,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 @@ -132,38 +135,14 @@ (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 Summary(pt_BR.UTF-8): Arquivos de inclusão para compilar aplicativos que usem bibliotecas do kdebase -Group: X11/Development/Libraries -Requires: kde4-konqueror-libs +Group: X11/Development/Librariesn Requires: kde4-dolphin Requires: kde4-kdelibs-devel >= %{version} +Requires: kde4-konqueror-libs %description devel This package contains header files needed to develop KDE applications. @@ -180,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 @@ -234,9 +213,9 @@ 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: %{name}-common-konsole +Obsoletes: kde4-kdebase-common-konsole %description konsole KDE Terminal Emulator. @@ -248,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, @@ -260,22 +239,6 @@ kodu, dynamicznym zawijaniem wierszy itp. Jest lżejszą wersją Kate, szybszą dla mniejszych zadań. -%package kwrited -Summary: KDE write messaging daemon -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} -#Obsoletes: kdebase < 8:3.5.5 - -%description kwrited -A kde daeomn that watches for messages from local users sent with -write or wall. - -%description kwrited -l pl.UTF-8 -Demon KDE, który monitoruje wiadomości jakie lokalni użytkownicy -wysyłają za pomocą komend write lub wall. - %package useraccount Summary: User Account management Summary(pl.UTF-8): Zarządzanie kontem użytkownika @@ -306,6 +269,7 @@ Summary: Konqueror - web browser and file manager Summary(pl.UTF-8): Konqueror - przeglądarka WWW i zarządca plików Group: X11/Applications +Requires: browser-plugins Requires: kde4-konqueror-libs = %{version}-%{release} Provides: wwwbrowser Obsoletes: konqueror < 9:3.0.0 @@ -417,17 +381,27 @@ %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 + +%postun -n kde4-konqueror +if [ "$1" = 0 ]; then + %update_browser_plugins +fi %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 %attr(755,root,root) %{_libdir}/kde4/khtmlkttsdplugin.so +%attr(755,root,root) %{_libdir}/kde4/plasma_applet_folderview.so +%{_datadir}/kde4/services/plasma-applet-folderview.desktop %dir %{_datadir}/apps/kcontrol %dir %{_datadir}/apps/kcontrol/pics %{_datadir}/apps/kcontrol/pics/onlyone.png @@ -438,18 +412,18 @@ %{_datadir}/apps/kconf_update/kfmclient_3_2.upd %{_datadir}/apps/kconf_update/kfmclient_3_2_update.sh %{_datadir}/apps/kconf_update/move_favicons.sh -%{_datadir}/apps/kconf_update/socks.upd %{_datadir}/templates %{_desktopdir}/kde4/Home.desktop %{_desktopdir}/kde4/kfmclient.desktop %{_desktopdir}/kde4/kfmclient_dir.desktop %{_desktopdir}/kde4/kfmclient_html.desktop %{_desktopdir}/kde4/kfmclient_war.desktop +%exclude %{_iconsdir}/*/scalable %{_iconsdir}/*/*/apps/*.png %{_iconsdir}/*/*/actions/*.png %{_iconsdir}/*/*/apps/*.svgz -%{_iconsdir}/*/*/actions/*.svgz -%dir %{_iconsdir}/oxygen/scalable/apps +#%{_iconsdir}/*/*/actions/*.svgz +%{_mandir}/man1/kbookmarkmerger.1.* %files devel %defattr(644,root,root,755) @@ -473,7 +447,6 @@ %attr(755,root,root) %{_libdir}/kde4/kcm_pci.so %attr(755,root,root) %{_libdir}/kde4/kcm_samba.so %attr(755,root,root) %{_libdir}/kde4/kcm_partition.so -%attr(755,root,root) %{_libdir}/kde4/plasma_applet_folderview.so %{_datadir}/apps/kinfocenter %{_datadir}/kde4/services/kcmview1394.desktop %{_datadir}/kde4/services/kcmusb.desktop @@ -492,7 +465,6 @@ %{_datadir}/kde4/services/kcm_memory.desktop %{_datadir}/kde4/services/kcm_pci.desktop %{_datadir}/kde4/services/smbstatus.desktop -%{_datadir}/kde4/services/plasma-applet-folderview.desktop %{_desktopdir}/kde4/kinfocenter.desktop %dir %{_datadir}/apps/kcmview1394 %dir %{_datadir}/apps/kcmusb @@ -505,6 +477,7 @@ %{_datadir}/apps/kappfinder %{_desktopdir}/kde4/kappfinder.desktop %{_iconsdir}/*/*/apps/kappfinder.png +%{_mandir}/man1/kappfinder.1.* %files kdialog %defattr(644,root,root,755) @@ -518,6 +491,7 @@ %{_desktopdir}/kde4/kfind.desktop %{_datadir}/kde4/services/kfindpart.desktop %{_kdedocdir}/en/kfind +%{_mandir}/man1/kfind.1.* %files konsole %defattr(644,root,root,755) @@ -539,11 +513,6 @@ %{_desktopdir}/kde4/kwrite.desktop %{_kdedocdir}/en/kwrite -%files kwrited -%defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/kde4/kded_kwrited.so -%{_datadir}/kde4/services/kded/kwrited.desktop - %files useraccount %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/kdepasswd @@ -592,7 +561,6 @@ %attr(755,root,root) %{_bindir}/nspluginscan %attr(755,root,root) %{_bindir}/nspluginviewer %attr(755,root,root) %{_libdir}/libkdeinit4_konqueror.so -%attr(755,root,root) %{_libdir}/kde4/kcm_css.so %attr(755,root,root) %{_libdir}/kde4/kcm_filetypes.so %attr(755,root,root) %{_libdir}/kde4/kcm_history.so %attr(755,root,root) %{_libdir}/kde4/kcm_kio.so @@ -610,16 +578,11 @@ %{_datadir}/apps/kbookmark %{_datadir}/apps/kcmcss %{_datadir}/apps/keditbookmarks -#%{_datadir}/apps/konqiconview -#%{_datadir}/apps/konqlistview %{_datadir}/apps/konqueror/about -%{_datadir}/apps/konqueror/icons %{_datadir}/apps/konqueror/pics %{_datadir}/apps/konqueror/profiles %dir %{_datadir}/apps/konqueror %{_datadir}/apps/konqueror/konqueror.rc -%{_datadir}/apps/konqueror/konq-filemanagement.rc -%{_datadir}/apps/konqueror/konq-webbrowsing.rc %{_datadir}/apps/konqsidebartng %dir %{_datadir}/apps/plugin %{_datadir}/apps/plugin/nspluginpart.rc @@ -632,23 +595,21 @@ %{_datadir}/kde4/servicetypes/terminalemulator.desktop %{_datadir}/kde4/servicetypes/uasprovider.desktop %{_datadir}/kde4/services/useragentstrings +%{_datadir}/kde4/services/bookmarks.desktop %{_datadir}/kde4/services/cache.desktop %{_datadir}/kde4/services/cookies.desktop %{_datadir}/kde4/services/desktoppath.desktop %{_datadir}/kde4/services/ebrowsing.desktop %{_datadir}/kde4/services/filebehavior.desktop -%{_datadir}/kde4/services/filebrowser.desktop -%{_datadir}/kde4/services/filepreviews.desktop %{_datadir}/kde4/services/filetypes.desktop -%{_datadir}/kde4/services/kcmcss.desktop %{_datadir}/kde4/services/kcmhistory.desktop %{_datadir}/kde4/services/kcmkonqyperformance.desktop %{_datadir}/kde4/services/kcmperformance.desktop %{_datadir}/kde4/services/kded/favicons.desktop %{_datadir}/kde4/services/kded/konqy_preloader.desktop +%{_datadir}/kde4/services/khtml_appearance.desktop %{_datadir}/kde4/services/khtml_behavior.desktop %{_datadir}/kde4/services/khtml_filter.desktop -%{_datadir}/kde4/services/khtml_fonts.desktop %{_datadir}/kde4/services/khtml_general.desktop %{_datadir}/kde4/services/khtml_java_js.desktop %{_datadir}/kde4/services/khtml_plugins.desktop @@ -697,15 +658,118 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ -Revision 1.76 2008/09/29 23:35:21 pluto -- wrr, typo. +Revision 1.77 2009/01/27 22:03:47 shadzik +- 4.2.0 stable (merged from DEVEL) + +Revision 1.73.2.34 2009/01/22 19:29:57 shadzik +- updated automoc4 BR; rel 2 + +Revision 1.73.2.33 2009/01/22 12:43:26 shadzik +- 4.2.0 + +Revision 1.73.2.32 2009/01/08 18:49:46 shadzik +- exclude scalable icons dir +- rel 2 + +Revision 1.73.2.31 2009/01/07 19:23:24 shadzik +- fixed log + +Revision 1.73.2.30 2009/01/07 19:22:11 shadzik +- 4.2 RC1 +- don't own scalable/apps dir + +Revision 1.73.2.29 2009/01/05 17:53:39 glen +- revert source url change + +Revision 1.73.2.28 2009/01/03 15:03:30 rotom +- up to 4.1.87 +- new Source URL + +Revision 1.73.2.27 2008/12/15 21:18:40 shadzik +- 4.1.85 + +Revision 1.73.2.26 2008/12/08 15:48:23 paszczus +- updated to 4.1.82 + +Revision 1.73.2.25 2008/11/29 03:49:54 shadzik +- 4.1.81 + +Revision 1.73.2.24 2008/11/26 20:01:00 shadzik +- 4.2 beta1 + +Revision 1.73.2.23 2008/11/15 17:19:27 paszczus +- updated to 4.1.73 +- updated cmake BR + +Revision 1.73.2.22 2008/11/06 04:07:56 shadzik +- 4.1.72 + +Revision 1.73.2.21 2008/10/23 19:26:56 rotom +- up to 4.1.71 +- kwrited moved to kde4-kdebase-workspace.spec + +Revision 1.73.2.20 2008/10/20 17:36:46 shadzik +- moved folderview applet to main package + +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 + +Revision 1.73.2.17 2008/10/19 18:03:28 paszczus +- added parent dirs + +Revision 1.73.2.16 2008/10/18 21:27:57 paszczus +- added parent dir + +Revision 1.73.2.15 2008/10/18 19:39:56 shadzik +- 4.1.70 + +Revision 1.73.2.14 2008/10/10 10:52:00 paszczus +- updated to 4.1.69 + +Revision 1.73.2.13 2008/10/10 00:30:41 shadzik +- reverted + +Revision 1.73.2.12 2008/10/09 19:17:34 paszczus +- added BR: libraw1394-devel + +Revision 1.73.2.11 2008/10/02 14:58:10 paszczus +- updated to 4.1.68 + +Revision 1.73.2.10 2008/09/20 12:48:27 paszczus +- updated to 4.1.67 + +Revision 1.73.2.9 2008/09/04 20:43:49 paszczus +- finished update; cleanups + +Revision 1.73.2.8 2008/09/04 20:18:00 paszczus +- updated to 4.1.65 (just fetch sources, cause ftp.kde.org is very slow now...) + +Revision 1.73.2.7 2008/08/30 23:12:49 shadzik +- -konqueror R: browser-plugins + +Revision 1.73.2.6 2008/08/30 22:55:27 shadzik +- 4.1.64 + +Revision 1.73.2.5 2008/08/22 20:11:04 paszczus +- updated to 4.1.63 + +Revision 1.73.2.4 2008/08/18 21:25:47 shadzik +- browser plugins from kde3 + +Revision 1.73.2.3 2008/08/17 22:28:40 shadzik +- 4.1.62 -Revision 1.75 2008/09/29 22:52:13 pluto -- BR: OpenGLU-devel for kcm_opengl, release 1. +Revision 1.73.2.2 2008/08/15 11:47:19 shadzik +- cmake fix now in cmake itself -Revision 1.74 2008/09/13 17:55:08 witekfl -- up to 4.1.1 -- rel 0.1 +Revision 1.73.2.1 2008/08/09 16:06:27 shadzik +- 4.1.61 +- cmake > 2.6.0 fix +- update qt4 BR Revision 1.73 2008/07/25 11:39:34 shadzik - add URL ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kde4-kdebase.spec?r1=1.76&r2=1.77&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
