From 987486e06ad63b6509149efee0f0728bd7f40308 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Sep 22 2014 08:36:37 +0000 Subject: import redhat-lsb-4.1-27.el7 --- diff --git a/SOURCES/redhat-lsb-aarch64.patch b/SOURCES/redhat-lsb-aarch64.patch index 35e8bb3..4f229dd 100644 --- a/SOURCES/redhat-lsb-aarch64.patch +++ b/SOURCES/redhat-lsb-aarch64.patch @@ -120,3 +120,12 @@ index 76db260..f76e5a5 100644 p = NULL; } INTERNAL_SYSCALL (exit, err, 1, 0); +@@ -582,7 +682,7 @@ int __libc_start_main (int argc, char **argv, char **ev, + void *auxvec, void (*rtld_fini) (void), + struct startup_info *stinfo, + char **stack_on_entry) +-#elif defined __arm__ ++#elif defined __arm__ || defined __aarch64__ + + int ___libc_start_main (int (*main) (int argc, char **argv), + int argc, char **argv, diff --git a/SPECS/redhat-lsb.spec b/SPECS/redhat-lsb.spec index eef9130..058cf31 100644 --- a/SPECS/redhat-lsb.spec +++ b/SPECS/redhat-lsb.spec @@ -21,6 +21,11 @@ %define lsbldso ld-lsb-ppc64.so %endif +%ifarch ppc64le +%define ldso ld64.so.2 +%define lsbldso ld-lsb-ppc64le.so +%endif + %ifarch s390 %define ldso ld.so.1 %define lsbldso ld-lsb-s390.so @@ -53,7 +58,7 @@ Summary: Implementation of Linux Standard Base specification Name: redhat-lsb Version: 4.1 -Release: 24%{?dist} +Release: 27%{?dist} URL: http://www.linuxfoundation.org/collaborate/workgroups/lsb Source0: https://fedorahosted.org/releases/r/e/redhat-lsb/%{name}-%{version}-%{srcrelease}.tar.bz2 Patch0: lsb-release-3.1-update-init-functions.patch @@ -77,6 +82,9 @@ BuildRequires: glibc-static %ifarch ppc64 %define archname ppc64 %endif +%ifarch ppc64le +%define archname ppc64le +%endif %ifarch s390 %define archname s390 %endif @@ -93,7 +101,7 @@ BuildRequires: glibc-static %define archname aarch64 %endif -ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x %{arm} aarch64 +ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x %{arm} aarch64 ppc64le Requires: redhat-lsb-core%{?_isa} = %{version}-%{release} Requires: redhat-lsb-cxx%{?_isa} = %{version}-%{release} @@ -290,6 +298,7 @@ Requires: /usr/sbin/groupmod Requires: /usr/sbin/useradd Requires: /usr/sbin/userdel Requires: /usr/sbin/usermod +Requires: /usr/sbin/sendmail Requires: redhat-lsb-submod-security%{?_isa} = %{version}-%{release} Provides: lsb-core-%{archname} = %{version}-%{release} @@ -343,7 +352,7 @@ Requires: libjpeg-turbo%{?_isa} %ifarch %{ix86} ppc s390 arm Requires: libpng12.so.0 %endif -%ifarch x86_64 ppc64 s390x aarch64 +%ifarch x86_64 ppc64 s390x aarch64 ppc64le Requires: libpng12.so.0()(64bit) %endif Requires: libpng%{?_isa} @@ -757,6 +766,16 @@ os.remove("%{_datadir}/lsb") %changelog +* Wed Sep 03 2014 Ondrej Vasik - 4.1-27 +- Require /usr/sbin/sendmail in core (required by LSB 4.1, + #1135991) + +* Tue Aug 05 2014 Ondrej Vasik - 4.1-26 +- add ppc64le to the list of architectures (#1125666) + +* Tue Jul 15 2014 Ondrej Vasik - 4.1-25 +- Fix __libc_start_main prototype for aarch64 (#1115710) + * Fri Jan 24 2014 Daniel Mach - 4.1-24 - Mass rebuild 2014-01-24