[mate-desktop/f18] clean up spec file

[Dan Mashal]

commit da0be733aea5140735592aa663366f337c8a8e39
Author: dmashal <dan.mashal at fedoraproject.org>
Date:   Tue Sep 25 02:03:50 2012 -0700

    clean up spec file

 mate-desktop.spec |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/mate-desktop.spec b/mate-desktop.spec
index 8871197..6633fe2 100644
--- a/mate-desktop.spec
+++ b/mate-desktop.spec
@@ -66,7 +66,7 @@ NOCONFIGURE=1 ./autogen.sh
 make %{?_smp_mflags} V=1
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+make install DESTDIR=%{buildroot}
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 # stuff we don't want
@@ -78,16 +78,15 @@ mv -f $RPM_BUILD_ROOT%{_datadir}/omf/{fdl,gpl,lgpl} $RPM_BUILD_ROOT%{_datadir}/o
 
 %find_lang %{name} --all-name
 
-desktop-file-install \
-  --remove-category="MATE" \
-  --add-category="X-Mate" \
-  --delete-original \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  $RPM_BUILD_ROOT%{_datadir}/applications/mate-about.desktop
+desktop-file-install							\
+  --remove-category="MATE"						\
+  --add-category="X-Mate"						\
+  --delete-original							\
+  --dir=%{buildroot}%{_datadir}/applications				\
+%{buildroot}%{_datadir}/applications/mate-about.desktop
 
 
 %files -f %{name}.lang
->>>>>>> master
 %doc AUTHORS COPYING COPYING.LIB NEWS README
 %{_datadir}/applications/mate-about.desktop
 %doc %{_mandir}/man1/mate-about.1*