SPECS: oooqs.spec - repaired %files, removed applnkdir

[siomek]

Author: siomek                       Date: Tue Jul 12 18:40:12 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- repaired %files, removed applnkdir

---- Files affected:
SPECS:
   oooqs.spec (1.17 -> 1.18) 

---- Diffs:

================================================================
Index: SPECS/oooqs.spec
diff -u SPECS/oooqs.spec:1.17 SPECS/oooqs.spec:1.18
--- SPECS/oooqs.spec:1.17	Mon Jul 11 19:55:23 2005
+++ SPECS/oooqs.spec	Tue Jul 12 20:40:07 2005
@@ -31,9 +31,6 @@
 %build
 CXXFLAGS="%{rpmcflags} -fno-exceptions -fno-rtti"
 export CXXFLAGS
-kde_appsdir="%{_applnkdir}"; export kde_appsdir
-kde_htmldir="%{_htmldir}"; export kde_htmldir
-kde_icondir="%{_pixmapsdir}"; export kde_icondir
 
 %configure
 
@@ -44,10 +41,13 @@
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
+	kde_htmldir=%{_kdedocdir}
 
 %find_lang oooqs --with-kde
 
-#mv -f $RPM_BUILD_ROOT%{_applnkdir}/Utilities $RPM_BUILD_ROOT%{_applnkdir}/Office
+install -d $RPM_BUILD_ROOT%{_desktopdir}/kde
+mv -f src/oooqs.desktop $RPM_BUILD_ROOT%{_desktopdir}/kde
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -56,8 +56,8 @@
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README TODO
 %attr(755,root,root) %{_bindir}/*
-%{_pixmapsdir}/[!l]*/*/*/*
-#%{_applnkdir}/Office/oooqs.desktop
+%{_iconsdir}/[!l]*/*/*/*
+%{_desktopdir}/kde/oooqs.desktop
 %{_datadir}/autostart/oooqs.desktop
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -66,6 +66,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.18  2005/07/12 18:40:07  siomek
+- repaired %files, removed applnkdir
+
 Revision 1.17  2005/07/11 17:55:23  siomek
 - fix applnkdir, buil, not work
 
================================================================

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