diff options
author | Pavel Raiskup <praiskup@redhat.com> | 2015-12-14 00:32:19 +0100 |
---|---|---|
committer | Pavel Raiskup <praiskup@redhat.com> | 2015-12-14 00:35:46 +0100 |
commit | eb2b0e370437ee4da0390613f99727b47fd81d00 (patch) | |
tree | 21fdab524de2119b150e470ee402f3c98b080fd3 | |
parent | 03154d706444de0575ef98af11d50b05cb6144fd (diff) | |
download | scl-autotools-eb2b0e370437ee4da0390613f99727b47fd81d00.tar.gz scl-autotools-eb2b0e370437ee4da0390613f99727b47fd81d00.tar.xz scl-autotools-eb2b0e370437ee4da0390613f99727b47fd81d00.zip |
libtool: filter libltdl.so provide out only if %{?scl}
-rw-r--r-- | repos/autotools/autotools-git/libtool/libtool.spec | 7 | ||||
-rw-r--r-- | repos/autotools/autotools-latest/libtool/libtool.spec | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/repos/autotools/autotools-git/libtool/libtool.spec b/repos/autotools/autotools-git/libtool/libtool.spec index deb3ed8..1af08cf 100644 --- a/repos/autotools/autotools-git/libtool/libtool.spec +++ b/repos/autotools/autotools-git/libtool/libtool.spec @@ -2,7 +2,7 @@ %{!?scl:%global scl autotools-git} %{?sclize_package} -%global __provides_exclude ^libltdl\\.so.*$ +%{?scl:%global __provides_exclude ^libltdl\\.so.*$} # Detect gcc version, (workaround) see the bug #429880 %global gcc_version %(gcc -dumpversion || echo "666") @@ -15,7 +15,7 @@ Summary: The GNU Portable Library Tool Name: %{?scl_prefix}libtool Version: %{upstream_vr}~git -Release: 5.%{git_hash}%{?dist} +Release: 6.%{git_hash}%{?dist} License: GPLv2+ and LGPLv2+ and GFDL URL: http://www.gnu.org/software/libtool/ Group: Development/Tools @@ -187,6 +187,9 @@ fi %{_libdir}/libltdl.so %changelog +* Mon Dec 14 2015 Pavel Raiskup <praiskup@redhat.com> - 2.4.6.22~git-6.a5c64 +- filter provides only if %%scl is defined + * Mon Dec 14 2015 Pavel Raiskup <praiskup@redhat.com> - 2.4.6.22~git-5.a5c64 - do not provide libltdl.so, that breaks initial buildroot diff --git a/repos/autotools/autotools-latest/libtool/libtool.spec b/repos/autotools/autotools-latest/libtool/libtool.spec index 50ce687..83d37f8 100644 --- a/repos/autotools/autotools-latest/libtool/libtool.spec +++ b/repos/autotools/autotools-latest/libtool/libtool.spec @@ -2,7 +2,7 @@ %{!?scl:%global scl autotools-latest} %{?sclize_package} -%global __provides_exclude ^libltdl\\.so.*$ +%{?scl:%global __provides_exclude ^libltdl\\.so.*$} %global gcc_version %(gcc -dumpversion || echo "666") @@ -11,7 +11,7 @@ Summary: The GNU Portable Library Tool Name: %{?scl_prefix}libtool Version: 2.4.2 -Release: 14%{?dist} +Release: 15%{?dist} License: GPLv2+ and LGPLv2+ and GFDL URL: http://www.gnu.org/software/libtool/ Group: Development/Tools @@ -206,6 +206,9 @@ fi %{_libdir}/libltdl.so %changelog +* Mon Dec 14 2015 Pavel Raiskup <praiskup@redhat.com> - 2.4.2-15 +- filter provides only if %%scl is defined + * Mon Dec 14 2015 Pavel Raiskup <praiskup@redhat.com> - 2.4.2-14 - do not provide libltdl.so, that breaks initial buildroot |