- kill -shared crap, release 7.

Changed files:
    kdelibs.spec -> 1.574

diff --git a/kdelibs.spec b/kdelibs.spec
index d767aa74a2397bfac545e632114915f99604fca7..47ee13c9ff69729e37b334b7adc2e957ee24f02e 100644 (file)
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -18,7 +18,7 @@ Summary(ru.UTF-8):    K Desktop Environment - Библиотеки
 Summary(uk.UTF-8):     K Desktop Environment - Бібліотеки
 Name:          kdelibs
 Version:       3.5.10
-Release:       6
+Release:       7
 Epoch:         9
 License:       LGPL
 Group:         X11/Libraries
@@ -113,7 +113,6 @@ Requires:   docbook-dtd42-xml
 Requires:      docbook-style-xsl
 Requires:      hicolor-icon-theme
 Requires:      kde-common-dirs
-Requires:      kdelibs-shared
 Requires:      libxml2-progs
 Requires:      qt >= 6:3.3.3-4
 Requires:      setup >= 2.4.6-7
@@ -121,6 +120,7 @@ Requires:   xorg-app-iceauth
 Obsoletes:     arts-kde
 Obsoletes:     kde-theme-keramik
 Obsoletes:     kdelibs-kabc
+Obsoletes:     kdelibs-shared
 Obsoletes:     kdelibs-sound
 Obsoletes:     kdelibs2
 Obsoletes:     kdelibs2-sound
@@ -347,18 +347,6 @@ Zainstaluj ten pakiet jeżeli korzystasz z nietypowej konfiguracji
 nieobsługującej pts-ów typu Unix98 i obawiasz się inwigilacji ze
 strony innych użytkowników lokalnych.
 
-%package shared
-Summary:       KDE 3 and KDE 4 shared files
-Summary(pl.UTF-8):     Pliki współdzielone między KDE 3 i KDE 4
-Group:         X11/Libraries
-Requires:      %{name} = %{epoch}:%{version}-%{release}
-
-%description shared
-KDE 3 and KDE 4 shared files.
-
-%description shared -l pl.UTF-8
-Pliki współdzielone między KDE 3 i KDE 4.
-
 # unresolved symbols in libkscreensaver.so.X (by design)
 %define        no_install_post_check_so        1
 
@@ -483,6 +471,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %ghost /etc/security/fileshare.conf
+%attr(755,root,root) %{_bindir}/checkXML
 %attr(755,root,root) %{_bindir}/cupsdconf
 %attr(755,root,root) %{_bindir}/cupsdoprint
 %attr(755,root,root) %{_bindir}/dcop
@@ -532,10 +521,12 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/ksvgtopng
 %attr(755,root,root) %{_bindir}/ktelnetservice
 %attr(755,root,root) %{_bindir}/ktradertest
+%attr(755,root,root) %{_bindir}/kunittestmodrunner
 %attr(755,root,root) %{_bindir}/kwrapper
 %attr(755,root,root) %{_bindir}/lnusertemp
 %attr(755,root,root) %{_bindir}/make_driver_db_cups
 %attr(755,root,root) %{_bindir}/make_driver_db_lpr
+%attr(755,root,root) %{_bindir}/makekdewidgets
 %attr(755,root,root) %{_bindir}/meinproc
 %attr(755,root,root) %{_bindir}/preparetips
 %attr(4755,root,root) %{_bindir}/start_kdeinit
@@ -546,23 +537,23 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/apps/dcopidlng
 %attr(755,root,root) %{_datadir}/apps/dcopidlng/kalyptus
 %{_datadir}/apps/dcopidlng/*.pm
+%{_datadir}/apps/katepart
 %{_datadir}/apps/kcertpart
+%{_datadir}/apps/kcm_componentchooser
 %{_datadir}/apps/kconf_update/*.upd
 %attr(755,root,root) %{_datadir}/apps/kconf_update/*.pl
 %attr(755,root,root) %{_datadir}/apps/kconf_update/*.sh
 %{_datadir}/apps/kdeprint
+%{_datadir}/apps/kdeui
+%{_datadir}/apps/kdewidgets
 # also contains 3rdparty kpartplugins dir
-%{_datadir}/apps/khtml/domain_info
-%{_datadir}/apps/khtml/icons
-%{_datadir}/apps/khtml/khtml.rc
-%{_datadir}/apps/khtml/khtml_popupmenu.rc
-%{_datadir}/apps/khtml/kpartplugins
+%{_datadir}/apps/khtml
 %{_datadir}/apps/knewstuff
 %{_datadir}/apps/kio_uiserver
-%{_datadir}/apps/kjava/icons
-%{_datadir}/apps/kjava/kjava.policy
-%{_datadir}/apps/kjava/pluginsinfo
+%{_datadir}/apps/kjava
 %{_datadir}/apps/knotify
+%{_datadir}/apps/ksgmltools2
+%{_datadir}/apps/kssl
 %{_datadir}/apps/kstyle
 %{_datadir}/apps/ktexteditor_docwordcompletion
 %{_datadir}/apps/ktexteditor_insertfile
@@ -570,19 +561,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/apps/ktexteditor_kdatatool
 %{_datadir}/apps/proxyscout
 %dir %{_datadir}/autostart
-%{_datadir}/config/colors
-%{_datadir}/config/ipv6blacklist
-%{_datadir}/config/katefiletyperc
-%{_datadir}/config/katesyntaxhighlightingrc
-%{_datadir}/config/kdeprintrc
-%{_datadir}/config/khotnewstuffrc
-%{_datadir}/config/ksslcalist
-%{_datadir}/config/kthemestylerc
-%{_datadir}/config/language.codes
-%{_datadir}/config/magic
-%{_datadir}/config/ui/kprintpreviewui.rc
+%{_datadir}/config
 %dir %{_datadir}/emoticons
 %{_datadir}/emoticons/Default
+%{_datadir}/locale/all_languages
 %{_datadir}/mimelnk
 %dir %{_datadir}/services
 %dir %{_datadir}/services/kresources
@@ -661,6 +643,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_docdir}/kde
 %dir %{_kdedocdir}
 %dir %{_kdedocdir}/en
+%lang(en) %{_kdedocdir}/en/common
 %lang(en) %{_kdedocdir}/en/kspell
 
 %lang(ca) %dir %{_kdedocdir}/ca
@@ -1003,29 +986,3 @@ rm -rf $RPM_BUILD_ROOT
 %files kgrantpty
 %defattr(644,root,root,755)
 %attr(4755,root,root) %{_bindir}/kgrantpty
-
-%files shared
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/checkXML
-%attr(755,root,root) %{_bindir}/kunittestmodrunner
-%attr(755,root,root) %{_bindir}/makekdewidgets
-%{_datadir}/apps/katepart
-%{_datadir}/apps/kcm_componentchooser
-%{_datadir}/apps/kdeui
-%{_datadir}/apps/kdewidgets
-%{_datadir}/apps/khtml/css/html4.css
-%{_datadir}/apps/khtml/css/quirks.css
-%{_datadir}/apps/khtml/khtml_browser.rc
-%{_datadir}/apps/kjava/kjava.jar
-%{_datadir}/apps/ksgmltools2
-%{_datadir}/apps/kssl
-%{_datadir}/config/ui/ui_standards.rc
-%{_datadir}/config/kdebug.areas
-%{_datadir}/config/kdebugrc
-%lang(en) %{_kdedocdir}/en/common
-%{_datadir}/locale/all_languages
-%dir %{_datadir}/apps/khtml
-%dir %{_datadir}/apps/khtml/css
-%dir %{_datadir}/apps/kjava
-%dir %{_datadir}/config
-%dir %{_datadir}/config/ui