[skychart] - Using d-f-validate instead od d-f-install (Fixes bz #662472) - Changed RPM_BUILD_ROOT macro to low

Sergio Pascual sergiopr at fedoraproject.org
Thu Jan 13 11:59:24 UTC 2011


commit 04885c32dd883f3551c21d6777f9a15f4157b17b
Author: Sergio Pascual <sergiopr at fis.ucm.es>
Date:   Thu Jan 13 12:58:52 2011 +0100

    - Using d-f-validate instead od d-f-install (Fixes bz #662472)
    - Changed RPM_BUILD_ROOT macro to lower case form

 skychart.spec |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)
---
diff --git a/skychart.spec b/skychart.spec
index bffc176..f67bfd3 100644
--- a/skychart.spec
+++ b/skychart.spec
@@ -1,6 +1,6 @@
 Name:           skychart
 Version:        3.0.1.6
-Release:        3.20100724svn%{?dist}
+Release:        4.20100724svn%{?dist}
 Summary:        Planetarium software for the advanced amateur astronomer
 
 # svn export -r1351 https://svn.origo.ethz.ch/skychart/trunk@1351 skychart-3.0.1.6
@@ -63,24 +63,22 @@ dos2unix -qk tools/doc/releasenotes*.txt
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make install install_data PREFIX=$RPM_BUILD_ROOT%{_prefix}
+make install install_data PREFIX=%{buildroot}%{_prefix}
 
 # Fix multilib path
-[ %{_lib} = lib ] || mv $RPM_BUILD_ROOT%{_prefix}/{lib,%{_lib}}
+[ %{_lib} = lib ] || mv %{buildroot}%{_prefix}/{lib,%{_lib}}
 
 # Fix debuginfo
-chmod +x $RPM_BUILD_ROOT%{_libdir}/*
+chmod +x %{buildroot}%{_libdir}/*
 
 # Menu entry
-desktop-file-install --vendor=fedora \
-        --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-        $RPM_BUILD_ROOT%{_datadir}/applications/skychart.desktop
+desktop-file-validate %{buildroot}%{_datadir}/applications/skychart.desktop
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %files
@@ -104,6 +102,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Jan 13 2011 Sergio Pascual <sergiopr at fedoraproject.org> - 3.0.1.6-4.20100724svn
+- Using d-f-validate instead od d-f-install (Fixes bz #662472)
+- Changed RPM_BUILD_ROOT macro to lower case form
+
 * Sat Jul 24 2010 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 3.0.1.6-3.20100724svn
 - Update to a later snapshot
 


More information about the scm-commits mailing list