SPECS: mas.spec - use _desktopdir, _pixmapsdir macros - cosmetics

[darekr]

Author: darekr                       Date: Tue Aug 16 18:10:13 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use _desktopdir, _pixmapsdir macros
- cosmetics

---- Files affected:
SPECS:
   mas.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SPECS/mas.spec
diff -u SPECS/mas.spec:1.1 SPECS/mas.spec:1.2
--- SPECS/mas.spec:1.1	Tue Aug 16 15:41:57 2005
+++ SPECS/mas.spec	Tue Aug 16 20:10:08 2005
@@ -24,9 +24,9 @@
 Patch7:		%{name}-%{version}-logdir.patch.bz2
 Patch8:		%{name}-0.6.2-fftw.patch.bz2
 URL:		http://www.mediaapplicationserver.net/
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 BuildRequires:	gtk+2-devel
 BuildRequires:	pkgconfig
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 MAS (Media Application Server) is a multi-platform sound client/server
@@ -74,9 +74,17 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__make} DESTDIR=$RPM_BUILD_ROOT MANPATH=%{_manpath} LIBDIR=%{_libdir} USRLIBDIR=%{_libdir} install
-%{__make} DESTDIR=$RPM_BUILD_ROOT MANPATH=%{_manpath} install.man
-install -d $RPM_BUILD_ROOT/var/log/mas/
+install -d $RPM_BUILD_ROOT/var/log/mas
+
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT \
+	MANPATH=%{_manpath} \
+	LIBDIR=%{_libdir} \
+	USRLIBDIR=%{_libdir}
+
+%{__make} install.man \
+	DESTDIR=$RPM_BUILD_ROOT \
+	MANPATH=%{_manpath}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -93,9 +101,9 @@
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_libdir}/lib*.so.*
 %{_libdir}/mas
-%{_datadir}/applications/*.desktop
-%{_datadir}/pixmaps/*.png
-%dir /var/log/mas/
+%{_desktopdir}/*.desktop
+%{_pixmapsdir}/*.png
+%dir /var/log/mas
 
 %files devel
 %defattr(644,root,root,755)
@@ -109,6 +117,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2005/08/16 18:10:08  darekr
+- use _desktopdir, _pixmapsdir macros
+- cosmetics
+
 Revision 1.1  2005/08/16 13:41:57  paszczus
 - raw
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/mas.spec?r1=1.1&r2=1.2&f=u