Compare commits

..

3 Commits
master ... f20

Author SHA1 Message Date
Parag Nemade 838b841b98 Resolves:rh#1133536 - redhat-lsb does not requires /usr/sbin/sendmail 2014-09-01 18:52:33 +05:30
Ondřej Vašík 23beb3faf8 Release++ 2013-11-25 18:57:19 +01:00
Ondřej Vašík 60d8a63357 remove nsswitch handling - broken and unnecessary (#986728, #915147) 2013-11-25 18:55:36 +01:00
2 changed files with 117 additions and 195 deletions

View File

@ -120,12 +120,3 @@ index 76db260..f76e5a5 100644
p = NULL;
}
INTERNAL_SYSCALL (exit, err, 1, 0);
@@ -682,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,

View File

@ -1,68 +1,59 @@
# Define this to link to which library version eg. /lib64/ld-lsb-x86-64.so.3
%global lsbsover 3
%define lsbsover 3
%ifarch %{ix86}
%global ldso ld-linux.so.2
%global lsbldso ld-lsb.so
%define ldso ld-linux.so.2
%define lsbldso ld-lsb.so
%endif
%ifarch ia64
%global ldso ld-linux-ia64.so.2
%global lsbldso ld-lsb-ia64.so
%define ldso ld-linux-ia64.so.2
%define lsbldso ld-lsb-ia64.so
%endif
%ifarch ppc
%global ldso ld.so.1
%global lsbldso ld-lsb-ppc32.so
%define ldso ld.so.1
%define lsbldso ld-lsb-ppc32.so
%endif
%ifarch ppc64
%global ldso ld64.so.1
%global lsbldso ld-lsb-ppc64.so
%endif
%ifarch ppc64le
%global ldso ld64.so.2
%global lsbldso ld-lsb-ppc64le.so
%define ldso ld64.so.1
%define lsbldso ld-lsb-ppc64.so
%endif
%ifarch s390
%global ldso ld.so.1
%global lsbldso ld-lsb-s390.so
%define ldso ld.so.1
%define lsbldso ld-lsb-s390.so
%endif
%ifarch s390x
%global ldso ld64.so.1
%global lsbldso ld-lsb-s390x.so
%define ldso ld64.so.1
%define lsbldso ld-lsb-s390x.so
%endif
%ifarch x86_64
%global ldso ld-linux-x86-64.so.2
%global lsbldso ld-lsb-x86-64.so
%define ldso ld-linux-x86-64.so.2
%define lsbldso ld-lsb-x86-64.so
%endif
%ifarch %{arm}
%global ldso ld-linux.so.2
%global lsbldso ld-lsb-arm.so
%define ldso ld-linux.so.2
%define lsbldso ld-lsb-arm.so
%endif
%ifarch aarch64
%global ldso ld-linux-aarch64.so.1
%global lsbldso ld-lsb-aarch64.so
%define ldso ld-linux-aarch64.so.1
%define lsbldso ld-lsb-aarch64.so
%endif
%global upstreamlsbrelver 2.0
%global lsbrelver 4.1
%global srcrelease 1
# for >= f28, __brp_ldconfig is added in __os_install_post, it removes the symlink %%{lsbldso}
# and thus leading to the FTBS.
%global __brp_ldconfig %{nil}
%define upstreamlsbrelver 2.0
%define lsbrelver 4.1
%define srcrelease 1
Summary: Implementation of Linux Standard Base specification
Name: redhat-lsb
Version: 4.1
Release: 44%{?dist}
Release: 21.1%{?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
@ -71,50 +62,45 @@ Patch2: redhat-lsb-trigger.patch
Patch3: redhat-lsb-arm.patch
Patch4: redhat-lsb-aarch64.patch
License: GPLv2
Group: System Environment/Base
BuildRequires: glibc-static
BuildRequires: perl-generators
BuildRequires: perl(Getopt::Long)
BuildRequires: gcc
%ifarch %{ix86}
%global archname ia32
%define archname ia32
%endif
%ifarch ia64
%global archname ia64
%define archname ia64
%endif
%ifarch ppc
%global archname ppc32
%define archname ppc32
%endif
%ifarch ppc64
%global archname ppc64
%endif
%ifarch ppc64le
%global archname ppc64le
%define archname ppc64
%endif
%ifarch s390
%global archname s390
%define archname s390
%endif
%ifarch s390x
%global archname s390x
%define archname s390x
%endif
%ifarch x86_64
%global archname amd64
%define archname amd64
%endif
%ifarch %{arm}
%global archname arm
%define archname arm
%endif
%ifarch aarch64
%global archname aarch64
%define archname aarch64
%endif
ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x %{arm} aarch64 ppc64le
ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x %{arm} aarch64
Requires: redhat-lsb-core%{?_isa} = %{version}-%{release}
Requires: redhat-lsb-cxx%{?_isa} = %{version}-%{release}
Requires: redhat-lsb-desktop%{?_isa} = %{version}-%{release}
Requires: redhat-lsb-languages = %{version}-%{release}
Requires: redhat-lsb-printing = %{version}-%{release}
#Requires: redhat-lsb-trialuse = %%{version}-%%{release}
#Requires: redhat-lsb-trialuse = %{version}-%{release}
Provides: lsb = %{version}-%{release}
Provides: lsb-%{archname} = %{version}-%{release}
@ -130,6 +116,7 @@ Applications. It also contains requirements that will ensure that all
components required by the LSB are installed on the system.
%package submod-security
Group: System Environment/Base
Summary: LSB Security submodule support
Requires: nspr%{?_isa}
# Requires: nspr-devel
@ -143,6 +130,7 @@ The Linux Standard Base (LSB) Security submodule specifications define
components that are required to be present on an LSB conforming system.
%package submod-multimedia
Group: System Environment/Base
Summary: LSB Multimedia submodule support
Requires: alsa-lib%{?_isa}
@ -154,101 +142,117 @@ The Linux Standard Base (LSB) Multimedia submodule specifications define
components that are required to be present on an LSB conforming system.
%package core
Group: System Environment/Base
Summary: LSB Core module support
# gLSB Library
Requires: glibc%{?_isa}
Requires: glibc-common
Requires: libgcc%{?_isa}
#LSB requires libncurses.so.5 for some reason
Requires: ncurses-compat-libs%{?_isa}
Requires: ncurses-libs%{?_isa}
Requires: pam%{?_isa}
Requires: zlib%{?_isa}
# gLSB Command and Utilities
Requires: /bin/basename
Requires: /bin/cat
Requires: /bin/chgrp
Requires: /bin/chmod
Requires: /bin/chown
Requires: /bin/cp
Requires: /bin/date
Requires: /bin/dd
Requires: /bin/df
Requires: /bin/dmesg
Requires: /bin/echo
Requires: /bin/ed
Requires: /bin/egrep
Requires: /bin/false
Requires: /bin/fgrep
Requires: /bin/find
Requires: /bin/grep
Requires: /bin/gunzip
Requires: /bin/gzip
Requires: /bin/hostname
Requires: /bin/kill
Requires: /bin/ln
Requires: /bin/ls
Requires: /bin/mailx
Requires: /bin/mkdir
Requires: /bin/mknod
Requires: /bin/mktemp
Requires: /bin/more
Requires: /bin/mount
Requires: /bin/mv
Requires: /bin/nice
Requires: /bin/ps
Requires: /bin/pwd
Requires: /bin/rm
Requires: /bin/rmdir
Requires: /bin/sed
Requires: /bin/sh
Requires: /bin/sleep
Requires: /bin/sort
Requires: /bin/stty
Requires: /bin/sync
Requires: /bin/tar
Requires: /bin/touch
Requires: /bin/true
Requires: /bin/umount
Requires: /bin/uname
Requires: /bin/zcat
Requires: /sbin/fuser
Requires: /sbin/pidof
Requires: /sbin/shutdown
Requires: /usr/bin/[
Requires: /usr/bin/ar
Requires: /usr/bin/at
Requires: /usr/bin/awk
Requires: /usr/bin/basename
Requires: /usr/bin/batch
Requires: /usr/bin/bc
Requires: /usr/bin/cat
Requires: /usr/bin/chfn
Requires: /usr/bin/chgrp
Requires: /usr/bin/chmod
Requires: /usr/bin/chown
Requires: /usr/bin/chsh
Requires: /usr/bin/cksum
Requires: /usr/bin/cmp
Requires: /usr/bin/col
Requires: /usr/bin/comm
Requires: /usr/bin/cp
Requires: /usr/bin/cpio
Requires: /usr/bin/crontab
Requires: /usr/bin/csplit
Requires: /usr/bin/cut
Requires: /usr/bin/date
Requires: /usr/bin/dd
Requires: /usr/bin/df
Requires: /usr/bin/diff
Requires: /usr/bin/dirname
Requires: /usr/bin/dmesg
Requires: /usr/bin/du
Requires: /usr/bin/echo
Requires: /usr/bin/ed
Requires: /usr/bin/egrep
Requires: /usr/bin/env
Requires: /usr/bin/expand
Requires: /usr/bin/expr
Requires: /usr/bin/false
Requires: /usr/bin/fgrep
Requires: /usr/bin/file
Requires: /usr/bin/find
Requires: /usr/bin/fold
Requires: /usr/sbin/fuser
Requires: /usr/bin/gencat
Requires: /usr/bin/getconf
Requires: /usr/bin/gettext
Requires: /usr/bin/grep
Requires: /usr/sbin/groupadd
Requires: /usr/sbin/groupdel
Requires: /usr/sbin/groupmod
Requires: /usr/bin/groups
Requires: /usr/bin/gunzip
Requires: /usr/bin/gzip
Requires: /usr/bin/head
Requires: /usr/bin/hostname
Requires: /usr/bin/iconv
Requires: /usr/bin/id
Requires: /usr/bin/install
Requires: /usr/bin/ipcrm
Requires: /usr/bin/ipcs
Requires: /usr/bin/join
Requires: /usr/bin/kill
Requires: /usr/bin/killall
Requires: /usr/bin/ln
Requires: /usr/bin/locale
Requires: /usr/bin/localedef
Requires: /usr/bin/logger
Requires: /usr/bin/logname
Requires: /usr/bin/lp
Requires: /usr/bin/lpr
Requires: /usr/bin/ls
Requires: /usr/bin/m4
Requires: /bin/mailx
Requires: /usr/bin/make
Requires: /usr/bin/man
Requires: /usr/bin/md5sum
Requires: /usr/bin/mkdir
Requires: /usr/bin/mkfifo
Requires: /usr/bin/mknod
Requires: /usr/bin/mktemp
Requires: /usr/bin/more
Requires: /usr/bin/mount
Requires: /usr/bin/msgfmt
Requires: /usr/bin/mv
Requires: /usr/bin/newgrp
Requires: /usr/bin/nice
Requires: /usr/bin/nl
Requires: /usr/bin/nohup
Requires: /usr/bin/od
@ -258,52 +262,37 @@ Requires: /usr/bin/patch
Requires: /usr/bin/pathchk
#better POSIX conformance of /usr/bin/pax
Requires: spax
Requires: /usr/bin/pidof
Requires: /usr/bin/pr
Requires: /usr/bin/printf
Requires: /usr/bin/ps
Requires: /usr/bin/pwd
Requires: /usr/bin/renice
Requires: /usr/bin/rm
Requires: /usr/bin/rmdir
Requires: /usr/bin/sed
Requires: /usr/sbin/sendmail
Requires: /usr/bin/seq
Requires: /usr/bin/sh
Requires: /usr/sbin/shutdown
Requires: /usr/bin/sleep
Requires: /usr/bin/sort
Requires: /usr/bin/split
Requires: /usr/bin/strings
Requires: /usr/bin/strip
Requires: /usr/bin/stty
Requires: /usr/bin/su
Requires: /usr/bin/sync
Requires: /usr/bin/tail
Requires: /usr/bin/tar
Requires: /usr/bin/tee
Requires: /usr/bin/test
Requires: /usr/bin/time
Requires: /usr/bin/touch
Requires: /usr/bin/tr
Requires: /usr/bin/true
Requires: /usr/bin/tsort
Requires: /usr/bin/tty
Requires: /usr/bin/umount
Requires: /usr/bin/uname
Requires: /usr/bin/unexpand
Requires: /usr/bin/uniq
Requires: /usr/bin/wc
Requires: /usr/bin/xargs
Requires: /usr/sbin/groupadd
Requires: /usr/sbin/groupdel
Requires: /usr/sbin/groupmod
Requires: /usr/sbin/useradd
Requires: /usr/sbin/userdel
Requires: /usr/sbin/usermod
Requires: /usr/bin/wc
Requires: /usr/bin/xargs
Requires: /usr/bin/zcat
Requires: /usr/sbin/sendmail
Requires: redhat-lsb-submod-security%{?_isa} = %{version}-%{release}
Provides: lsb-core-%{archname} = %{version}-%{release}
Provides: lsb-core-noarch = %{version}-%{release}
#Obsoletes: redhat-lsb < %%{version}-%%{release}
#Obsoletes: redhat-lsb < %{version}-%{release}
%description core
The Linux Standard Base (LSB) Core module support provides the fundamental
@ -311,6 +300,7 @@ system interfaces, libraries, and runtime environment upon which all conforming
applications and libraries depend.
%package cxx
Group: System Environment/Base
Summary: LSB CXX module support
Requires: libstdc++%{?_isa}
Requires: redhat-lsb-core%{?_isa} = %{version}-%{release}
@ -326,6 +316,7 @@ provide low-level support for the core constructs of the language, and
implement the standard base C++ libraries.
%package desktop
Group: System Environment/Base
Summary: LSB Desktop module support
Requires: xdg-utils
# LSB_Graphics library
@ -350,7 +341,7 @@ Requires: libjpeg-turbo%{?_isa}
%ifarch %{ix86} ppc s390 arm
Requires: libpng12.so.0
%endif
%ifarch x86_64 ppc64 s390x aarch64 ppc64le
%ifarch x86_64 ppc64 s390x aarch64
Requires: libpng12.so.0()(64bit)
%endif
Requires: libpng%{?_isa}
@ -383,6 +374,7 @@ The Linux Standard Base (LSB) Desktop Specifications define components that are
required to be present on an LSB conforming system.
%package languages
Group: System Environment/Base
Summary: LSB Languages module support
# Perl and Perl non-builtin modules
Requires: /usr/bin/perl
@ -414,7 +406,7 @@ Requires: perl(Locale::Maketext)
Requires: perl(Fatal)
Requires: perl(File::CheckTree)
Requires: perl(Sys::Syslog)
Requires: perl(Getopt::Long)
# python
Requires: /usr/bin/python
@ -429,6 +421,7 @@ The Linux Standard Base (LSB) Languages module supports components for runtime
languages which are found on an LSB conforming system.
%package printing
Group: System Environment/Base
Summary: LSB Printing module support
# gLSB Printing Libraries
Requires: cups-libs
@ -446,6 +439,7 @@ The Linux Standard Base (LSB) Printing specifications define components that
are required to be present on an LSB conforming system.
%package trialuse
Group: System Environment/Base
Summary: LSB Trialuse module support
Requires: redhat-lsb-submod-multimedia%{?_isa} = %{version}-%{release}
Requires: redhat-lsb-submod-security%{?_isa} = %{version}-%{release}
@ -459,6 +453,7 @@ The Linux Standard Base (LSB) Trialuse module support defines components
which are not required parts of the LSB Specification.
%package supplemental
Group: System Environment/Base
Summary: LSB supplemental dependencies required by LSB certification tests
Requires: net-tools
Requires: xorg-x11-fonts-ISO8859-1-75dpi
@ -632,6 +627,16 @@ fi
fi
%endif
%post
%ifarch %{ix86}
# make this softlink again for /emul
if [ -f /emul/ia32-linux/lib/%{ldso} ]; then
for LSBVER in %{lsbsover}; do
/sbin/sln /emul/ia32-linux/lib/%{ldso} /%{_lib}/%{lsbldso}.$LSBVER || :
done
fi
%endif
%postun submod-security -p <lua>
os.remove("%{_datadir}/lsb/%{lsbrelver}/submodules")
os.remove("%{_datadir}/lsb/%{lsbrelver}/modules")
@ -685,8 +690,7 @@ os.remove("%{_datadir}/lsb")
%{_datadir}/lsb/%{lsbrelver}/submodules/multimedia-%{lsbrelver}-noarch
%files core
%doc README README.lsb_release
%license COPYING
%doc README README.lsb_release COPYING
%{_sysconfdir}/redhat-lsb
%dir %{_sysconfdir}/lsb-release.d
%{_mandir}/*/*
@ -751,86 +755,13 @@ os.remove("%{_datadir}/lsb")
%changelog
* Mon Feb 19 2018 Parag Nemade <pnemade AT redhat DOT com> - 4.1-44
- Add BuildRequires: gcc as per packaging guidelines
* Tue Feb 13 2018 Than Ngo <than@redhat.com> - 4.1-43
- fixed FTBS
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.1-42
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Sat Feb 03 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 4.1-41
- greps are now in /usr/bin
* Mon Nov 13 2017 Sébastien Santoro <dereckson@espace-win.org> - 4.1-40
- Resolves:rh#1512650: /bin/mailx is still in /bin
* Mon Nov 13 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 4.1-39
- /bin/ed is in /usr/bin/ed now
- /usr/bin/*grep are in /bin still
* Thu Nov 09 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 4.1-38
- change /bin requirements to /usr/bin
* Mon Nov 06 2017 Ondrej Vasik <ovasik@redhat.com> - 4.1-37
- drop the postscriptlet specific for itanium completely(#1508613)
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.1-36
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.1-35
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.1-34
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Thu Nov 10 2016 Ondrej Vasik <ovasik@redhat.com> - 4.1-33
- require ncurses-compat-libs - as LSB strictly requires libncurses.so.5
(#1392972)
* Tue Feb 23 2016 Parag Nemade <pnemade AT redhat DOT com> - 4.1-32
- Resolves:rh#1307989: FTBFS in rawhide by adding perl-Getopt-Long in BuildRequires
- Drop Group: tag
- Added %%license tag
- Changed %%define -> %%global
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 4.1-31
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.1-30
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Wed Aug 27 2014 Parag <pnemade AT redhat DOT com> - 4.1-29
* Mon Sep 01 2014 Parag <pnemade AT redhat DOT com> - 4.1-21.1
- Resolves:rh#1133536 - redhat-lsb does not requires /usr/sbin/sendmail
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.1-28
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.1-27
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Tue May 06 2014 Ondrej Vasik <ovasik@redhat.com> - 4.1-26
- add support for ppc64le (#1094371)
* Wed Apr 23 2014 Peter Robinson <pbrobinson@fedoraproject.org> 4.1-25
- Update aarch64 patch
* Mon Nov 25 2013 Ondrej Vasik <ovasik@redhat.com> - 4.1-24
* Mon Nov 25 2013 Ondrej Vasik <ovasik@redhat.com> - 4.1-21
- remove nsswitch handling - broken and unnecessary
(#986728, #915147)
* Tue Oct 29 2013 Ondrej Vasik <ovasik@redhat.com> - 4.1-23
- fuser moved from /sbin to /usr/sbin/ (#1023283)
* Thu Oct 17 2013 Ondrej Vasik <ovasik@redhat.com> - 4.1-22
- pidof moved from /sbin to /usr/bin/ as part of the
transfer to procps-ng package
* Wed Oct 16 2013 Ondrej Vasik <ovasik@redhat.com> - 4.1-21
- fix the broken dependency caused by hostname move after
recent post UsrMove cleanup
* Tue Aug 13 2013 Ondrej Vasik <ovasik@redhat.com> - 4.1-20
- fix the patch for aarch64 support to be not patch of
patch but real patch (sorry, simply, fix aarch64 build)