SPECS (DEVEL): kdelibs.spec, kdebase.spec - 050624 & 050625

adgor adgor at pld-linux.org
Sun Jun 26 18:59:25 CEST 2005


Author: adgor                        Date: Sun Jun 26 16:59:25 2005 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- 050624 & 050625

---- Files affected:
SPECS:
   kdelibs.spec (1.397.2.1 -> 1.397.2.2) , kdebase.spec (1.435.2.1 -> 1.435.2.2) 

---- Diffs:

================================================================
Index: SPECS/kdelibs.spec
diff -u SPECS/kdelibs.spec:1.397.2.1 SPECS/kdelibs.spec:1.397.2.2
--- SPECS/kdelibs.spec:1.397.2.1	Tue May  3 12:42:20 2005
+++ SPECS/kdelibs.spec	Sun Jun 26 18:59:20 2005
@@ -9,7 +9,7 @@
 %define		_state		unstable
 %define		_kdever		3.4.89
 %define		_ver		3.4.89
-%define         _snap           050428
+%define         _snap           050624
 
 %define		artsver		13:1.4.0
 
@@ -316,9 +316,6 @@
 %patch4 -p1
 %patch5 -p1
 
-%{__sed} -i -e 's/Terminal=0/Terminal=false/' \
-	kresources/kresources.desktop
-
 %build
 cp %{_datadir}/automake/config.sub admin
 
@@ -451,6 +448,7 @@
 %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
@@ -552,6 +550,8 @@
 %attr(755,root,root) %{_libdir}/libktexteditor.so.*.*.*
 %{_libdir}/libkutils.la
 %attr(755,root,root) %{_libdir}/libkutils.so.*.*.*
+%{_libdir}/libkunittest.la
+%attr(755,root,root) %{_libdir}/libkunittest.so.*.*.*
 %{_libdir}/libkwalletbackend.la
 %attr(755,root,root) %{_libdir}/libkwalletbackend.so.*.*.*
 %{_libdir}/libkwalletclient.la
@@ -615,6 +615,8 @@
 %attr(755,root,root) %{_libdir}/kde3/kimg_eps.so
 %{_libdir}/kde3/kimg_exr.la
 %attr(755,root,root) %{_libdir}/kde3/kimg_exr.so
+%{_libdir}/kde3/kimg_hdr.la
+%attr(755,root,root) %{_libdir}/kde3/kimg_hdr.so
 %{_libdir}/kde3/kimg_ico.la
 %attr(755,root,root) %{_libdir}/kde3/kimg_ico.so
 %{_libdir}/kde3/kimg_jp2.la
@@ -768,6 +770,7 @@
 %{_datadir}/services/eps.kimgio
 %{_datadir}/services/exr.kimgio
 %{_datadir}/services/gif.kimgio
+%{_datadir}/services/hdr.kimgio
 %{_datadir}/services/ico.kimgio
 %{_datadir}/services/jp2.kimgio
 %{_datadir}/services/jpeg.kimgio
@@ -932,6 +935,7 @@
 %attr(755,root,root) %{_libdir}/libkspell.so
 %attr(755,root,root) %{_libdir}/libkspell2.so
 %attr(755,root,root) %{_libdir}/libktexteditor.so
+%attr(755,root,root) %{_libdir}/libkunittest.so
 %attr(755,root,root) %{_libdir}/libkutils.so
 %attr(755,root,root) %{_libdir}/libkwalletbackend.so
 %attr(755,root,root) %{_libdir}/libkwalletclient.so
@@ -964,6 +968,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.397.2.2  2005/06/26 16:59:20  adgor
+- 050624 & 050625
+
 Revision 1.397.2.1  2005/05/03 10:42:20  adgor
 - 3.4.89
 

================================================================
Index: SPECS/kdebase.spec
diff -u SPECS/kdebase.spec:1.435.2.1 SPECS/kdebase.spec:1.435.2.2
--- SPECS/kdebase.spec:1.435.2.1	Tue May  3 12:42:20 2005
+++ SPECS/kdebase.spec	Sun Jun 26 18:59:20 2005
@@ -13,8 +13,8 @@
 %define		_state		stable
 %define		_kdever		3.4.89
 %define		_ver		3.4.89
-%define		_snap		050428
-%define		_minlibsevr	9:3.4.89.050428
+%define		_snap		050625
+%define		_minlibsevr	9:3.4.89.050624
 
 Summary:	K Desktop Environment - core files
 Summary(es):	K Desktop Environment - archivos básicos
@@ -27,7 +27,7 @@
 Summary(zh_CN):	KDEşËĐÄ
 Name:		kdebase
 Version:	%{_ver}.%{_snap}
-Release:	5
+Release:	1
 Epoch:		9
 License:	GPL
 Group:		X11/Applications
@@ -56,7 +56,7 @@
 Patch4:		%{name}-kdmconfig.patch
 Patch5:		%{name}-kicker.patch
 Patch6:		%{name}-konsole_all.patch
-Patch7:		%{name}-nsplugins_dirs.patch
+#Patch7:		%{name}-nsplugins_dirs.patch
 Patch8:		%{name}-startkde.patch
 Patch9:		%{name}-kcm_fonts.patch
 Patch10:	%{name}-kdesukonsole.patch
@@ -68,7 +68,7 @@
 Patch17:	%{name}-sasl-includes.patch
 Patch18:	%{name}-kio_settings.patch
 Patch19:	%{name}-konsole-default-keytab.patch
-Patch20:	%{name}-seesar.patch
+#Patch20:	%{name}-seesar.patch
 BuildRequires:	OpenGL-devel
 BuildRequires:	OpenEXR-devel >= 1.2.2
 BuildRequires:	audiofile-devel
@@ -1028,7 +1028,7 @@
 %patch4 -p1
 #%patch5 -p1
 %patch6 -p1
-%patch7 -p1
+#%patch7 -p1
 %patch8 -p1
 #%patch9 -p1
 %patch10 -p1
@@ -1039,7 +1039,7 @@
 %patch16 -p1
 %patch18 -p1
 %patch19 -p1
-%patch20 -p1
+#%patch20 -p1
 
 cd kcontrol/ebrowsing/plugins/ikws/searchproviders
 for i in  google*.desktop
@@ -1128,7 +1128,7 @@
 
 #export UNSERMAKE=/usr/share/unsermake/unsermake
 
-echo "KDE_OPTIONS = nofinal" > kicker/extensions/kasbar/Makefile.am
+#echo "KDE_OPTIONS = nofinal" > kicker/extensions/kasbar/Makefile.am
 
 %{__make} -f admin/Makefile.common cvs
 
@@ -1399,7 +1399,7 @@
 %{_includedir}/ksgrd
 %{_includedir}/ksplash
 %{_includedir}/kwin
-#%{_libdir}/libkasbar.so
+%{_libdir}/libkasbar.so
 %{_libdir}/libkateinterfaces.so
 %{_libdir}/libkateutils.so
 %{_libdir}/libkdecorations.so
@@ -1662,6 +1662,7 @@
 %dir %{_datadir}/apps/kio_info
 %attr(0755,root,root) %{_datadir}/apps/kio_info/kde-info2html
 %{_datadir}/apps/kio_info/kde-info2html.conf
+%{_datadir}/apps/kio_man
 # For apps they store files in servicemenus
 %dir %{_datadir}/apps/konqueror
 %dir %{_datadir}/apps/konqueror/servicemenus
@@ -1669,11 +1670,13 @@
 %{_datadir}/config.kcfg/khelpcenter.kcfg
 %{_datadir}/locale/l10n
 %lang(en_US) %{_datadir}/locale/en_US/entry.desktop
+%{_datadir}/mimelnk/fonts
 %{_datadir}/mimelnk/print
 %{_datadir}/services/info.protocol
 %{_datadir}/services/khelpcenter.desktop
 %{_datadir}/services/kdeprint_part.desktop
 %{_datadir}/services/man.protocol
+%{_datadir}/services/nntps.protocol
 %{_datadir}/services/programs.protocol
 %{_datadir}/services/settings.protocol
 %{_datadir}/services/system.protocol
@@ -1704,13 +1707,15 @@
 # infocenter & konqueror need it:
 %{_iconsdir}/*/*/apps/samba.png
 %{_iconsdir}/*/*/apps/usb.png
+%{_iconsdir}/hicolor/scalable/apps/khelpcenter.svgz
+%{_iconsdir}/hicolor/scalable/apps/printmgr.svgz
 
 %files desktop -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS README README.pam
 %config(noreplace) %verify(not size mtime md5) /etc/pam.d/kdesktop
 %attr(755,root,root) %{_bindir}/kaccess
-#%attr(755,root,root) %{_bindir}/kasbar
+%attr(755,root,root) %{_bindir}/kasbar
 %attr(755,root,root) %{_bindir}/kapplymousetheme
 %attr(755,root,root) %{_bindir}/kcheckpass
 %attr(755,root,root) %{_bindir}/kdeeject
@@ -2081,6 +2086,7 @@
 %{_iconsdir}/crystalsvg/*/apps/runprocesscatcher.png
 %{_iconsdir}/crystalsvg/*/apps/systemtray.png
 %{_iconsdir}/crystalsvg/*/apps/taskbar.png
+%{_iconsdir}/hicolor/scalable/apps/knetattach.svgz
 
 # kcontroledit
 %attr(755,root,root) %{_bindir}/kcontroledit
@@ -2098,8 +2104,8 @@
 %attr(755,root,root) %{_libdir}/kde3/clock_panelapplet.so
 %{_libdir}/kde3/dockbar_panelextension.la
 %attr(755,root,root) %{_libdir}/kde3/dockbar_panelextension.so
-#%{_libdir}/kde3/kasbar_panelextension.la
-#%attr(755,root,root) %{_libdir}/kde3/kasbar_panelextension.so
+%{_libdir}/kde3/kasbar_panelextension.la
+%attr(755,root,root) %{_libdir}/kde3/kasbar_panelextension.so
 %{_libdir}/kde3/kcm_clock.la
 %attr(755,root,root) %{_libdir}/kde3/kcm_clock.so
 %{_libdir}/kde3/kcm_kicker.la
@@ -2116,6 +2122,8 @@
 %attr(755,root,root) %{_libdir}/kde3/kickermenu_konqueror.so
 %{_libdir}/kde3/kickermenu_konsole.la
 %attr(755,root,root) %{_libdir}/kde3/kickermenu_konsole.so
+#%{_libdir}/kde3/kickermenu_konsoleprofiles.la
+#%attr(755,root,root) %{_libdir}/kde3/kickermenu_konsoleprofiles.so
 %{_libdir}/kde3/kickermenu_prefmenu.la
 %attr(755,root,root) %{_libdir}/kde3/kickermenu_prefmenu.so
 %{_libdir}/kde3/kickermenu_recentdocs.la
@@ -2147,6 +2155,7 @@
 %{_libdir}/kde3/trash_panelapplet.la
 %attr(755,root,root) %{_libdir}/kde3/trash_panelapplet.so
 %{_datadir}/apps/kicker/applets/*.desktop
+%{_datadir}/apps/kicker/builtins
 %{_datadir}/apps/kicker/default-apps
 %{_datadir}/apps/kicker/extensions
 %{_datadir}/apps/kicker/icons
@@ -2183,7 +2192,7 @@
 %attr(755,root,root) %{_libdir}/kde3/kmenuedit.so
 %{_datadir}/apps/kmenuedit
 %{_desktopdir}/kde/kmenuedit.desktop
-%{_iconsdir}/*/*/apps/kmenu.png
+#%{_iconsdir}/*/*/apps/kmenu.png
 %{_iconsdir}/*/*/apps/kmenuedit.png
 # thememgr is back?
 %attr(755,root,root) %{_bindir}/kdeinstallktheme
@@ -2193,11 +2202,12 @@
 %{_datadir}/mimelnk/application/x-ktheme.desktop
 %{_desktopdir}/kde/installktheme.desktop
 %{_desktopdir}/kde/kthememanager.desktop
+%{_iconsdir}/hicolor/scalable/apps/ktip.svgz
 
 %files desktop-libs
 %defattr(644,root,root,755)
-#%{_libdir}/libkasbar.la
-#%attr(755,root,root) %{_libdir}/libkasbar.so.*.*.*
+%{_libdir}/libkasbar.la
+%attr(755,root,root) %{_libdir}/libkasbar.so.*.*.*
 %{_libdir}/libkdecorations.la
 %attr(755,root,root) %{_libdir}/libkdecorations.so.*.*.*
 %{_libdir}/libksplashthemes.la
@@ -2278,20 +2288,22 @@
 #%attr(755,root,root) %{_libdir}/kde3/katekttsdplugin.so
 %dir %{_datadir}/apps/kate
 %{_datadir}/apps/kate/[!s]*
-%dir %{_datadir}/apps/kate/scripts
-%{_datadir}/apps/kate/scripts/*.desktop
-%attr(755,root,root) %{_datadir}/apps/kate/scripts/*.sh
+#%dir %{_datadir}/apps/kate/scripts
+#%{_datadir}/apps/kate/scripts/*.desktop
+#%attr(755,root,root) %{_datadir}/apps/kate/scripts/*.sh
 #%{_datadir}/apps/katepart
 %{_datadir}/config/katerc
 #%{_datadir}/mimelnk/application/x-kate-project.desktop
 #%{_datadir}/services/katedefaultproject.desktop
 #%{_datadir}/services/katekttsd.desktop
-%{_datadir}/servicetypes/kateinitplugin.desktop
+#%{_datadir}/servicetypes/kateinitplugin.desktop
 %{_datadir}/servicetypes/kateplugin.desktop
-%{_datadir}/servicetypes/kateprojectplugin.desktop
+#%{_datadir}/servicetypes/kateprojectplugin.desktop
 %{_desktopdir}/kde/kate.desktop
 # konqueror needs it ?
 %{_iconsdir}/*/*/apps/kate.png
+#
+%{_iconsdir}/hicolor/scalable/apps/kate2.svgz
 
 %files kdcop -f kdcop.lang
 %defattr(644,root,root,755)
@@ -2306,6 +2318,7 @@
 %{_datadir}/apps/kdeprintfax/[!a]*
 %{_desktopdir}/kde/kdeprintfax.desktop
 %{_iconsdir}/*/*/apps/kdeprintfax.png
+%{_iconsdir}/hicolor/scalable/apps/kdeprintfax.svgz
 
 %files kdialog
 %defattr(644,root,root,755)
@@ -2350,6 +2363,7 @@
 %{_datadir}/apps/kjobviewer
 %{_desktopdir}/kde/kjobviewer.desktop
 %{_iconsdir}/*/*/apps/kjobviewer.png
+%{_iconsdir}/hicolor/scalable/apps/kjobviewer.svgz
 
 %files klipper -f klipper.lang
 %defattr(644,root,root,755)
@@ -2364,6 +2378,7 @@
 %{_datadir}/config/klipperrc
 %{_desktopdir}/kde/klipper.desktop
 %{_iconsdir}/*/*/apps/klipper.png
+%{_iconsdir}/hicolor/scalable/apps/klipper.svgz
 
 %files konsole -f konsole.lang
 %defattr(644,root,root,755)
@@ -2418,6 +2433,7 @@
 %{_datadir}/apps/kwrite
 %{_desktopdir}/kde/kwrite.desktop
 %{_iconsdir}/*/*/apps/kwrite.png
+%{_iconsdir}/hicolor/scalable/apps/kwrite2.svgz
 
 %files kwrited
 %defattr(644,root,root,755)
@@ -2553,6 +2569,8 @@
 %attr(755,root,root) %{_libdir}/kde3/kcm_performance.so
 %{_libdir}/kde3/kded_favicons.la
 %attr(755,root,root) %{_libdir}/kde3/kded_favicons.so
+%{_libdir}/kde3/kded_homedirnotify.la
+%attr(755,root,root) %{_libdir}/kde3/kded_homedirnotify.so
 %{_libdir}/kde3/kded_konqy_preloader.la
 %attr(755,root,root) %{_libdir}/kde3/kded_konqy_preloader.so
 %{_libdir}/kde3/kded_mediamanager.la
@@ -2583,6 +2601,8 @@
 %attr(755,root,root) %{_libdir}/kde3/kio_fish.so
 %{_libdir}/kde3/kio_floppy.la
 %attr(755,root,root) %{_libdir}/kde3/kio_floppy.so
+%{_libdir}/kde3/kio_home.la
+%attr(755,root,root) %{_libdir}/kde3/kio_home.so
 %{_libdir}/kde3/kio_mac.la
 %attr(755,root,root) %{_libdir}/kde3/kio_mac.so
 %{_libdir}/kde3/kio_media.la
@@ -2700,7 +2720,9 @@
 %{_datadir}/services/fish.protocol
 %{_datadir}/services/floppy.protocol
 %{_datadir}/services/gzip.protocol
+%{_datadir}/services/home.protocol
 %{_datadir}/services/kded/favicons.desktop
+%{_datadir}/services/kded/homedirnotify.desktop
 %{_datadir}/services/kded/konqy_preloader.desktop
 %{_datadir}/services/kded/mediamanager.desktop
 %{_datadir}/services/kded/remotedirnotify.desktop
@@ -2760,6 +2782,7 @@
 %{_desktopdir}/kde/kcmcss.desktop
 %{_desktopdir}/kde/kcmhistory.desktop
 %{_desktopdir}/kde/khtml_behavior.desktop
+%{_desktopdir}/kde/khtml_filter.desktop
 %{_desktopdir}/kde/khtml_fonts.desktop
 %{_desktopdir}/kde/khtml_java_js.desktop
 %{_desktopdir}/kde/khtml_plugins.desktop
@@ -2789,6 +2812,7 @@
 %{_iconsdir}/*/*/apps/mac.png
 %{_iconsdir}/*/*/apps/proxy.png
 %{_iconsdir}/*/*/apps/stylesheet.png
+%{_iconsdir}/hicolor/scalable/apps/konqueror.svgz
 
 %files -n konqueror-libs
 %defattr(644,root,root,755)
@@ -2805,6 +2829,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.435.2.2  2005/06/26 16:59:20  adgor
+- 050624 & 050625
+
 Revision 1.435.2.1  2005/05/03 10:42:20  adgor
 - 3.4.89
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kdelibs.spec?r1=1.397.2.1&r2=1.397.2.2&f=u
    http://cvs.pld-linux.org/SPECS/kdebase.spec?r1=1.435.2.1&r2=1.435.2.2&f=u




More information about the pld-cvs-commit mailing list