[gdesklet-SlideShow] Rebuild

[MERCIER Jonathan]

commit 10735c129e5b03e8a82d71bd9dbaa75090784019
Author: bioinfornatics <bioinfornatics at fedoraproject.org>
Date:   Fri May 10 19:46:38 2013 +0200

    Rebuild

 gdesklet-SlideShow.spec |   26 +++++++++++---------------
 1 files changed, 11 insertions(+), 15 deletions(-)
---
diff --git a/gdesklet-SlideShow.spec b/gdesklet-SlideShow.spec
index 55a26ba..ac981d3 100644
--- a/gdesklet-SlideShow.spec
+++ b/gdesklet-SlideShow.spec
@@ -8,7 +8,6 @@ URL:		http://www.gdesklets.de
 Source0:	http://www.gdesklets.de/files/desklets/SlideShow/SlideShow-%{version}.tar.gz
 Source1:	http://www.gdesklets.de/files/controls/ImageSlideShow/ImageSlideShow-0.8.tar.gz
 
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
 %define		_appname	SlideShow
@@ -31,29 +30,26 @@ Cycle through a collection of pictures. Will display image captions
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 #need to install the control first
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/gdesklets/Controls/%{_ctrlname}/
-install -p -m644 %{_ctrlname}/* $RPM_BUILD_ROOT/%{_datadir}/gdesklets/Controls/%{_ctrlname}/.
-rm $RPM_BUILD_ROOT/%{_datadir}/gdesklets/Controls/%{_ctrlname}/MANIFEST
-rm $RPM_BUILD_ROOT/%{_datadir}/gdesklets/Controls/%{_ctrlname}/README
+mkdir -p %{buildroot}/%{_datadir}/gdesklets/Controls/%{_ctrlname}/
+install -p -m644 %{_ctrlname}/* %{buildroot}/%{_datadir}/gdesklets/Controls/%{_ctrlname}/.
+rm %{buildroot}/%{_datadir}/gdesklets/Controls/%{_ctrlname}/MANIFEST
+rm %{buildroot}/%{_datadir}/gdesklets/Controls/%{_ctrlname}/README
 
 #add shebang and execution mode
-find $RPM_BUILD_ROOT/%{_datadir}/gdesklets/Controls/%{_ctrlname}/. \( -name "*.py" \) -exec sed -i '1i\#!/usr/bin/python' {} \;
-find $RPM_BUILD_ROOT/%{_datadir}/gdesklets/Controls/%{_ctrlname}/. \( -name "*.py" \) | xargs chmod a+x
+find %{buildroot}/%{_datadir}/gdesklets/Controls/%{_ctrlname}/. \( -name "*.py" \) -exec sed -i '1i\#!/usr/bin/python' {} \;
+find %{buildroot}/%{_datadir}/gdesklets/Controls/%{_ctrlname}/. \( -name "*.py" \) | xargs chmod a+x
 
 #install the display now
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/gdesklets/Displays/%{_appname}/
-cp -rp %{_appname}/* $RPM_BUILD_ROOT/%{_datadir}/gdesklets/Displays/%{_appname}/.
-rm $RPM_BUILD_ROOT/%{_datadir}/gdesklets/Displays/%{_appname}/LICENSE
-rm $RPM_BUILD_ROOT/%{_datadir}/gdesklets/Displays/%{_appname}/todo
+mkdir -p %{buildroot}/%{_datadir}/gdesklets/Displays/%{_appname}/
+cp -rp %{_appname}/* %{buildroot}/%{_datadir}/gdesklets/Displays/%{_appname}/.
+rm %{buildroot}/%{_datadir}/gdesklets/Displays/%{_appname}/LICENSE
+rm %{buildroot}/%{_datadir}/gdesklets/Displays/%{_appname}/todo
 
-%clean
-rm -rf $RPM_BUILD_ROOT
 
 
 %files
-%defattr(-,root,root,-)
 %doc %{_appname}/LICENSE %{_appname}/todo %{_ctrlname}/MANIFEST %{_ctrlname}/README
 %{_datadir}/gdesklets/Controls/ImageSlideShow/
 %{_datadir}/gdesklets/Displays/SlideShow/