SPECS: kcdlabel.spec - icondir fix (but further one needed)

[qboosh]

Author: qboosh                       Date: Mon Jun 20 22:05:39 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- icondir fix (but further one needed)

---- Files affected:
SPECS:
   kcdlabel.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SPECS/kcdlabel.spec
diff -u SPECS/kcdlabel.spec:1.4 SPECS/kcdlabel.spec:1.5
--- SPECS/kcdlabel.spec:1.4	Mon Jun 20 23:39:50 2005
+++ SPECS/kcdlabel.spec	Tue Jun 21 00:05:34 2005
@@ -27,7 +27,6 @@
 %build
 kde_appsdir="%{_desktopdir}"; export kde_appsdir
 kde_htmldir="%{_htmldir}"; export kde_htmldir
-kde_icondir="%{_pixmapsdir}"; export kde_icondir
 
 # I'm not sure about this Category Utility
 
@@ -45,13 +44,15 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} DESTDIR=$RPM_BUILD_ROOT install
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
 
 # standardize paths ("medium" is 59x48 not 64x64 in fact...)
-install -d $RPM_BUILD_ROOT%{_pixmapsdir}/locolor
-mv -f $RPM_BUILD_ROOT%{_pixmapsdir}/small/locolor $RPM_BUILD_ROOT%{_pixmapsdir}/locolor/16x16
-mv -f $RPM_BUILD_ROOT%{_pixmapsdir}/medium/locolor $RPM_BUILD_ROOT%{_pixmapsdir}/locolor/64x64
-mv -f $RPM_BUILD_ROOT%{_desktopdir}/Multimedia/* $RPM_BUILD_ROOT%{_desktopdir}/
+# XXX: check paths/kill unsupported icons
+install -d $RPM_BUILD_ROOT%{_iconsdir}/locolor
+mv -f $RPM_BUILD_ROOT%{_iconsdir}/small/locolor $RPM_BUILD_ROOT%{_iconsdir}/locolor/16x16
+mv -f $RPM_BUILD_ROOT%{_iconsdir}/medium/locolor $RPM_BUILD_ROOT%{_iconsdir}/locolor/64x64
+mv -f $RPM_BUILD_ROOT%{_desktopdir}/Multimedia/* $RPM_BUILD_ROOT%{_desktopdir}
 
 %find_lang %{name}
 
@@ -63,7 +64,7 @@
 %doc ChangeLog AUTHORS
 %attr(755,root,root) %{_bindir}/%{name}
 %{_desktopdir}/kcdlabel.desktop
-%{_pixmapsdir}/*/*/apps/*
+%{_iconsdir}/*/*/apps/*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -71,6 +72,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2005/06/20 22:05:34  qboosh
+- icondir fix (but further one needed)
+
 Revision 1.4  2005/06/20 21:39:50  blekot
 - up to 2.13
 - applnk --> applications
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kcdlabel.spec?r1=1.4&r2=1.5&f=u