- pl for dolphin

- renamed following previous discussion:
  konqueror4 -> kde4-konqueror, dolphin -> kde4-dolphin
- unified some files order

Changed files:
    kde4-kdebase.spec -> 1.31

diff --git a/kde4-kdebase.spec b/kde4-kdebase.spec
index 2801f1ba04152a0387edf94bc4c0cf8eb5a4923a..64430b899c6597f393bb3754b434078e4a8c5f9e 100644 (file)
--- a/kde4-kdebase.spec
+++ b/kde4-kdebase.spec
@@ -252,7 +252,7 @@ skryptów powłoki.
 Summary:       KDE Find Tool
 Summary(pl.UTF-8):     Narzędzie do wyszukiwania plików dla KDE
 Group:         X11/Applications
-Requires:      konqueror4-libs = %{version}-%{release}
+Requires:      kde4-konqueror-libs = %{version}-%{release}
 
 %description kfind
 A tool for find files for KDE.
@@ -308,8 +308,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
-Summary(pl.UTF-8):     Konto użytkownika
+Summary:       User Account management
+Summary(pl.UTF-8):     Zarządzanie kontem użytkownika
 Group:         X11/Applications
 #Obsoletes:    kdeutils-kdepasswd
 #Obsoletes:    kdeutils-userinfo
@@ -322,25 +322,28 @@ kdepasswd program functionality.
 useraccount zmienia informacje o koncie użytkownika. Ten moduł zawiera
 funkcjonalność programu kdepasswd.
 
-%package -n dolphin
-Summary:       Dolphin - KDE4 file manager
-Summary(pl.UTF-8):     Dolphin - menadżer plików KDE4
+%package -n kde4-dolphin
+Summary:       Dolphin - KDE 4 file manager
+Summary(pl.UTF-8):     Dolphin - zarządca plików KDE 4
 Group:         X11/Applications
-Requires:      konqueror4-libs = %{version}-%{release}
+Requires:      kde4-konqueror-libs = %{version}-%{release}
 
-%description -n dolphin
-Dolphin - KDE4 file manager.
+%description -n kde4-dolphin
+Dolphin - KDE 4 file manager.
 
-%package -n konqueror4
+%description -n kde4-dolphin -l pl.UTF-8
+Dolphin - zarządca plików KDE 4.
+
+%package -n kde4-konqueror
 Summary:       Konqueror - web browser and file manager
 Summary(pl.UTF-8):     Konqueror - przeglądarka WWW i zarządca plików
 Group:         X11/Applications
 Requires:      %{name}-common = %{version}-%{release}
-Requires:      konqueror4-libs = %{version}-%{release}
+Requires:      kde4-konqueror-libs = %{version}-%{release}
 Provides:      wwwbrowser
 Obsoletes:     konqueror >= 4.0.0
 
-%description -n konqueror4
+%description -n kde4-konqueror
 Konqueror is the file manager for the K Desktop Environment. It
 supports basic file management on local UNIX filesystems, from simple
 cut/copy and paste operations to advanced remote and local network
@@ -359,7 +362,7 @@ Konqueror is a universal viewing application, capable of embedding
 read-only viewing components in itself to view documents without ever
 launching another application.
 
-%description -n konqueror4 -l pl.UTF-8
+%description -n kde4-konqueror -l pl.UTF-8
 Konqueror to zarządca plików dla środowiska KDE. Obsługuje podstawowe
 zarządzanie plikami w lokalnych uniksowych systemach plików, od
 prostych operacji wycinania/kopiowania i wklejania do zaawansowanego
@@ -379,7 +382,7 @@ Konqueror jest uniwersalną aplikacją do przeglądania, umożliwiającą
 osadzenie w niej komponentów do przeglądania aby oglądać dokumenty bez
 uruchamiania innej aplikacji.
 
-%package -n konqueror4-libs
+%package -n kde4-konqueror-libs
 Summary:       konqueror shared libraries
 Summary(pl.UTF-8):     Biblioteki współdzielone konquerora
 Group:         X11/Libraries
@@ -387,10 +390,10 @@ Requires(post,postun):    /sbin/ldconfig
 Requires:      kde4-kdelibs >= %{version}
 Obsoletes:     konqueror-libs >= 4.0.0
 
-%description -n konqueror4-libs
+%description -n kde4-konqueror-libs
 Konqueror shared libraries.
 
-%description -n konqueror4-libs -l pl.UTF-8
+%description -n kde4-konqueror-libs -l pl.UTF-8
 Biblioteki współdzielone konquerora.
 
 %prep
@@ -441,11 +444,11 @@ rm -rf $RPM_BUILD_ROOT
 %postun common-konsole
 %{_bindir}/fontpostinst misc
 
-%post core -p /sbin/ldconfig
-%postun core -p /sbin/ldconfig
+%post  core -p /sbin/ldconfig
+%postun        core -p /sbin/ldconfig
 
-%post  -n konqueror4-libs      -p /sbin/ldconfig
-%postun        -n konqueror4-libs      -p /sbin/ldconfig
+%post  -n kde4-konqueror-libs  -p /sbin/ldconfig
+%postun        -n kde4-konqueror-libs  -p /sbin/ldconfig
 
 %files devel
 %defattr(644,root,root,755)
@@ -455,25 +458,25 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libkonquerorprivate.so
 %{_includedir}/*.h
 
-%files -n dolphin
+%files -n kde4-dolphin
 %defattr(644,root,root,755)
-%{_kdedocdir}/en/dolphin
 %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
-%dir %{_datadir}/apps/dolphin
-%{_datadir}/apps/dolphin/dolphinui.rc
-%{_datadir}/apps/dolphin/icons
-%dir %{_datadir}/apps/dolphinpart
-%{_datadir}/apps/dolphinpart/dolphinpart.rc
-%{_desktopdir}/kde4/dolphin.desktop
 %{_datadir}/kde4/services/dolphinpart.desktop
+%{_desktopdir}/kde4/dolphin.desktop
+%{_kdedocdir}/en/dolphin
 
 %files common
 %defattr(644,root,root,755)
@@ -486,30 +489,27 @@ rm -rf $RPM_BUILD_ROOT
 
 %files core
 %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/libkhtmlkttsdplugin.so
-
 %dir %{_datadir}/apps/kcontrol
 %dir %{_datadir}/apps/kcontrol/pics
 %{_datadir}/apps/kcontrol/pics/onlyone.png
 %{_datadir}/apps/kcontrol/pics/overlapping.png
-
 %{_datadir}/apps/khtml/kpartplugins/khtmlkttsd.desktop
 %{_datadir}/apps/khtml/kpartplugins/khtmlkttsd.rc
-
-%{_desktopdir}/kde4/Home.desktop
-%{_desktopdir}/kde4/kdepasswd.desktop
-%{_desktopdir}/kde4/kfmclient.desktop
-%{_desktopdir}/kde4/kfmclient_dir.desktop
-%{_desktopdir}/kde4/kfmclient_html.desktop
-%{_desktopdir}/kde4/kfmclient_war.desktop
 %{_datadir}/apps/kconf_update/favicons.upd
 %{_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
-%attr(755,root,root) %{_bindir}/kbookmarkmerger
 %{_datadir}/templates
+%{_desktopdir}/kde4/Home.desktop
+%{_desktopdir}/kde4/kdepasswd.desktop
+%{_desktopdir}/kde4/kfmclient.desktop
+%{_desktopdir}/kde4/kfmclient_dir.desktop
+%{_desktopdir}/kde4/kfmclient_html.desktop
+%{_desktopdir}/kde4/kfmclient_war.desktop
 %{_iconsdir}/*/*/apps/*.png
 %{_iconsdir}/*/*/apps/*.svgz
 %dir %{_iconsdir}/oxygen/scalable/apps
@@ -518,16 +518,16 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/kinfocenter
 %attr(755,root,root) %{_libdir}/libkdeinit4_kinfocenter.so
-%dir %{_kdedocdir}/en/kinfocenter
 %{_datadir}/apps/kinfocenter
 %{_desktopdir}/kde4/kinfocenter.desktop
+%dir %{_kdedocdir}/en/kinfocenter
 
 %files kappfinder
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/kappfinder
-%{_iconsdir}/*/*/apps/kappfinder.png
 %{_datadir}/apps/kappfinder
 %{_desktopdir}/kde4/kappfinder.desktop
+%{_iconsdir}/*/*/apps/kappfinder.png
 
 %files kdialog
 %defattr(644,root,root,755)
@@ -536,33 +536,33 @@ rm -rf $RPM_BUILD_ROOT
 
 %files kfind
 %defattr(644,root,root,755)
-%{_kdedocdir}/en/kfind
 %attr(755,root,root) %{_bindir}/kfind
 %attr(755,root,root) %{_libdir}/kde4/libkfindpart.so
-%{_desktopdir}//kde4/kfind.desktop
+%{_desktopdir}/kde4/kfind.desktop
 %{_datadir}/kde4/services/kfindpart.desktop
+%{_kdedocdir}/en/kfind
 
 %files konsole
 %defattr(644,root,root,755)
-%{_kdedocdir}/en/konsole
 %attr(755,root,root) %{_bindir}/konsole
 %attr(755,root,root) %{_bindir}/konsoleprofile
 %attr(755,root,root) %{_libdir}/libkdeinit4_konsole.so
 %attr(755,root,root) %{_libdir}/kde4/libkonsolepart.so
-%{_desktopdir}/kde4/konsole.desktop
-#%{_iconsdir}/*/*/apps/konsole.png
-#%{_iconsdir}/*/*/apps/konsole.svgz
 #%{_datadir}/kde4/services/konsole-script.desktop
 %{_datadir}/kde4/services/ServiceMenus/konsolehere.desktop
 %{_datadir}/kde4/services/konsolepart.desktop
+%{_desktopdir}/kde4/konsole.desktop
+#%{_iconsdir}/*/*/apps/konsole.png
+#%{_iconsdir}/*/*/apps/konsole.svgz
+%{_kdedocdir}/en/konsole
 
 %files kwrite
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/kwrite
-%{_kdedocdir}/en/kwrite
 %attr(755,root,root) %{_libdir}/libkdeinit4_kwrite.so
 %{_datadir}/apps/kwrite
 %{_desktopdir}/kde4/kwrite.desktop
+%{_kdedocdir}/en/kwrite
 
 %files kwrited
 %defattr(644,root,root,755)
@@ -579,7 +579,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/config.kcfg/kcm_useraccount.kcfg
 %{_datadir}/kde4/services/kcm_useraccount.desktop
 
-%files -n konqueror4
+%files -n kde4-konqueror
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/keditbookmarks
 %attr(755,root,root) %{_bindir}/keditfiletype
@@ -600,8 +600,6 @@ rm -rf $RPM_BUILD_ROOT
 %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
-%{_desktopdir}/kde4/konqbrowser.desktop
-%{_desktopdir}/kde4/konquerorsu.desktop
 %{_datadir}/apps/kconf_update/konqsidebartng.upd
 %{_datadir}/apps/kconf_update/move_konqsidebartng_entries.sh
 %{_datadir}/apps/kbookmark
@@ -615,10 +613,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/apps/konqueror/profiles
 %dir %{_datadir}/apps/konqueror
 %{_datadir}/apps/konqueror/konqueror.rc
-%dir %{_datadir}/apps/plugin
-%{_datadir}/apps/plugin/nspluginpart.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
+%{_datadir}/autostart/konqy_preload.desktop
+%{_datadir}/config/konqsidebartng.rc
+%{_datadir}/config.kcfg/konqueror.kcfg
 %{_datadir}/kde4/servicetypes/findpart.desktop
 %{_datadir}/kde4/servicetypes/konqaboutpage.desktop
 %{_datadir}/kde4/servicetypes/konqpopupmenuplugin.desktop
@@ -654,10 +656,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/kde4/services/proxy.desktop
 %{_datadir}/kde4/services/smb.desktop
 %{_datadir}/kde4/services/useragent.desktop
-%{_datadir}/autostart/konqy_preload.desktop
-%{_datadir}/config/konqsidebartng.rc
-%{_datadir}/config.kcfg/konqueror.kcfg
-%{_iconsdir}/*/*/apps/konqueror.*
 %{_datadir}/dbus-1/interfaces/org.kde.FavIcon.xml
 %{_datadir}/dbus-1/interfaces/org.kde.Konqueror.Main.xml
 %{_datadir}/dbus-1/interfaces/org.kde.Konqueror.MainWindow.xml
@@ -667,7 +665,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dbus-1/interfaces/org.kde.nsplugins.class.xml
 %{_datadir}/dbus-1/interfaces/org.kde.nsplugins.instance.xml
 %{_datadir}/dbus-1/interfaces/org.kde.nsplugins.viewer.xml
-%{_datadir}/apps/konqsidebartng
+%{_desktopdir}/kde4/konqbrowser.desktop
+%{_desktopdir}/kde4/konquerorsu.desktop
+%{_iconsdir}/*/*/apps/konqueror.*
 %{_kdedocdir}/en/konqueror
 # testing
 %attr(755,root,root) %{_libdir}/kde4/konq_sidebar.so
@@ -680,8 +680,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/kde4/konq_remoteencoding.so
 %attr(755,root,root) %{_libdir}/kde4/konq_shellcmdplugin.so
 
-
-%files -n konqueror4-libs
+%files -n kde4-konqueror-libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libkonq.so.*
 %attr(755,root,root) %{_libdir}/libkonqsidebarplugin.so.*