diff options
| author | Pavel Raiskup <praiskup@redhat.com> | 2016-09-27 12:13:24 +0200 |
|---|---|---|
| committer | Pavel Raiskup <praiskup@redhat.com> | 2016-09-27 12:13:24 +0200 |
| commit | ad81b99dc98de605b366be8035ec74bdf78f0590 (patch) | |
| tree | d942cfe2c15163b7d7809c335a27397aea4dacad | |
| parent | c7fe890bfd148321fffb89505b0385735acdf2b9 (diff) | |
| download | scl-autotools-ad81b99dc98de605b366be8035ec74bdf78f0590.tar.gz scl-autotools-ad81b99dc98de605b366be8035ec74bdf78f0590.tar.xz scl-autotools-ad81b99dc98de605b366be8035ec74bdf78f0590.zip | |
meta: bump and depend on epel-rpm-macros
| -rw-r--r-- | repos/autotools/autotools-git/autotools-git/autotools-git.spec | 18 | ||||
| -rw-r--r-- | repos/autotools/autotools-latest/autotools-latest/autotools-latest.spec | 12 |
2 files changed, 10 insertions, 20 deletions
diff --git a/repos/autotools/autotools-git/autotools-git/autotools-git.spec b/repos/autotools/autotools-git/autotools-git/autotools-git.spec index 01110c8..f541efe 100644 --- a/repos/autotools/autotools-git/autotools-git/autotools-git.spec +++ b/repos/autotools/autotools-git/autotools-git/autotools-git.spec @@ -1,5 +1,3 @@ -%{?_compat_el5_build} - # Workaround to always have %%scl defined %{!?scl:%global scl autotools-git} @@ -8,7 +6,7 @@ Summary: Package that installs %scl Name: %scl_name Version: 1 -Release: 16%{?dist} +Release: 17%{?dist} License: GPLv2+ Group: Applications/File @@ -17,12 +15,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 @@ -67,10 +59,6 @@ EOF %install -%if 0%{?rhel} == 5 -rm -rf %{buildroot} -%endif - %if 0%{?rhel} >= 5 && 0%{?rhel} < 8 mkdir -p %{buildroot}/%{_scl_scripts}/root install -c -p -m 0644 enable %{buildroot}%{_scl_scripts}/enable @@ -99,6 +87,10 @@ rm -rf %{buildroot}/%{_root_sysconfdir}/rpm/macros.%{scl}-config %changelog +* Tue Sep 27 2016 Pavel Raiskup <praiskup@redhat.com> - 1-17 +- bump: rebuild september 2016 +- depend on epel-rpm-macros + * Wed Aug 12 2015 Pavel Raiskup <praiskup@redhat.com> - 1-16 - Requires field must be spearated by spaces and not commas diff --git a/repos/autotools/autotools-latest/autotools-latest/autotools-latest.spec b/repos/autotools/autotools-latest/autotools-latest/autotools-latest.spec index 135cc96..5d5bec7 100644 --- a/repos/autotools/autotools-latest/autotools-latest/autotools-latest.spec +++ b/repos/autotools/autotools-latest/autotools-latest/autotools-latest.spec @@ -1,5 +1,3 @@ -%{?_compat_el5_build} - # Workaround to always have %%scl defined %{!?scl:%global scl autotools-latest} @@ -8,7 +6,7 @@ Summary: Package that installs %scl Name: %scl_name Version: 1 -Release: 14%{?dist} +Release: 15%{?dist} License: GPLv2+ Group: Applications/File @@ -67,10 +65,6 @@ EOF %install -%if 0%{?rhel} == 5 -rm -rf %{buildroot} -%endif - %if 0%{?rhel} >= 5 && 0%{?rhel} < 8 mkdir -p %{buildroot}/%{_scl_scripts}/root install -c -p -m 0644 enable %{buildroot}%{_scl_scripts}/enable @@ -99,6 +93,10 @@ rm -rf %{buildroot}/%{_root_sysconfdir}/rpm/macros.%{scl}-config %changelog +* 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 + * Wed Aug 12 2015 Pavel Raiskup <praiskup@redhat.com> - 1-14 - Requires field must be spearated by spaces and not commas |