summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Raiskup <praiskup@redhat.com>2016-09-29 10:40:35 +0200
committerPavel Raiskup <praiskup@redhat.com>2016-09-29 10:40:35 +0200
commit8fe251b155c2bc4a2827eb0e0e5e51bc6315d428 (patch)
tree7fe63901f6fd67115913f70fd8a27ab6cb7350ca
parentfac480ee69548f57229ac96e8f8884b945cb8068 (diff)
downloadscl-autotools-8fe251b155c2bc4a2827eb0e0e5e51bc6315d428.tar.gz
scl-autotools-8fe251b155c2bc4a2827eb0e0e5e51bc6315d428.tar.xz
scl-autotools-8fe251b155c2bc4a2827eb0e0e5e51bc6315d428.zip
autotools-latest: fix BuildRoot
-rw-r--r--repos/autotools/autotools-latest/autotools-latest/autotools-latest.spec13
1 files changed, 6 insertions, 7 deletions
diff --git a/repos/autotools/autotools-latest/autotools-latest/autotools-latest.spec b/repos/autotools/autotools-latest/autotools-latest/autotools-latest.spec
index 5d5bec7..d65118e 100644
--- a/repos/autotools/autotools-latest/autotools-latest/autotools-latest.spec
+++ b/repos/autotools/autotools-latest/autotools-latest/autotools-latest.spec
@@ -1,3 +1,5 @@
+%{?_compat_el5_build}
+
# Workaround to always have %%scl defined
%{!?scl:%global scl autotools-latest}
@@ -6,7 +8,7 @@
Summary: Package that installs %scl
Name: %scl_name
Version: 1
-Release: 15%{?dist}
+Release: 16%{?dist}
License: GPLv2+
Group: Applications/File
@@ -15,12 +17,6 @@ Requires: %{?scl_prefix}autoconf %{?scl_prefix}libtool
%{?scl:BuildRequires: scl-utils-build}
%{?scl:BuildRequires: iso-codes}
-%if ! 0%{?buildroot:1}
-# HACK! This should be truth only for RHEL5, so benefit from
-# this %%if for defining (otherwise undefined) macro for this platform.
-%global rhel 5
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%endif
%description
This is the main package for %scl Software Collection. It contains the latest
@@ -93,6 +89,9 @@ rm -rf %{buildroot}/%{_root_sysconfdir}/rpm/macros.%{scl}-config
%changelog
+* Thu Sep 29 2016 Pavel Raiskup <praiskup@redhat.com> - 1-16
+- BuildRoot is broken with epel-rpm-macros (rhbz#1379684)
+
* Tue Sep 27 2016 Pavel Raiskup <praiskup@redhat.com> - 1-15
- bump: rebuild september 2016
- remove some compat stuff now implemented in epel-rpm-macros