From ae520a0725ad462bbd8f867be0455f0a8a25bcc6 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Sun, 9 Oct 2016 21:40:53 +0200 Subject: meta: don't depend on epel-rpm-config Related: rhbz#1379684 --- .../autotools-git/autotools-git/autotools-git.spec | 23 +++++++++++++++++++++- .../autotools-latest/autotools-latest.spec | 21 +++++++++++++++++++- 2 files changed, 42 insertions(+), 2 deletions(-) (limited to 'repos/autotools') diff --git a/repos/autotools/autotools-git/autotools-git/autotools-git.spec b/repos/autotools/autotools-git/autotools-git/autotools-git.spec index 415ed69..854ce80 100644 --- a/repos/autotools/autotools-git/autotools-git/autotools-git.spec +++ b/repos/autotools/autotools-git/autotools-git/autotools-git.spec @@ -8,8 +8,9 @@ Summary: Package that installs %scl Name: %scl_name Version: 1 -Release: 18%{?dist} +Release: 20%{?dist} License: GPLv2+ +Group: Applications/File Requires: %{?scl_prefix}m4 %{?scl_prefix}automake Requires: %{?scl_prefix}autoconf %{?scl_prefix}libtool @@ -25,12 +26,25 @@ to make it work instead of system-default autotools. %package runtime Summary: Package that handles %scl Software Collection. +Group: Applications/File Requires: scl-utils %description runtime Package shipping essential scripts to work with %scl Software Collection. +%package build +Summary: Package that handles %{scl} Software Collection. +Group: Applications/File +Requires: scl-utils-build +Requires: compat-rpm-config +Requires: scl-rpm-config + +%description build +Package shipping essential configuration macros to build %{scl} Software +Collection or packages depending on %{scl} Software Collection. + + %prep %setup -c -T @@ -78,6 +92,9 @@ rm -rf %{buildroot}/%{_root_sysconfdir}/rpm/macros.%{scl}-config %files +%files build + + %files runtime %scl_files %if 0%{?rhel} == 7 @@ -87,6 +104,10 @@ rm -rf %{buildroot}/%{_root_sysconfdir}/rpm/macros.%{scl}-config %changelog +* Sun Oct 09 2016 Pavel Raiskup - 1-20 +- don't depend on epel-rpm-macros, scl macros are not working with + epel-rpm-macros unfortunately, provide build package + * Thu Sep 29 2016 Pavel Raiskup - 1-18 - cleanup a bit more with epel-rpm-macros - BuildRoot is broken with epel-rpm-macros (rhbz#1379684) diff --git a/repos/autotools/autotools-latest/autotools-latest/autotools-latest.spec b/repos/autotools/autotools-latest/autotools-latest/autotools-latest.spec index d65118e..f8ab8c8 100644 --- a/repos/autotools/autotools-latest/autotools-latest/autotools-latest.spec +++ b/repos/autotools/autotools-latest/autotools-latest/autotools-latest.spec @@ -8,7 +8,7 @@ Summary: Package that installs %scl Name: %scl_name Version: 1 -Release: 16%{?dist} +Release: 18%{?dist} License: GPLv2+ Group: Applications/File @@ -33,6 +33,18 @@ Requires: scl-utils Package shipping essential scripts to work with %scl Software Collection. +%package build +Summary: Package that handles %{scl} Software Collection. +Group: Applications/File +Requires: scl-utils-build +Requires: compat-rpm-config +Requires: scl-rpm-config + +%description build +Package shipping essential configuration macros to build %{scl} Software +Collection or packages depending on %{scl} Software Collection. + + %prep %setup -c -T @@ -80,6 +92,9 @@ rm -rf %{buildroot}/%{_root_sysconfdir}/rpm/macros.%{scl}-config %files +%files build + + %files runtime %scl_files %if 0%{?rhel} == 7 @@ -89,6 +104,10 @@ rm -rf %{buildroot}/%{_root_sysconfdir}/rpm/macros.%{scl}-config %changelog +* Sun Oct 09 2016 Pavel Raiskup - 1-18 +- don't depend on epel-rpm-macros, scl macros are not working with + epel-rpm-macros unfortunately, provide build package + * Thu Sep 29 2016 Pavel Raiskup - 1-16 - BuildRoot is broken with epel-rpm-macros (rhbz#1379684) -- cgit