[gpsbabel] Avoid %{__cmd} command macros, do "make install" for gui

Hans Ulrich Niedermann ndim at fedoraproject.org
Tue Jan 11 19:25:50 UTC 2011


commit db29f8b2de435a229c45f7b971100ae74297e7c3
Author: Hans Ulrich Niedermann <hun at n-dimensional.de>
Date:   Tue Jan 11 20:23:20 2011 +0100

    Avoid %{__cmd} command macros, do "make install" for gui
    
    Not that the "make install" would do anything for the GUI.

 gpsbabel.spec |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/gpsbabel.spec b/gpsbabel.spec
index 2a7b02b..0b603e4 100644
--- a/gpsbabel.spec
+++ b/gpsbabel.spec
@@ -74,19 +74,22 @@ make %{?_smp_mflags}
 popd
 
 %install
-%{__rm} -rf %{buildroot}
-%{__mkdir} -p %{buildroot}%{_bindir}
-%{__install} -m 755 -p gpsbabel gui/objects/gpsbabelfe-bin %{buildroot}%{_bindir}/
+rm -rf %{buildroot}
+make DESTDIR=%{buildroot} install
+make -C gui DESTDIR=%{buildroot} install
+
+install -m 0755 -d                            %{buildroot}%{_bindir}/
+install -m 0755 -p gui/objects/gpsbabelfe-bin %{buildroot}%{_bindir}/
 
 desktop-file-install \
         --dir %{buildroot}/%{_datadir}/applications \
         %{SOURCE1}
 
-install -m 755 -d %{buildroot}%{_datadir}/icons/hicolor/256x256/apps/
-install -m 644 -p %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/256x256/apps/
+install -m 0755 -d            %{buildroot}%{_datadir}/icons/hicolor/256x256/apps/
+install -m 0644 -p %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/256x256/apps/
 
 %clean
-%{__rm} -rf %{buildroot}
+rm -rf %{buildroot}
 
 %post gui
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :


More information about the scm-commits mailing list