SPECS: kde4-kdebase.spec - some cleanups and (re)orders; still messy
qboosh
qboosh at pld-linux.org
Mon Feb 18 20:53:39 CET 2008
Author: qboosh Date: Mon Feb 18 19:53:39 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- some cleanups and (re)orders; still messy
---- Files affected:
SPECS:
kde4-kdebase.spec (1.37 -> 1.38)
---- Diffs:
================================================================
Index: SPECS/kde4-kdebase.spec
diff -u SPECS/kde4-kdebase.spec:1.37 SPECS/kde4-kdebase.spec:1.38
--- SPECS/kde4-kdebase.spec:1.37 Fri Feb 15 03:49:29 2008
+++ SPECS/kde4-kdebase.spec Mon Feb 18 20:53:33 2008
@@ -1,16 +1,12 @@
# $Revision$, $Date$
# TODO:
# - check BR list
-# - more file moves between packages
+# - more file moves between packages; what's with dozen of messy -core/-common/-common* packages?
# - Req, Obsolets and Conflicts for every package
-# - new dsecriptions
-
-# Conditional build:
-%bcond_without hidden_visibility # pass '--fvisibility=hidden' & '--fvisibility-inlines-hidden' to g++
+# - new descriptions
#
%define _state unstable
-
-%define orgname kdebase
+%define orgname kdebase
Summary: K Desktop Environment - core files
Summary(es.UTF-8): K Desktop Environment - archivos básicos
Summary(ja.UTF-8): KDEデスクトップ環境 - 基本ファイル
@@ -29,19 +25,18 @@
# Source0-md5: 43dcfbcb217d800a9c32226c9915464d
BuildRequires: OpenEXR-devel >= 1.2.2
BuildRequires: OpenGL-devel
-%{?with_hidden_visibility:BuildRequires: QtCore-devel >= 4.2.0}
+BuildRequires: QtCore-devel >= 4.2.0
BuildRequires: QtNetwork-devel >= 4.2.0
BuildRequires: audiofile-devel
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: bzip2-devel
BuildRequires: cdparanoia-III-devel
+BuildRequires: cmake
BuildRequires: cups-devel
BuildRequires: cyrus-sasl-devel
BuildRequires: db-devel
#BuildRequires: dbus-qt-devel >= 0.70
-BuildRequires: ed
-%{?with_hidden_visibility:BuildRequires: gcc-c++ >= 5:4.1.0-0.20051206r108118.1}
BuildRequires: gettext-devel
BuildRequires: hal-devel
BuildRequires: jasper-devel
@@ -70,7 +65,6 @@
BuildRequires: rpmbuild(macros) >= 1.268
BuildRequires: samba-devel
BuildRequires: sed >= 4.0
-#BuildRequires: unsermake >= 040511
BuildRequires: xorg-app-bdftopcf
BuildRequires: xorg-cf-files
BuildRequires: xorg-lib-libXScrnSaver-devel
@@ -140,24 +134,6 @@
(kcheckpass, kikbd, kscreensaver, kcontrol, kfind, kfontmanager,
kmenuedit, kappfinder).
-%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-kdelibs-devel >= %{version}
-
-%description devel
-This package contains header files needed to develop KDE applications.
-
-%description devel -l pl.UTF-8
-Pakiet zawiera pliki nagłówkowe niezbędne do programowania aplikacji
-KDE.
-
-%description devel -l pt_BR.UTF-8
-Este pacote contém os arquivos de inclusão que são necessários para
-compilar aplicativos que usem bibliotecas do kdebase.
-
%package common
Summary: KDE4 common directories
Summary(pl.UTF-8): Wspólne pliki KDE4.
@@ -173,7 +149,7 @@
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(post,postun): fontpostinst
Requires: kde4-kdelibs >= %{version}
%description common-konsole
@@ -189,7 +165,6 @@
Requires: kde4-kdelibs >= %{version}
#Requires: sudo
#Requires: xdg-menus
-#Conflicts: kttsd <= 040609
%description core
KDE Core apps. This package contains:
@@ -207,6 +182,24 @@
- 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-kdelibs-devel >= %{version}
+
+%description devel
+This package contains header files needed to develop KDE applications.
+
+%description devel -l pl.UTF-8
+Pakiet zawiera pliki nagłówkowe niezbędne do programowania aplikacji
+KDE.
+
+%description devel -l pt_BR.UTF-8
+Este pacote contém os arquivos de inclusão que são necessários para
+compilar aplicativos que usem bibliotecas do kdebase.
+
%package infocenter
Summary: KDE Info Center
Summary(pl.UTF-8): Centrum informacji o systemie dla KDE
@@ -221,7 +214,6 @@
%description infocenter -l pl.UTF-8
Centrum informacji o systemie dla KDE.
-
%package kappfinder
Summary: Menu Updating Tool
Summary(pl.UTF-8): Narzędzie do aktualizacji menu
@@ -457,34 +449,6 @@
%post -n kde4-konqueror-libs -p /sbin/ldconfig
%postun -n kde4-konqueror-libs -p /sbin/ldconfig
-%files devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libdolphinprivate.so
-%attr(755,root,root) %{_libdir}/libkonq.so
-%attr(755,root,root) %{_libdir}/libkonqsidebarplugin.so
-%attr(755,root,root) %{_libdir}/libkonquerorprivate.so
-%{_includedir}/*.h
-
-%files -n kde4-dolphin
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/dolphin
-%attr(755,root,root) %{_libdir}/libdolphinprivate.so.*
-%attr(755,root,root) %{_libdir}/kde4/dolphinpart.so
-%dir %{_datadir}/apps/dolphin
-%{_datadir}/apps/dolphin/dolphinui.rc
-%{_datadir}/apps/dolphin/icons
-%dir %{_datadir}/apps/dolphinpart
-%{_datadir}/apps/dolphinpart/dolphinpart.rc
-%{_datadir}/config.kcfg/dolphin_columnmodesettings.kcfg
-%{_datadir}/config.kcfg/dolphin_detailsmodesettings.kcfg
-%{_datadir}/config.kcfg/dolphin_directoryviewpropertysettings.kcfg
-%{_datadir}/config.kcfg/dolphin_generalsettings.kcfg
-%{_datadir}/config.kcfg/dolphin_iconsmodesettings.kcfg
-%{_datadir}/config.kcfg/keditbookmarks.kcfg
-%{_datadir}/kde4/services/dolphinpart.desktop
-%{_desktopdir}/kde4/dolphin.desktop
-%{_kdedocdir}/en/dolphin
-
%files common
%defattr(644,root,root,755)
%dir %{_desktopdir}/kde4
@@ -521,6 +485,14 @@
%{_iconsdir}/*/*/apps/*.svgz
%dir %{_iconsdir}/oxygen/scalable/apps
+%files devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libdolphinprivate.so
+%attr(755,root,root) %{_libdir}/libkonq.so
+%attr(755,root,root) %{_libdir}/libkonqsidebarplugin.so
+%attr(755,root,root) %{_libdir}/libkonquerorprivate.so
+%{_includedir}/*.h
+
%files infocenter -f kinfocenter.lang
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/kinfocenter
@@ -608,6 +580,26 @@
%{_datadir}/config.kcfg/kcm_useraccount.kcfg
%{_datadir}/kde4/services/kcm_useraccount.desktop
+%files -n kde4-dolphin
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/dolphin
+%attr(755,root,root) %{_libdir}/libdolphinprivate.so.*
+%attr(755,root,root) %{_libdir}/kde4/dolphinpart.so
+%dir %{_datadir}/apps/dolphin
+%{_datadir}/apps/dolphin/dolphinui.rc
+%{_datadir}/apps/dolphin/icons
+%dir %{_datadir}/apps/dolphinpart
+%{_datadir}/apps/dolphinpart/dolphinpart.rc
+%{_datadir}/config.kcfg/dolphin_columnmodesettings.kcfg
+%{_datadir}/config.kcfg/dolphin_detailsmodesettings.kcfg
+%{_datadir}/config.kcfg/dolphin_directoryviewpropertysettings.kcfg
+%{_datadir}/config.kcfg/dolphin_generalsettings.kcfg
+%{_datadir}/config.kcfg/dolphin_iconsmodesettings.kcfg
+%{_datadir}/config.kcfg/keditbookmarks.kcfg
+%{_datadir}/kde4/services/dolphinpart.desktop
+%{_desktopdir}/kde4/dolphin.desktop
+%{_kdedocdir}/en/dolphin
+
%files -n kde4-konqueror
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/keditbookmarks
@@ -616,6 +608,7 @@
%attr(755,root,root) %{_bindir}/konqueror
%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
@@ -629,7 +622,6 @@
%attr(755,root,root) %{_libdir}/kde4/kded_konqy_preloader.so
%attr(755,root,root) %{_libdir}/kde4/konq_aboutpage.so
%attr(755,root,root) %{_libdir}/kde4/libnsplugin.so
-%attr(755,root,root) %{_libdir}/libkdeinit4_konqueror.so
%{_datadir}/apps/kconf_update/konqsidebartng.upd
%{_datadir}/apps/kconf_update/move_konqsidebartng_entries.sh
%{_datadir}/apps/kbookmark
@@ -724,6 +716,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.38 2008-02-18 19:53:33 qboosh
+- some cleanups and (re)orders; still messy
+
Revision 1.37 2008-02-15 02:49:29 shadzik
- add missing dirs
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kde4-kdebase.spec?r1=1.37&r2=1.38&f=u
More information about the pld-cvs-commit
mailing list