SPECS (AC-branch): kdebase.spec, kdeedu.spec, kdegames.spec, kdegr...

glen glen at pld-linux.org
Fri Feb 15 23:36:43 CET 2008 

Author: glen                         Date: Fri Feb 15 22:36:43 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- locolor icons not supported

---- Files affected:
SPECS:
   kdebase.spec (1.491.2.44 -> 1.491.2.45) , kdeedu.spec (1.109.2.6 -> 1.109.2.7) , kdegames.spec (1.167.2.9 -> 1.167.2.10) , kdegraphics.spec (1.177.2.21 -> 1.177.2.22) , kdemultimedia.spec (1.223.2.13 -> 1.223.2.14) , kdenetwork.spec (1.212.2.37 -> 1.212.2.38) , kdepim.spec (1.222.2.37 -> 1.222.2.38) , kdesdk.spec (1.163.2.13 -> 1.163.2.14) , kdeutils.spec (1.183.2.15 -> 1.183.2.16) , kdewebdev.spec (1.65.2.10 -> 1.65.2.11) 

---- Diffs:

================================================================
Index: SPECS/kdebase.spec
diff -u SPECS/kdebase.spec:1.491.2.44 SPECS/kdebase.spec:1.491.2.45
--- SPECS/kdebase.spec:1.491.2.44	Fri Feb 15 21:56:08 2008
+++ SPECS/kdebase.spec	Fri Feb 15 23:36:35 2008
@@ -1572,7 +1572,6 @@
 %{_datadir}/services/imagethumbnail.desktop
 %{_datadir}/services/konsolepart.desktop
 %{_datadir}/services/textthumbnail.desktop
-#%{_datadir}/services/picturethumbnail.desktop
 %{_datadir}/services/thumbnail.protocol
 %{_datadir}/servicetypes/terminalemulator.desktop
 %{_datadir}/servicetypes/thumbcreator.desktop
@@ -1582,7 +1581,7 @@
 %{_fontsdir}/misc/console*.gz
 %{_datadir}/apps/konsole
 %{_datadir}/mimelnk/application/x-konsole.desktop
-%{_iconsdir}/[!l]*/*/apps/bell.png
+%{_iconsdir}/crystalsvg/*/apps/bell.png
 %{_iconsdir}/*/*/apps/key_bindings.png
 
 %files core -f core.lang
@@ -2610,6 +2609,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.491.2.45  2008-02-15 22:36:35  glen
+- locolor icons not supported
+
 Revision 1.491.2.44  2008-02-15 20:56:08  glen
 - keep kconf_update files together
 

================================================================
Index: SPECS/kdeedu.spec
diff -u SPECS/kdeedu.spec:1.109.2.6 SPECS/kdeedu.spec:1.109.2.7
--- SPECS/kdeedu.spec:1.109.2.6	Fri Feb 15 19:54:52 2008
+++ SPECS/kdeedu.spec	Fri Feb 15 23:36:35 2008
@@ -7,7 +7,7 @@
 Summary(pl.UTF-8):	K Desktop Environment - edukacja i rozrywka
 Name:		kdeedu
 Version:	3.5.9
-Release:	0.1
+Release:	1
 Epoch:		8
 License:	GPL
 Group:		X11/Applications/Science
@@ -642,6 +642,9 @@
 	mv $RPM_BUILD_ROOT%{_iconsdir}/locolor/16x16/actions/edit_{add,remove}.png \
 		$RPM_BUILD_ROOT%{_iconsdir}/hicolor/16x16/actions
 
+	# unsupported
+	rm -rf $RPM_BUILD_ROOT%{_iconsdir}/locolor
+
 	# applnk is obsolete, isn't it?
 	rm -rf $RPM_BUILD_ROOT%{_datadir}/applnk
 	touch installed.stamp
@@ -691,7 +694,7 @@
 %{_desktopdir}/kde/blinken.desktop
 %{_datadir}/apps/blinken
 %{_datadir}/config.kcfg/blinken.kcfg
-%{_iconsdir}/[!l]*/*/*/blinken.*
+%{_iconsdir}/hicolor/*/*/blinken.*
 
 %files kalzium
 %defattr(644,root,root,755)
@@ -699,7 +702,7 @@
 %{_datadir}/apps/kalzium
 %{_datadir}/config.kcfg/kalzium.kcfg
 %{_desktopdir}/kde/kalzium.desktop
-%{_iconsdir}/[!l]*/*/apps/kalzium*
+%{_iconsdir}/hicolor/*/apps/kalzium.*
 #%{_mandir}/man1/kalzium.1*
 %{_kdedocdir}/en/kalzium
 
@@ -709,7 +712,7 @@
 %{_datadir}/config.kcfg/kanagram.kcfg
 %{_datadir}/apps/kanagram
 %{_desktopdir}/kde/kanagram.desktop
-%{_iconsdir}/[!l]*/*/*/kanagram.*
+%{_iconsdir}/hicolor/*/*/kanagram.*
 
 %files kbruch
 %defattr(644,root,root,755)
@@ -717,7 +720,8 @@
 %{_datadir}/apps/kbruch
 %{_datadir}/config.kcfg/kbruch.kcfg
 %{_desktopdir}/kde/kbruch.desktop
-%{_iconsdir}/[!l]*/*/*/kbruch*
+%{_iconsdir}/hicolor/*/*/kbruch.*
+%{_iconsdir}/crystalsvg/*/actions/kbruch_*.png
 %{_kdedocdir}/en/kbruch
 
 %files keduca
@@ -741,7 +745,8 @@
 %{_datadir}/config.kcfg/kgeography.kcfg
 %{_desktopdir}/kde/kgeography.desktop
 %{_datadir}/apps/kgeography
-%{_iconsdir}/[!l]*/*/*/kgeography.*
+%{_iconsdir}/hicolor/*/*/kgeography.*
+%{_iconsdir}/crystalsvg/*/*/kgeography.*
 
 %files khangman
 %defattr(644,root,root,755)
@@ -750,7 +755,7 @@
 %{_datadir}/config/khangmanrc
 %{_datadir}/config.kcfg/khangman.kcfg
 %{_desktopdir}/kde/khangman.desktop
-%{_iconsdir}/[!l]*/*/apps/khangman*
+%{_iconsdir}/hicolor/*/apps/khangman.*
 %{_kdedocdir}/en/khangman
 
 %files kig
@@ -776,7 +781,7 @@
 %{_datadir}/services/kfile_drgeo.desktop
 %{_datadir}/services/kfile_kig.desktop
 %{_desktopdir}/kde/kig.desktop
-%{_iconsdir}/[!l]*/*/apps/kig*
+%{_iconsdir}/hicolor/*/apps/kig.*
 %{_iconsdir}/crystalsvg/*/mimetypes/kig_doc.*
 %{_kdedocdir}/en/kig
 
@@ -789,7 +794,7 @@
 %{_desktopdir}/kde/kiten.desktop
 %{_iconsdir}/*/*/actions/kanjidic.png
 %{_iconsdir}/*/*/actions/edit_*.png
-%{_iconsdir}/*/*/apps/kiten*
+%{_iconsdir}/*/*/apps/kiten.*
 %{_kdedocdir}/en/kiten
 
 %files klatin
@@ -799,7 +804,7 @@
 %{_datadir}/apps/klatin
 %{_desktopdir}/kde/klatin.desktop
 %{_kdedocdir}/en/klatin
-%{_iconsdir}/*/*/apps/klatin*
+%{_iconsdir}/*/*/apps/klatin.*
 
 %files klettres
 %defattr(644,root,root,755)
@@ -808,7 +813,7 @@
 %{_datadir}/config/klettresrc
 %{_datadir}/config.kcfg/klettres.kcfg
 %{_desktopdir}/kde/klettres.desktop
-%{_iconsdir}/[!l]*/*/*/klettres*
+%{_iconsdir}/hicolor/*/*/klettres.*
 %{_kdedocdir}/en/klettres
 
 %if 0
@@ -818,7 +823,7 @@
 %{_datadir}/apps/kmessedwords
 %{_datadir}/config.kcfg/kmessedwords.kcfg
 %{_desktopdir}/kde/kmessedwords.desktop
-%{_iconsdir}/[!l]*/*/apps/kmessedwords*
+%{_iconsdir}/hicolor/*/apps/kmessedwords.*
 %{_kdedocdir}/en/kmessedwords
 %endif
 
@@ -832,7 +837,7 @@
 %{_desktopdir}/kde/kmplot.desktop
 %{_datadir}/mimelnk/application/x-kmplot.desktop
 %{_datadir}/services/kmplot_part.desktop
-%{_iconsdir}/[!l]*/*/apps/kmplot*
+%{_iconsdir}/hicolor/*/apps/kmplot.*
 %{_kdedocdir}/en/kmplot
 
 %files kpercentage
@@ -840,7 +845,7 @@
 %attr(755,root,root) %{_bindir}/kpercentage
 %{_datadir}/apps/kpercentage
 %{_desktopdir}/kde/kpercentage.desktop
-%{_iconsdir}/[!l]*/*/apps/kpercentage*
+%{_iconsdir}/hicolor/*/apps/kpercentage.*
 %{_kdedocdir}/en/kpercentage
 
 %files kstars
@@ -863,7 +868,7 @@
 %{_datadir}/config/kstarsrc
 %{_datadir}/config.kcfg/kstars.kcfg
 %{_desktopdir}/kde/kstars.desktop
-%{_iconsdir}/[!l]*/*/apps/kstars*
+%{_iconsdir}/hicolor/*/apps/kstars.*
 %{_kdedocdir}/en/kstars
 
 %files ktouch
@@ -872,7 +877,7 @@
 %{_datadir}/apps/ktouch
 %{_datadir}/config.kcfg/ktouch.kcfg
 %{_desktopdir}/kde/ktouch.desktop
-%{_iconsdir}/*/*/apps/ktouch*
+%{_iconsdir}/*/*/apps/ktouch.*
 %{_kdedocdir}/en/ktouch
 
 %files kturtle
@@ -883,7 +888,7 @@
 %{_datadir}/config.kcfg/kturtle.kcfg
 %{_desktopdir}/kde/kturtle.desktop
 %{_kdedocdir}/en/kturtle
-%{_iconsdir}/*/*/apps/kturtle*
+%{_iconsdir}/*/*/apps/kturtle.*
 
 %files kverbos
 %defattr(644,root,root,755)
@@ -892,7 +897,7 @@
 %{_datadir}/config.kcfg/kverbos.kcfg
 %{_desktopdir}/kde/kverbos.desktop
 %{_iconsdir}/*/*/actions/kverbosuser.png
-%{_iconsdir}/*/*/apps/kverbos*
+%{_iconsdir}/*/*/apps/kverbos.*
 %{_kdedocdir}/en/kverbos
 
 %files kvoctrain
@@ -905,7 +910,7 @@
 %{_datadir}/config.kcfg/presettings.kcfg
 %{_datadir}/config/kvoctrainrc
 %{_desktopdir}/kde/kvoctrain.desktop
-%{_iconsdir}/*/*/apps/kvoctrain*
+%{_iconsdir}/*/*/apps/kvoctrain.*
 %{_kdedocdir}/en/kvoctrain
 %{_datadir}/mimelnk/text/x-kvtml.desktop
 
@@ -916,7 +921,8 @@
 %{_datadir}/config.kcfg/kwordquiz.kcfg
 %{_desktopdir}/kde/kwordquiz.desktop
 %{_kdedocdir}/en/kwordquiz
-%{_iconsdir}/[!l]*/*/*/kwordquiz*
+%{_iconsdir}/hicolor/*/*/kwordquiz.*
+%{_iconsdir}/crystalsvg/*/*/kwordquiz_doc.*
 %{_datadir}/mimelnk/application/x-kwordquiz.desktop
 %{_datadir}/config/kwordquizrc
 
@@ -964,6 +970,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.109.2.7  2008-02-15 22:36:35  glen
+- locolor icons not supported
+
 Revision 1.109.2.6  2008-02-15 18:54:52  glen
 - KDE 3.5.9, new pkg: libkvoctrain
 

================================================================
Index: SPECS/kdegames.spec
diff -u SPECS/kdegames.spec:1.167.2.9 SPECS/kdegames.spec:1.167.2.10
--- SPECS/kdegames.spec:1.167.2.9	Fri Feb 15 22:58:00 2008
+++ SPECS/kdegames.spec	Fri Feb 15 23:36:35 2008
@@ -941,7 +941,7 @@
 %attr(660,root,games) %config(noreplace) %verify(not md5 mtime size) /var/games/kbounce.scores
 %{_datadir}/apps/kbounce
 %{_desktopdir}/kde/kbounce.desktop
-%{_iconsdir}/[!l]*/*/*/kbounce*
+%{_iconsdir}/hicolor/*/*/kbounce*
 
 %files kenolaba -f kenolaba.lang
 %defattr(644,root,root,755)
@@ -1030,7 +1030,7 @@
 %{_datadir}/apps/knetwalk
 %{_desktopdir}/kde/lskat.desktop
 %{_desktopdir}/kde/knetwalk.desktop
-%{_iconsdir}/[!l]*/*/apps/knetwalk.png
+%{_iconsdir}/hicolor/*/apps/knetwalk.png
 
 %files kolf -f kolf.lang
 %defattr(644,root,root,755)
@@ -1135,7 +1135,7 @@
 %{_datadir}/apps/kspaceduel
 %{_datadir}/config.kcfg/kspaceduel.kcfg
 %{_desktopdir}/kde/kspaceduel.desktop
-%{_iconsdir}/[!l]*/*/apps/kspaceduel.png
+%{_iconsdir}/hicolor/*/apps/kspaceduel.png
 
 %files ktron -f ktron.lang
 %defattr(644,root,root,755)
@@ -1166,7 +1166,7 @@
 %attr(755,root,games) %{_bindir}/lskatproc
 %{_datadir}/apps/lskat
 %{_desktopdir}/kde/lskat.desktop
-%{_iconsdir}/[!l]*/*/apps/lskat.png
+%{_iconsdir}/hicolor/*/apps/lskat.png
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -1174,6 +1174,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.167.2.10  2008-02-15 22:36:35  glen
+- locolor icons not supported
+
 Revision 1.167.2.9  2008-02-15 21:58:00  glen
 - install shortcut
 

================================================================
Index: SPECS/kdegraphics.spec
diff -u SPECS/kdegraphics.spec:1.177.2.21 SPECS/kdegraphics.spec:1.177.2.22
--- SPECS/kdegraphics.spec:1.177.2.21	Fri Feb 15 23:03:11 2008
+++ SPECS/kdegraphics.spec	Fri Feb 15 23:36:35 2008
@@ -602,6 +602,10 @@
 if [ ! -f installed.stamp ]; then
 	rm -f $RPM_BUILD_ROOT%{_datadir}/applnk/Graphics/kruler.desktop
 	rm -f $RPM_BUILD_ROOT%{_libdir}/kde3/*.la
+
+	# unsupported
+	rm -rf $RPM_BUILD_ROOT%{_iconsdir}/locolor
+
 	touch installed.stamp
 fi
 
@@ -670,14 +674,14 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/kcolorchooser
 %{_desktopdir}/kde/kcolorchooser.desktop
-%{_iconsdir}/[!l]*/*/*/kcolorchooser.*
+%{_iconsdir}/hicolor/*/*/kcolorchooser.*
 
 %files kcoloredit -f kcoloredit.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/kcoloredit
 %{_datadir}/apps/kcoloredit
 %{_desktopdir}/kde/kcoloredit.desktop
-%{_iconsdir}/[!l]*/*/*/kcoloredit.*
+%{_iconsdir}/hicolor/*/*/kcoloredit.*
 
 %files kdvi -f kdvi.lang
 %defattr(644,root,root,755)
@@ -702,7 +706,7 @@
 %{_desktopdir}/kde/kfax.desktop
 %{_desktopdir}/kde/kfaxview.desktop
 %{_iconsdir}/*/*/*/kfax.*
-%{_iconsdir}/[!l]*/*/*/kfaxview.*
+%{_iconsdir}/hicolor/*/*/kfaxview.*
 
 %files kfile
 %defattr(644,root,root,755)
@@ -758,7 +762,7 @@
 %attr(755,root,root) %{_bindir}/kolourpaint
 %{_datadir}/apps/kolourpaint
 %{_desktopdir}/kde/kolourpaint.desktop
-%{_iconsdir}/[!l]*/*/*/kolourpaint.*
+%{_iconsdir}/hicolor/*/*/kolourpaint.*
 
 %files kooka -f kooka.lang
 %defattr(644,root,root,755)
@@ -779,7 +783,7 @@
 %{_datadir}/config.kcfg/kpdf.kcfg
 %{_datadir}/services/kpdf_part.desktop
 %{_desktopdir}/kde/kpdf.desktop
-%{_iconsdir}/[!l]*/*/*/kpdf.*
+%{_iconsdir}/hicolor/*/*/kpdf.*
 
 %files kpovmodeler -f kpovmodeler.lang
 %defattr(644,root,root,755)
@@ -788,7 +792,8 @@
 %attr(755,root,root) %{_libdir}/kde3/libkpovmodelerpart.so*
 %{_datadir}/apps/kpovmodeler
 %{_desktopdir}/kde/kpovmodeler.desktop
-%{_iconsdir}/[!l]*/*/*/kpovmodeler*
+%{_iconsdir}/crystalsvg/*/*/kpovmodeler_doc.png
+%{_iconsdir}/hicolor/*/*/kpovmodeler.png
 
 %files kruler -f kruler.lang
 %defattr(644,root,root,755)
@@ -826,7 +831,7 @@
 %attr(755,root,root) %{_libdir}/kde3/kuickshow.so
 %{_datadir}/apps/kuickshow
 %{_desktopdir}/kde/kuickshow.desktop
-%{_iconsdir}/[!l]*/*/*/kuickshow.*
+%{_iconsdir}/hicolor/*/*/kuickshow.*
 %endif
 
 %files kview -f kview.lang
@@ -888,6 +893,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.177.2.22  2008-02-15 22:36:35  glen
+- locolor icons not supported
+
 Revision 1.177.2.21  2008-02-15 22:03:11  glen
 - install shortcut
 

================================================================
Index: SPECS/kdemultimedia.spec
diff -u SPECS/kdemultimedia.spec:1.223.2.13 SPECS/kdemultimedia.spec:1.223.2.14
--- SPECS/kdemultimedia.spec:1.223.2.13	Fri Feb 15 21:49:33 2008
+++ SPECS/kdemultimedia.spec	Fri Feb 15 23:36:36 2008
@@ -600,13 +600,16 @@
 fi
 
 if [ ! -f installed.stamp ]; then
-	# locolor icons are deprecated (in PLD?)
-	rm -rf $RPM_BUILD_ROOT%{_iconsdir}/locolor
 	# PLD doesn't have 'Multimedia/Music' submenu
 	rm -f $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus/applications-merged/kde-multimedia-music.menu
 
+	# locolor icons are deprecated (in PLD?)
+	rm -rf $RPM_BUILD_ROOT%{_iconsdir}/locolor
+
 	rm $RPM_BUILD_ROOT%{_libdir}/kde3/*.la
 	rm $RPM_BUILD_ROOT%{_libdir}/libkdeinit_*.la
+
+	touch installed.stamp
 fi
 
 rm -f *.lang
@@ -765,7 +768,7 @@
 %{_libdir}/mcop/artsmodulessynth.mcoptype
 %{_libdir}/mcop/audiofilearts.mcopclass
 %{_libdir}/mcop/audiofilearts.mcoptype
-%{_iconsdir}/[!l]*/*/actions/arts[!bc]*.*
+%{_iconsdir}/crystalsvg/*/actions/arts[!bc]*.*
 
 %files artsbuilder -f artsbuilder.lang
 %defattr(644,root,root,755)
@@ -775,8 +778,8 @@
 %{_datadir}/apps/artsbuilder
 %{_datadir}/mimelnk/application/x-artsbuilder.desktop
 %{_desktopdir}/kde/artsbuilder.desktop
-%{_iconsdir}/[!l]*/*/actions/artsbuilderexecute.*
-%{_iconsdir}/[!l]*/*/apps/artsbuilder.*
+%{_iconsdir}/crystalsvg/*/actions/artsbuilderexecute.*
+%{_iconsdir}/hicolor/*/apps/artsbuilder.*
 
 %files artscontrol
 %defattr(644,root,root,755)
@@ -784,7 +787,7 @@
 %{_datadir}/apps/artscontrol
 %{_datadir}/apps/kicker/applets/artscontrolapplet.desktop
 %{_desktopdir}/kde/artscontrol.desktop
-%{_iconsdir}/[!l]*/*/apps/artscontrol.*
+%{_iconsdir}/hicolor/*/apps/artscontrol.*
 
 %if %{with xine}
 %files artsplugin-xine
@@ -999,6 +1002,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.223.2.14  2008-02-15 22:36:36  glen
+- locolor icons not supported
+
 Revision 1.223.2.13  2008-02-15 20:49:33  glen
 - FIX fix for noatun20update
 

================================================================
Index: SPECS/kdenetwork.spec
diff -u SPECS/kdenetwork.spec:1.212.2.37 SPECS/kdenetwork.spec:1.212.2.38
--- SPECS/kdenetwork.spec:1.212.2.37	Fri Feb 15 22:30:49 2008
+++ SPECS/kdenetwork.spec	Fri Feb 15 23:36:36 2008
@@ -1122,7 +1122,6 @@
 
 	# Messing ones
 	%{__rm} $RPM_BUILD_ROOT%{_datadir}/mimelnk/application/x-icq.desktop
-	%{__rm} $RPM_BUILD_ROOT%{_iconsdir}/locolor/32x32/apps/krfb.png
 	%{__rm} $RPM_BUILD_ROOT%{_datadir}/apps/konqueror/dirtree/remote/lan.desktop
 
 	rm -f $RPM_BUILD_ROOT%{_libdir}/kde3/*.la
@@ -1130,6 +1129,10 @@
 	rm -f $RPM_BUILD_ROOT%{_libdir}/libkdeinit_kdict.la
 	rm -f $RPM_BUILD_ROOT%{_libdir}/libkdeinit_ksirc.la
 	rm -f $RPM_BUILD_ROOT%{_libdir}/libkwireless.la
+
+	# unsupported
+	rm -rf $RPM_BUILD_ROOT%{_iconsdir}/locolor
+
 	touch installed.stamp
 fi
 
@@ -1137,7 +1140,6 @@
 %find_lang kget --with-kde
 %find_lang knewsticker --with-kde
 %find_lang kopete --with-kde
-%{__sed} -i -e '/kdenetwork-apidocs/d' kopete.lang
 %find_lang kpf --with-kde
 %find_lang kppp --with-kde
 %find_lang krfb --with-kde
@@ -1149,6 +1151,8 @@
 %find_lang kcontrol/kcmtalkd --with-kde -a ktalkd.lang
 %find_lang kcontrol/lanbrowser --with-kde -a lisa.lang
 
+%{__sed} -i -e '/kdenetwork-apidocs/d' kopete.lang
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -1629,7 +1633,7 @@
 %{_desktopdir}/kde/krfb.desktop
 %{_desktopdir}/kde/krdc.desktop
 %{_iconsdir}/*/*/*/krdc*
-%{_iconsdir}/[!l]*/*/*/krfb*
+%{_iconsdir}/crystalsvg/*/*/krfb.png
 
 %files ksirc -f ksirc.lang
 %defattr(644,root,root,755)
@@ -1642,7 +1646,7 @@
 %{_datadir}/apps/ksirc
 %{_datadir}/services/kntsrcfilepropsdlg.desktop
 %{_desktopdir}/kde/ksirc.desktop
-%{_iconsdir}/[!l]*/*/*/ksirc*
+%{_iconsdir}/hicolor/*/*/ksirc.png
 
 %files ktalkd -f ktalkd.lang
 %defattr(644,root,root,755)
@@ -1722,6 +1726,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.212.2.38  2008-02-15 22:36:36  glen
+- locolor icons not supported
+
 Revision 1.212.2.37  2008-02-15 21:30:49  glen
 - ghost soname symlinks, check-files cleanup
 

================================================================
Index: SPECS/kdepim.spec
diff -u SPECS/kdepim.spec:1.222.2.37 SPECS/kdepim.spec:1.222.2.38
--- SPECS/kdepim.spec:1.222.2.37	Fri Feb 15 22:33:27 2008
+++ SPECS/kdepim.spec	Fri Feb 15 23:36:36 2008
@@ -587,13 +587,15 @@
 	%{__rm} $RPM_BUILD_ROOT%{_datadir}/applnk/{Applications/kalarm,Utilities/{kandy,karm,kmailcvt}}.desktop
 
 	rm -f $RPM_BUILD_ROOT%{_libdir}/kde3/*.la
+	rm -f $RPM_BUILD_ROOT%{_libdir}/kde3/plugins/designer/kdepimwidgets.la
+	rm -f $RPM_BUILD_ROOT%{_libdir}/kde3/plugins/designer/kpartsdesignerplugin.la
+
+	# unsupported
+	rm -rf $RPM_BUILD_ROOT%{_iconsdir}/locolor
+
 	touch installed.stamp
 fi
 
-%{__rm} -f $RPM_BUILD_ROOT%{_iconsdir}/locolor/{16x16/apps/{kpilot,ktnef},32x32/apps/ktnef}.png
-rm -f $RPM_BUILD_ROOT%{_libdir}/kde3/plugins/designer/kdepimwidgets.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/kde3/plugins/designer/kpartsdesignerplugin.la
-
 rm -f *.lang
 
 > %{name}.lang
@@ -706,7 +708,7 @@
 %attr(755,root,root) %{_libdir}/kde3/plugins/designer/kpartsdesignerplugin.so
 %{_datadir}/apps/akregator
 %{_datadir}/apps/kconf_update/korganizer.upd
-%{_datadir}/apps/kconf_update/kolab-reource.upd
+%{_datadir}/apps/kconf_update/kolab-resource.upd
 %attr(755,root,root) %{_datadir}/apps/kconf_update/upgrade-resourcetype.pl
 %{_datadir}/apps/kdepimwidgets
 %{_datadir}/apps/kgantt
@@ -930,7 +932,8 @@
 %{_datadir}/apps/kalarm*
 %{_datadir}/autostart/kalarm*.desktop
 %{_desktopdir}/kde/kalarm.desktop
-%{_iconsdir}/[!l]*/*/*/kalarm.png
+%{_iconsdir}/crystalsvg/*/*/kalarm.png
+%{_iconsdir}/hicolor/*/*/kalarm.png
 
 %files kandy -f kandy.lang
 %defattr(644,root,root,755)
@@ -1107,7 +1110,8 @@
 %{_desktopdir}/kde/kpalmdoc.desktop
 %{_desktopdir}/kde/kpilot*.desktop
 %{_iconsdir}/*/*/apps/kpalmdoc.png
-%{_iconsdir}/[!l]*/*/*/kpilot*.png
+%{_iconsdir}/hicolor/*/*/kpilot.png
+%{_iconsdir}/crystalsvg/*/*/kpilotDaemon.png
 
 %files libs
 %defattr(644,root,root,755)
@@ -1226,6 +1230,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.222.2.38  2008-02-15 22:36:36  glen
+- locolor icons not supported
+
 Revision 1.222.2.37  2008-02-15 21:33:27  glen
 - kconf_update fixes
 

================================================================
Index: SPECS/kdesdk.spec
diff -u SPECS/kdesdk.spec:1.163.2.13 SPECS/kdesdk.spec:1.163.2.14
--- SPECS/kdesdk.spec:1.163.2.13	Fri Feb 15 22:45:14 2008
+++ SPECS/kdesdk.spec	Fri Feb 15 23:36:36 2008
@@ -880,8 +880,8 @@
 %attr(755,root,root) %{_datadir}/apps/kconf_update/move_repositories.pl
 %{_datadir}/services/cvsservice.desktop
 %{_desktopdir}/kde/cervisia.desktop
-%{_iconsdir}/[!l]*/*/*/vcs*
-%{_iconsdir}/[!l]*/*/*/cervisia*
+%{_iconsdir}/crystalsvg/*/actions/vcs_*.*
+%{_iconsdir}/hicolor/*/*/cervisia.png
 %{_mandir}/man1/cervisia.1*
 
 %files completions-bash
@@ -965,9 +965,9 @@
 %{_desktopdir}/kde/catalogmanager.desktop
 %{_desktopdir}/kde/kbabel.desktop
 %{_desktopdir}/kde/kbabeldict.desktop
-%{_iconsdir}/[!l]*/*/*/catalogmanager.png
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kdebase.spec?r1=1.491.2.44&r2=1.491.2.45&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kdeedu.spec?r1=1.109.2.6&r2=1.109.2.7&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kdegames.spec?r1=1.167.2.9&r2=1.167.2.10&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kdegraphics.spec?r1=1.177.2.21&r2=1.177.2.22&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kdemultimedia.spec?r1=1.223.2.13&r2=1.223.2.14&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kdenetwork.spec?r1=1.212.2.37&r2=1.212.2.38&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kdepim.spec?r1=1.222.2.37&r2=1.222.2.38&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kdesdk.spec?r1=1.163.2.13&r2=1.163.2.14&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kdeutils.spec?r1=1.183.2.15&r2=1.183.2.16&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kdewebdev.spec?r1=1.65.2.10&r2=1.65.2.11&f=u

More information about the pld-cvs-commit mailing list