[polipo] use $RPM_BUILD_ROOT rather than %{_buildroot}

Bernard Johnson bjohnson at fedoraproject.org
Tue Sep 27 03:05:24 UTC 2011


commit 358bbd09d2a4d7c0f2c357d823c41ee982edfd66
Author: Bernard Johnson <bjohnson at symetrix.com>
Date:   Mon Sep 26 21:04:55 2011 -0600

    use $RPM_BUILD_ROOT rather than %{_buildroot}

 polipo.spec |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/polipo.spec b/polipo.spec
index 56047bb..fa4e759 100644
--- a/polipo.spec
+++ b/polipo.spec
@@ -45,21 +45,21 @@ server.
 make %{?_smp_mflags} PREFIX=%{_prefix} BINDIR=%{_bindir} CDEBUGFLAGS="%{optflags}"
 
 %install
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 make install PREFIX=%{_prefix} BINDIR=%{_bindir} MANDIR=%{_mandir} \
-    INFODIR=%{_infodir} TARGET=%{buildroot}
-install -m 0755 -d %{buildroot}%{_sysconfdir}/%{name}
-install -m 0750 -d %{buildroot}%{_localstatedir}/cache/%{name}
-install -D -p -m 0755 %{SOURCE1} %{buildroot}%{_initddir}/%{name}
-install -D -p -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/%{name}/config
-install -D -p -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/%{name}/forbidden
-install -D -p -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
-install -D -p -m 0755 %{SOURCE5} %{buildroot}%{_sysconfdir}/NetworkManager/dispatcher.d/25-%{name}
+    INFODIR=%{_infodir} TARGET=$RPM_BUILD_ROOT
+install -m 0755 -d $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}
+install -m 0750 -d $RPM_BUILD_ROOT/%{_localstatedir}/cache/%{name}
+install -D -p -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/%{_initddir}/%{name}
+install -D -p -m 0644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/config
+install -D -p -m 0644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/forbidden
+install -D -p -m 0644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/%{name}
+install -D -p -m 0755 %{SOURCE5} $RPM_BUILD_ROOT/%{_sysconfdir}/NetworkManager/dispatcher.d/25-%{name}
 install -D -p -m 0644 %{SOURCE6} $RPM_BUILD_ROOT/%{_sysconfdir}
-rm -f %{buildroot}%{_infodir}/dir
+rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 %pre
 getent group %{name} >/dev/null || groupadd -r %{name}


More information about the scm-commits mailing list