SPECS: xqmixer.spec - kill obsolete kde_ redefinitions - use _desk...

[darekr]

Author: darekr                       Date: Sun Sep  4 10:06:15 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- kill obsolete kde_ redefinitions
- use _desktopdir, _iconsdir macros
- 1.129 macros for _kdedocdir

---- Files affected:
SPECS:
   xqmixer.spec (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: SPECS/xqmixer.spec
diff -u SPECS/xqmixer.spec:1.6 SPECS/xqmixer.spec:1.7
--- SPECS/xqmixer.spec:1.6	Mon Aug 18 10:09:41 2003
+++ SPECS/xqmixer.spec	Sun Sep  4 12:06:10 2005
@@ -12,10 +12,9 @@
 URL:		http://www.webeifer.de/alwin/programs/xqmixer/
 BuildRequires:	kdelibs-devel >= 3.0
 BuildRequires:	qt-devel >= 3.0
+BuildRequires:	rpmbuild(macros) >= 1.129
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_htmldir	/usr/share/doc/kde/HTML
-
 %description
 XqMixer is a soundmixer, which supports USS/OSS. This version is build
 for the KDE. It can save and restore various settings of mixer and has
@@ -32,19 +31,20 @@
 %patch -p1
 
 %build
-kde_appsdir="%{_applnkdir}"; export kde_appsdir
-kde_htmldir="%{_htmldir}"; export kde_htmldir
-kde_icondir="%{_pixmapsdir}"; export kde_icondir
+kde_htmldir="%{_kdedocdir}"; export kde_htmldir
 %configure
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_desktopdir}/kde
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+mv -f $RPM_BUILD_ROOT%{_datadir}/applnk/Multimedia/xqmixer.desktop $RPM_BUILD_ROOT%{_desktopdir}/kde
+
 %find_lang %{name} --with-kde
 
 %clean
@@ -53,8 +53,8 @@
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/xqmixer
-%{_pixmapsdir}/*/*/apps/*.png
-%{_applnkdir}/Multimedia/*.desktop
+%{_iconsdir}/hicolor/*/apps/*.png
+%{_desktopdir}/kde/*.desktop
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -62,6 +62,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2005/09/04 10:06:10  darekr
+- kill obsolete kde_ redefinitions
+- use _desktopdir, _iconsdir macros
+- 1.129 macros for _kdedocdir
+
 Revision 1.6  2003/08/18 08:09:41  gotar
 - mass commit: cosmetics (removed trailing white spaces)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/xqmixer.spec?r1=1.6&r2=1.7&f=u