[wastesedge] Use macros everywhere

Mathieu Bridon bochecha at fedoraproject.org
Fri Sep 21 06:45:03 UTC 2012


commit f80e9734020dbdf57f2d3f309dc5a69c1d097287
Author: Mathieu Bridon <bochecha at fedoraproject.org>
Date:   Fri Sep 21 11:26:05 2012 +0800

    Use macros everywhere

 wastesedge.spec |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/wastesedge.spec b/wastesedge.spec
index 04a9c12..d316832 100644
--- a/wastesedge.spec
+++ b/wastesedge.spec
@@ -55,16 +55,16 @@ make %{?_smp_mflags}
 
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+make install DESTDIR=%{buildroot} INSTALL="install -p"
 
 # install images in the correct folders
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/{16x16,32x32}/apps
-mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}_16x16.xpm $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/%{name}.xpm
-mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}_32x32.xpm $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.xpm
+mkdir -p %{buildroot}%{_datadir}/icons/hicolor/{16x16,32x32}/apps
+mv %{buildroot}%{_datadir}/pixmaps/%{name}_16x16.xpm %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/%{name}.xpm
+mv %{buildroot}%{_datadir}/pixmaps/%{name}_32x32.xpm %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.xpm
 
 # install desktop file not provided upstream
 desktop-file-install --vendor=""                      \
-        --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+        --dir=%{buildroot}%{_datadir}/applications \
         %{SOURCE1}
 
 %find_lang %{name}


More information about the scm-commits mailing list