libtool-git: allow building without scls

2 files changed, 24 insertions, 9 deletions

diff --git a/repos/autotools/autotools-git/autotools-git/autotools-git.spec b/repos/autotools/autotools-git/autotools-git/autotools-git.spec
index 854ce80..3d4aaf6 100644
--- a/repos/autotools/autotools-git/autotools-git/autotools-git.spec
+++ b/repos/autotools/autotools-git/autotools-git/autotools-git.spec
@@ -8,7 +8,7 @@
 Summary: Package that installs %scl
 Name: %scl_name
 Version: 1
-Release: 20%{?dist}
+Release: 22%{?dist}
 License: GPLv2+
 Group: Applications/File
 
@@ -85,14 +85,20 @@ install -c -p -m 0644 %{scl} %{buildroot}%{_scl_scripts}
 
 %scl_install
 
-cat %{buildroot}/%{_root_sysconfdir}/rpm/macros.%{scl}-config
-rm -rf %{buildroot}/%{_root_sysconfdir}/rpm/macros.%{scl}-config
-
+# Drop %%scl definition, because we build various collection within single
+# buildroot in copr where we can not (yet) have different minimal build-root
+# package-set on per-package basis.
+for file in %{buildroot}/%{_root_sysconfdir}/rpm/macros.%{scl}-config
+do
+    sed -i "s/%%scl.*/%%autotools_scl_build enabled/" "$file"
+    cat "$file"
+done
 
 %files
 
 
 %files build
+%{_root_sysconfdir}/rpm/macros.%{scl}-config
 
 
 %files runtime
@@ -104,6 +110,12 @@ rm -rf %{buildroot}/%{_root_sysconfdir}/rpm/macros.%{scl}-config
 
 
 %changelog
+* Tue Jan 03 2017 Pavel Raiskup <praiskup@redhat.com> - 1-22
+- install macro file in 'build' subpackage, but without %%scl defined
+
+* Fri Dec 30 2016 Pavel Raiskup <praiskup@redhat.com> - 1-21
+- Fedora 26 added to copr
+
 * Sun Oct 09 2016 Pavel Raiskup <praiskup@redhat.com> - 1-20
 - don't depend on epel-rpm-macros, scl macros are not working with
   epel-rpm-macros unfortunately, provide build package
diff --git a/repos/autotools/autotools-git/libtool/libtool.spec b/repos/autotools/autotools-git/libtool/libtool.spec
index b29c53a..f2e8adc 100644
--- a/repos/autotools/autotools-git/libtool/libtool.spec
+++ b/repos/autotools/autotools-git/libtool/libtool.spec
@@ -1,5 +1,5 @@
 %{?_compat_el5_build}
-%{!?scl:%global scl autotools-git}
+%{!?scl:%{?autotools_scl_build:%global scl autotools-git}}
 %{?sclize_package}
 
 %{?scl:%global __provides_exclude ^libltdl\\.so.*$}
@@ -15,7 +15,7 @@
 Summary: The GNU Portable Library Tool
 Name:    %{?scl_prefix}libtool
 Version: %{upstream_vr}~git
-Release: 3.%{git_hash}%{?dist}
+Release: 4.%{git_hash}%{?dist}
 License: GPLv2+ and LGPLv2+ and GFDL
 URL:     http://www.gnu.org/software/libtool/
 Group:   Development/Tools
@@ -25,7 +25,7 @@ Source:  libtool-%{upstream_vr}-%{git_hash}.tar.gz
 # /usr/bin/libtool includes paths within gcc's versioned directories
 # Libtool must be rebuilt whenever a new upstream gcc is built
 Requires: gcc = %{gcc_version}
-Requires: %{scl_prefix}autoconf, %{scl_prefix}automake, sed, tar, findutils
+Requires: %{?scl_prefix}autoconf, %{?scl_prefix}automake, sed, tar, findutils
 Requires(post):  /sbin/install-info
 Requires(preun): /sbin/install-info
 
@@ -38,7 +38,7 @@ Requires:           %{?scl_prefix}m4
 BuildRequires: texinfo
 
 %{?scl:
-BuildRequires: scl-utils-build %{scl_prefix}runtime
+BuildRequires: scl-utils-build %{?scl_prefix}runtime
 Requires:%scl_runtime
 }
 
@@ -136,7 +136,7 @@ make %{?_smp_mflags}
 
 %install
 %{?scl_heredoc}
-%_compat_install
+%{?_compat_install}
 make install DESTDIR=%{buildroot}
 
 # info's TOP dir (by default owned by info)
@@ -187,6 +187,9 @@ fi
 %{_libdir}/libltdl.so
 
 %changelog
+* Tue Jan 03 2017 Pavel Raiskup <praiskup@redhat.com> - 2.4.6.34~git-4.08c5
+- fixes that allows us to build outside from scls
+
 * Mon Oct 10 2016 Pavel Raiskup <praiskup@redhat.com> - 2.4.6.34~git-3.08c5
 - bump: rebuild october 2016