Reenable arch-full glibc-headers package for ELN (#1940686)
This commit is contained in:
parent
79751685db
commit
f6682c9bac
21
glibc.spec
21
glibc.spec
|
@ -75,14 +75,20 @@
|
||||||
# not biarch.
|
# not biarch.
|
||||||
%ifarch %{biarcharches}
|
%ifarch %{biarcharches}
|
||||||
%define need_headers_package 1
|
%define need_headers_package 1
|
||||||
|
%if 0%{?rhel} > 0
|
||||||
|
%define headers_package_name glibc-headers
|
||||||
|
%else
|
||||||
%ifarch %{ix86} x86_64
|
%ifarch %{ix86} x86_64
|
||||||
%define headers_package_name glibc-headers-x86
|
%define headers_package_name glibc-headers-x86
|
||||||
%endif
|
%endif
|
||||||
%ifarch s390 s390x
|
%ifarch s390 s390x
|
||||||
%define headers_package_name glibc-headers-s390
|
%define headers_package_name glibc-headers-s390
|
||||||
%endif
|
%endif
|
||||||
|
%dnl !rhel
|
||||||
|
%endif
|
||||||
%else
|
%else
|
||||||
%define need_headers_package 0
|
%define need_headers_package 0
|
||||||
|
%dnl !biarcharches
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
##############################################################################
|
##############################################################################
|
||||||
|
@ -91,7 +97,7 @@
|
||||||
Summary: The GNU libc libraries
|
Summary: The GNU libc libraries
|
||||||
Name: glibc
|
Name: glibc
|
||||||
Version: %{glibcversion}
|
Version: %{glibcversion}
|
||||||
Release: 7%{?dist}
|
Release: 8%{?dist}
|
||||||
|
|
||||||
# In general, GPLv2+ is used by programs, LGPLv2+ is used for
|
# In general, GPLv2+ is used by programs, LGPLv2+ is used for
|
||||||
# libraries.
|
# libraries.
|
||||||
|
@ -326,10 +332,12 @@ BuildRequires: kernel-headers >= 3.2
|
||||||
%if %{need_headers_package}
|
%if %{need_headers_package}
|
||||||
Requires: %{headers_package_name} = %{version}-%{release}
|
Requires: %{headers_package_name} = %{version}-%{release}
|
||||||
%endif
|
%endif
|
||||||
|
%if !(0%{?rhel} > 0 && %{need_headers_package})
|
||||||
# For backwards compatibility, when the glibc-headers package existed.
|
# For backwards compatibility, when the glibc-headers package existed.
|
||||||
Provides: glibc-headers = %{version}-%{release}
|
Provides: glibc-headers = %{version}-%{release}
|
||||||
Provides: glibc-headers(%{_target_cpu})
|
Provides: glibc-headers(%{_target_cpu})
|
||||||
Obsoletes: glibc-headers < %{version}-%{release}
|
Obsoletes: glibc-headers < %{version}-%{release}
|
||||||
|
%endif
|
||||||
|
|
||||||
%description devel
|
%description devel
|
||||||
The glibc-devel package contains the object files necessary
|
The glibc-devel package contains the object files necessary
|
||||||
|
@ -387,8 +395,14 @@ which is highly discouraged.
|
||||||
%if %{need_headers_package}
|
%if %{need_headers_package}
|
||||||
%package -n %{headers_package_name}
|
%package -n %{headers_package_name}
|
||||||
Summary: Additional internal header files for glibc-devel.
|
Summary: Additional internal header files for glibc-devel.
|
||||||
BuildArch: noarch
|
|
||||||
Requires: %{name} = %{version}-%{release}
|
Requires: %{name} = %{version}-%{release}
|
||||||
|
%if 0%{?rhel} > 0
|
||||||
|
Provides: %{name}-headers(%{_target_cpu})
|
||||||
|
Obsoletes: glibc-headers-x86 < %{version}-%{release}
|
||||||
|
Obsoletes: glibc-headers-s390 < %{version}-%{release}
|
||||||
|
%else
|
||||||
|
BuildArch: noarch
|
||||||
|
%endif
|
||||||
|
|
||||||
%description -n %{headers_package_name}
|
%description -n %{headers_package_name}
|
||||||
The %{headers_package_name} package contains the architecture-specific
|
The %{headers_package_name} package contains the architecture-specific
|
||||||
|
@ -2110,6 +2124,9 @@ fi
|
||||||
%files -f compat-libpthread-nonshared.filelist -n compat-libpthread-nonshared
|
%files -f compat-libpthread-nonshared.filelist -n compat-libpthread-nonshared
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri May 21 2021 Florian Weimer <fweimer@redhat.com> - 2.33.9000-8
|
||||||
|
- Switch back to a unified glibc-headers package for downstream (#1940686)
|
||||||
|
|
||||||
* Fri May 21 2021 Florian Weimer <fweimer@redhat.com> - 2.33.9000-7
|
* Fri May 21 2021 Florian Weimer <fweimer@redhat.com> - 2.33.9000-7
|
||||||
- aarch64: Enable optional memory tagging support
|
- aarch64: Enable optional memory tagging support
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue