SPECS: kpictorial.spec - use _kdedocdir, _desktopdir instead of _a...

[darekr]

Author: darekr                       Date: Wed Dec 13 16:32:11 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use _kdedocdir, _desktopdir instead of _applnkdir

---- Files affected:
SPECS:
   kpictorial.spec (1.16 -> 1.17) 

---- Diffs:

================================================================
Index: SPECS/kpictorial.spec
diff -u SPECS/kpictorial.spec:1.16 SPECS/kpictorial.spec:1.17
--- SPECS/kpictorial.spec:1.16	Thu Nov  9 21:39:45 2006
+++ SPECS/kpictorial.spec	Wed Dec 13 17:32:05 2006
@@ -16,8 +16,6 @@
 BuildRequires:	kdelibs-devel >= 3.0.3
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define         _htmldir        /usr/share/doc/kde/HTML
-
 %description
 Kpictorial is a little logical game.
 
@@ -42,9 +40,7 @@
 %setup -q
 
 %build
-kde_htmldir="%{_htmldir}"; export kde_htmldir
-kde_icondir="%{_pixmapsdir}"; export kde_icondir
-
+kde_htmldir="%{_kdedocdir}"; export kde_htmldir
 CXXFLAGS="%{rpmcflags} -fno-rtti -fno-exceptions"
 
 %configure \
@@ -55,12 +51,12 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_applnkdir}/Games/Board,%{_datadir}/apps/kpictorial}
+install -d $RPM_BUILD_ROOT{%{_desktopdir}/kde,%{_datadir}/apps/kpictorial}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-mv $RPM_BUILD_ROOT%{_applnkdir}/{Games,Games/Board}/kpictorial.desktop
+mv -f $RPM_BUILD_ROOT{%{_datadir}/applnk/Games,%{_desktopdir}/kde}/kpictorial.desktop
 
 tar zxvf %{SOURCE1} -C $RPM_BUILD_ROOT%{_datadir}/apps/kpictorial
 mv $RPM_BUILD_ROOT%{_datadir}/apps/kpictorial/{kpictorial-imglib,imglib}
@@ -73,11 +69,11 @@
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/*
-%{_applnkdir}/Games/Board/*
+%{_desktopdir}/kde/*.desktop
 %dir %{_datadir}/apps/kpictorial
 %{_datadir}/apps/kpictorial/icons
 %{_datadir}/apps/kpictorial/kpictorialui.rc
-%{_pixmapsdir}/*/*/*/*
+%{_iconsdir}/hicolor/*/*/*.png
 
 %files imglib
 %defattr(644,root,root,755)
@@ -89,6 +85,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.17  2006/12/13 16:32:05  darekr
+- use _kdedocdir, _desktopdir instead of _applnkdir
+
 Revision 1.16  2006/11/09 20:39:45  glen
 - strict internal deps
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kpictorial.spec?r1=1.16&r2=1.17&f=u