Add BuildRequires: gcc as per packaging guidelines

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

redhat-lsb-aarch64.patch

@@ -0,0 +1,131 @@
+diff --git a/redhat_lsb_trigger.c b/redhat_lsb_trigger.c
+index 76db260..f76e5a5 100644
+--- a/redhat_lsb_trigger.c
++++ b/redhat_lsb_trigger.c
+@@ -424,6 +424,102 @@ register void *__thread_self __asm ("g7");
+ 	   : inline_syscall_clobbers, "$20", "$21");		\
+ 	_sc_ret = _sc_0, _sc_err = _sc_19;			\
+ }
++#elif defined __aarch64__
++#undef SYS_ify
++#define SYS_ify(syscall_name)	(__NR_##syscall_name)
++
++# undef INLINE_SYSCALL
++# define INLINE_SYSCALL(name, nr, args...)				\
++  ({ unsigned long _sys_result = INTERNAL_SYSCALL (name, , nr, args);	\
++     if (__builtin_expect (INTERNAL_SYSCALL_ERROR_P (_sys_result, ), 0))\
++       {								\
++	 __set_errno (INTERNAL_SYSCALL_ERRNO (_sys_result, ));		\
++	 _sys_result = (unsigned long) -1;				\
++       }								\
++     (long) _sys_result; })
++
++# undef INTERNAL_SYSCALL_DECL
++# define INTERNAL_SYSCALL_DECL(err) do { } while (0)
++
++# undef INTERNAL_SYSCALL_RAW
++# define INTERNAL_SYSCALL_RAW(name, err, nr, args...)		\
++  ({ unsigned long _sys_result;					\
++     {								\
++       LOAD_ARGS_##nr (args)					\
++       register long _x8 asm ("x8") = (name);			\
++       asm volatile ("svc	0	// syscall " # name     \
++		     : "+r" (_x0), "+r" (_x8)			\
++		     : ASM_ARGS_##nr				\
++		     : "memory", CLOBBER_ARGS_##nr);		\
++       _sys_result = _x0;					\
++     }								\
++     (long) _sys_result; })
++
++# undef INTERNAL_SYSCALL
++# define INTERNAL_SYSCALL(name, err, nr, args...)		\
++	INTERNAL_SYSCALL_RAW(SYS_ify(name), err, nr, args)
++
++# undef INTERNAL_SYSCALL_ERROR_P
++# define INTERNAL_SYSCALL_ERROR_P(val, err) \
++  ((unsigned long) (val) >= (unsigned long) -4095)
++
++# undef INTERNAL_SYSCALL_ERRNO
++# define INTERNAL_SYSCALL_ERRNO(val, err)	(-(val))
++
++# define CLOBBER_ARGS_0       CLOBBER_ARGS_1
++# define CLOBBER_ARGS_1 "x1", CLOBBER_ARGS_2
++# define CLOBBER_ARGS_2 "x2", CLOBBER_ARGS_3
++# define CLOBBER_ARGS_3 "x3", CLOBBER_ARGS_4
++# define CLOBBER_ARGS_4 "x4", CLOBBER_ARGS_5
++# define CLOBBER_ARGS_5 "x5", CLOBBER_ARGS_6
++# define CLOBBER_ARGS_6 "x6", CLOBBER_ARGS_7
++# define CLOBBER_ARGS_7 \
++  "x7", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x16", "x17", "x18"
++
++# define LOAD_ARGS_0()				\
++  register long _x0 asm ("x0");
++
++# define ASM_ARGS_0
++# define LOAD_ARGS_1(x0)			\
++  long _x0tmp = (long) (x0);			\
++  LOAD_ARGS_0 ()				\
++  _x0 = _x0tmp;
++# define ASM_ARGS_1	"r" (_x0)
++# define LOAD_ARGS_2(x0, x1)			\
++  long _x1tmp = (long) (x1);			\
++  LOAD_ARGS_1 (x0)				\
++  register long _x1 asm ("x1") = _x1tmp;
++# define ASM_ARGS_2	ASM_ARGS_1, "r" (_x1)
++# define LOAD_ARGS_3(x0, x1, x2)		\
++  long _x2tmp = (long) (x2);			\
++  LOAD_ARGS_2 (x0, x1)				\
++  register long _x2 asm ("x2") = _x2tmp;
++# define ASM_ARGS_3	ASM_ARGS_2, "r" (_x2)
++# define LOAD_ARGS_4(x0, x1, x2, x3)		\
++  long _x3tmp = (long) (x3);			\
++  LOAD_ARGS_3 (x0, x1, x2)			\
++  register long _x3 asm ("x3") = _x3tmp;
++# define ASM_ARGS_4	ASM_ARGS_3, "r" (_x3)
++# define LOAD_ARGS_5(x0, x1, x2, x3, x4)	\
++  long _x4tmp = (long) (x4);			\
++  LOAD_ARGS_4 (x0, x1, x2, x3)			\
++  register long _x4 asm ("x4") = _x4tmp;
++# define ASM_ARGS_5	ASM_ARGS_4, "r" (_x4)
++# define LOAD_ARGS_6(x0, x1, x2, x3, x4, x5)	\
++  long _x5tmp = (long) (x5);			\
++  LOAD_ARGS_5 (x0, x1, x2, x3, x4)		\
++  register long _x5 asm ("x5") = _x5tmp;
++# define ASM_ARGS_6	ASM_ARGS_5, "r" (_x5)
++# define LOAD_ARGS_7(x0, x1, x2, x3, x4, x5, x6)\
++  long _x6tmp = (long) (x6);			\
++  LOAD_ARGS_6 (x0, x1, x2, x3, x4, x5)		\
++  register long _x6 asm ("x6") = _x6tmp;
++# define ASM_ARGS_7	ASM_ARGS_6, "r" (_x6)
++
++# undef INTERNAL_SYSCALL_NCS
++# define INTERNAL_SYSCALL_NCS(number, err, nr, args...)	\
++	INTERNAL_SYSCALL_RAW (number, err, nr, args)
++
+ #endif
+ 
+ #ifdef __i386__
+@@ -539,10 +635,14 @@ int main (int argc, char **argv)
+       p = mempcpy (p, LSBLDSO, sizeof LSBLDSO - 1);
+       *p++ = '.';
+       strcpy (p, LSBVER);
++#if defined(__NR_symlink)
+       if (is_ia64 ())
+ 	INTERNAL_SYSCALL (symlink, err, 2, "/emul/ia32-linux/lib/" LDSO, buf);
+       else
+ 	INTERNAL_SYSCALL (symlink, err, 2, LDSO, buf);
++#elif defined(__NR_symlinkat)
++      INTERNAL_SYSCALL (symlinkat, err, 3, AT_FDCWD, LDSO, buf);
++#endif
+       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,

redhat-lsb.spec

@@ -1,93 +1,124 @@
 # Define this to link to which library version  eg. /lib64/ld-lsb-x86-64.so.3
-%define lsbsover 3 
+%global lsbsover 3
 
 %ifarch %{ix86}
-%define ldso ld-linux.so.2
-%define lsbldso ld-lsb.so
+%global ldso ld-linux.so.2
+%global lsbldso ld-lsb.so
 %endif
 
 %ifarch ia64
-%define ldso ld-linux-ia64.so.2
-%define lsbldso ld-lsb-ia64.so
+%global ldso ld-linux-ia64.so.2
+%global lsbldso ld-lsb-ia64.so
 %endif
 
 %ifarch ppc
-%define ldso ld.so.1
-%define lsbldso ld-lsb-ppc32.so
+%global ldso ld.so.1
+%global lsbldso ld-lsb-ppc32.so
 %endif
 
 %ifarch ppc64
-%define ldso ld64.so.1
-%define lsbldso ld-lsb-ppc64.so
+%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
 %endif
 
 %ifarch s390
-%define ldso ld.so.1
-%define lsbldso ld-lsb-s390.so
+%global ldso ld.so.1
+%global lsbldso ld-lsb-s390.so
 %endif
 
 %ifarch s390x
-%define ldso ld64.so.1
-%define lsbldso ld-lsb-s390x.so
+%global ldso ld64.so.1
+%global lsbldso ld-lsb-s390x.so
 %endif
 
 %ifarch x86_64
-%define ldso ld-linux-x86-64.so.2
-%define lsbldso ld-lsb-x86-64.so
+%global ldso ld-linux-x86-64.so.2
+%global lsbldso ld-lsb-x86-64.so
 %endif
 
-%define upstreamlsbrelver 2.0
-%define lsbrelver 4.1
-%define srcrelease 1
+%ifarch %{arm}
+%global ldso ld-linux.so.2
+%global lsbldso ld-lsb-arm.so
+%endif
+
+%ifarch aarch64
+%global ldso ld-linux-aarch64.so.1
+%global 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}
 
 Summary: Implementation of Linux Standard Base specification
 Name: redhat-lsb
 Version: 4.1
-Release: 4%{?dist}
+Release: 44%{?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
 Patch1: redhat-lsb-lsb_start_daemon-fix.patch
 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}
-%define archname ia32
+%global archname ia32
 %endif
 %ifarch ia64
-%define archname ia64
+%global archname ia64
 %endif
 %ifarch ppc
-%define archname ppc32
+%global archname ppc32
 %endif
 %ifarch ppc64
-%define archname ppc64
+%global archname ppc64
+%endif
+%ifarch ppc64le
+%global archname ppc64le
 %endif
 %ifarch s390
-%define archname s390
+%global archname s390
 %endif
 %ifarch s390x
-%define archname s390x
+%global archname s390x
 %endif
 %ifarch x86_64
-%define archname amd64
+%global archname amd64
+%endif
+%ifarch %{arm}
+%global archname arm
+%endif
+%ifarch aarch64
+%global archname aarch64
 %endif
 
-ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x %{arm}
+ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x %{arm} aarch64 ppc64le
 
-Requires: redhat-lsb-core%{?_isa} = %{version}
-Requires: redhat-lsb-cxx%{?_isa} = %{version}
-Requires: redhat-lsb-desktop%{?_isa} = %{version}
-Requires: redhat-lsb-languages = %{version}
-Requires: redhat-lsb-printing = %{version}
-#Requires: redhat-lsb-trialuse = %{version}
+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}
 
-Provides: lsb = %{version}
-Provides: lsb-%{archname} = %{version}
-Provides: lsb-noarch = %{version}
+Provides: lsb = %{version}-%{release}
+Provides: lsb-%{archname} = %{version}-%{release}
+Provides: lsb-noarch = %{version}-%{release}
 
 %description
 The Linux Standard Base (LSB) is an attempt to develop a set of standards that
@@ -99,144 +130,125 @@ 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
 Requires: nss%{?_isa}
 
-Provides: lsb-submod-security-%{archname} = %{version}
-Provides: lsb-submod-security-noarch = %{version}
+Provides: lsb-submod-security-%{archname} = %{version}-%{release}
+Provides: lsb-submod-security-noarch = %{version}-%{release}
 
 %description submod-security
 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}
 
-Provides: lsb-submod-multimedia-%{archname} = %{version}
-Provides: lsb-submod-multimedia-noarch = %{version}
+Provides: lsb-submod-multimedia-%{archname} = %{version}-%{release}
+Provides: lsb-submod-multimedia-noarch = %{version}-%{release}
 
 %description submod-multimedia
 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}
-Requires: ncurses-libs%{?_isa}
+#LSB requires libncurses.so.5 for some reason
+Requires: ncurses-compat-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/cpio
-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/su
-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
@@ -244,36 +256,54 @@ Requires: /usr/bin/passwd
 Requires: /usr/bin/paste
 Requires: /usr/bin/patch
 Requires: /usr/bin/pathchk
-Requires: /usr/bin/pax
+#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: redhat-lsb-submod-security%{?_isa} = %{version}
+Requires: /usr/bin/wc
+Requires: /usr/bin/xargs
+Requires: /usr/bin/zcat
+Requires: redhat-lsb-submod-security%{?_isa} = %{version}-%{release}
 
-Provides: lsb-core-%{archname} = %{version}
-Provides: lsb-core-noarch = %{version}
-#Obsoletes: redhat-lsb < %{version}
+Provides: lsb-core-%{archname} = %{version}-%{release}
+Provides: lsb-core-noarch = %{version}-%{release}
+#Obsoletes: redhat-lsb < %%{version}-%%{release}
 
 %description core
 The Linux Standard Base (LSB) Core module support provides the fundamental
@@ -281,13 +311,12 @@ 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}
+Requires: redhat-lsb-core%{?_isa} = %{version}-%{release}
 
-Provides: lsb-cxx-%{archname} = %{version}
-Provides: lsb-cxx-noarch = %{version}
+Provides: lsb-cxx-%{archname} = %{version}-%{release}
+Provides: lsb-cxx-noarch = %{version}-%{release}
 
 %description cxx
 The Linux Standard Base (LSB) CXX module supports the core interfaces by
@@ -297,7 +326,6 @@ 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
@@ -319,10 +347,10 @@ Requires: cairo%{?_isa}
 Requires: freetype%{?_isa}
 Requires: libjpeg-turbo%{?_isa}
 
-%ifarch %{ix86}
+%ifarch %{ix86} ppc s390 arm
 Requires: libpng12.so.0
 %endif
-%ifarch x86_64
+%ifarch x86_64 ppc64 s390x aarch64 ppc64le
 Requires: libpng12.so.0()(64bit)
 %endif
 Requires: libpng%{?_isa}
@@ -341,21 +369,20 @@ Requires: qt-x11%{?_isa}
 Requires: qt3%{?_isa}
 # xml
 Requires: libxml2%{?_isa}
-Requires: redhat-lsb-submod-multimedia%{?_isa} = %{version}
-Requires: redhat-lsb-core%{?_isa} = %{version}
+Requires: redhat-lsb-submod-multimedia%{?_isa} = %{version}-%{release}
+Requires: redhat-lsb-core%{?_isa} = %{version}-%{release}
 
-Provides: lsb-desktop-%{archname} = %{version}
-Provides: lsb-desktop-noarch = %{version}
-Provides: lsb-graphics-%{archname} = %{version}
-Provides: lsb-graphics-noarch = %{version}
-Obsoletes: redhat-lsb-graphics < %{version}
+Provides: lsb-desktop-%{archname} = %{version}-%{release}
+Provides: lsb-desktop-noarch = %{version}-%{release}
+Provides: lsb-graphics-%{archname} = %{version}-%{release}
+Provides: lsb-graphics-noarch = %{version}-%{release}
+Obsoletes: redhat-lsb-graphics < %{version}-%{release}
 
 %description desktop
 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
@@ -376,57 +403,82 @@ Requires: perl(Test::Harness)
 Requires: perl(Test::Simple)
 Requires: perl(ExtUtils::MakeMaker)
 Requires: perl(Pod::Plainer)
+Requires: perl(XML::LibXML)
+Requires: perl(Pod::LaTeX)
+Requires: perl(Pod::Checker)
+Requires: perl(B::Lint)
+Requires: perl(Text::Soundex)
+Requires: perl(Env)
+Requires: perl(Time::HiRes)
+Requires: perl(Locale::Maketext)
+Requires: perl(Fatal)
+Requires: perl(File::CheckTree)
+Requires: perl(Sys::Syslog)
+Requires: perl(Getopt::Long)
 
 # python
 Requires: /usr/bin/python
 # java
-Requires: redhat-lsb-core%{?_isa} = %{version}
+Requires: redhat-lsb-core%{?_isa} = %{version}-%{release}
 
-Provides: lsb-languages-%{archname} = %{version}
-Provides: lsb-languages-noarch = %{version}
+Provides: lsb-languages-%{archname} = %{version}-%{release}
+Provides: lsb-languages-noarch = %{version}-%{release}
 
 %description languages
 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
 # gLSB Printing Command and Utilities
 Requires: /usr/bin/foomatic-rip
 Requires: /usr/bin/gs
-Requires: redhat-lsb-core%{?_isa} = %{version}
+Requires: redhat-lsb-core%{?_isa} = %{version}-%{release}
 
-Provides: lsb-printing-%{archname} = %{version}
-Provides: lsb-printing-noarch = %{version}
-Obsoletes: redhat-lsb-printing < %{version}
+Provides: lsb-printing-%{archname} = %{version}-%{release}
+Provides: lsb-printing-noarch = %{version}-%{release}
+Obsoletes: redhat-lsb-printing < %{version}-%{release}
 
 %description printing
 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}
-Requires: redhat-lsb-submod-security%{?_isa} = %{version}
-Requires: redhat-lsb-core%{?_isa} = %{version}
+Requires: redhat-lsb-submod-multimedia%{?_isa} = %{version}-%{release}
+Requires: redhat-lsb-submod-security%{?_isa} = %{version}-%{release}
+Requires: redhat-lsb-core%{?_isa} = %{version}-%{release}
 
-Provides: lsb-trialuse-%{archname} = %{version}
-Provides: lsb-trialuse-noarch = %{version}
+Provides: lsb-trialuse-%{archname} = %{version}-%{release}
+Provides: lsb-trialuse-noarch = %{version}-%{release}
 
 %description trialuse
 The Linux Standard Base (LSB) Trialuse module support defines components
 which are not required parts of the LSB Specification.
 
+%package supplemental
+Summary: LSB supplemental dependencies required by LSB certification tests
+Requires: net-tools
+Requires: xorg-x11-fonts-ISO8859-1-75dpi
+Requires: xorg-x11-fonts-ISO8859-1-100dpi
+Requires: abattis-cantarell-fonts
+Requires: sil-abyssinica-fonts
+Requires: xorg-x11-server-Xvfb
+
+%description supplemental
+This subpackage brings in supplemental dependencies for components required for
+passing LSB (Linux Standard Base) certification testsuite, but not directly required
+to be on LSB conforming system.
+
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p0 -b .triggerfix
 %patch3 -p1 -b .arm
+%patch4 -p1 -b .aarch64
 
 %build
 cd lsb-release-%{upstreamlsbrelver}
@@ -437,7 +489,7 @@ make
 if [ -e /bin/mailx ]; then
    if [ -L /bin/mailx ]; then
      rm -f /bin/mailx
-   fi 
+   fi
 fi
 
 %install
@@ -457,9 +509,13 @@ cd lsb-release-%{upstreamlsbrelver}
 make mandir=$RPM_BUILD_ROOT/%{_mandir} prefix=$RPM_BUILD_ROOT/%{_prefix} install
 cd ..
 # we keep more lsb information in /usr/share/lsb
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/lsb/%{lsbrelver}/modules   
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/lsb/%{lsbrelver}/modules
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/lsb/%{lsbrelver}/submodules
 
+#prepare installation of doc
+cp -p lsb-release-2.0/COPYING .
+cp -p lsb-release-2.0/README README.lsb_release
+
 # relations between modules and submodules
 modules="core cxx desktop languages printing trialuse"
 submodules="core perl python cpp toolkit-gtk toolkit-qt toolkit-qt3"
@@ -545,8 +601,13 @@ ln -snf ../../../sbin/chkconfig $RPM_BUILD_ROOT/usr/lib/lsb/remove_initd
 
 # According to https://bugzilla.redhat.com/show_bug.cgi?id=232918 , the '-static' option
 # is imported against segfault error while running redhat_lsb_trigger
+%ifarch %{arm}
+gcc $RPM_OPT_FLAGS -Os -fno-stack-protector -o redhat_lsb_trigger{.%{_target_cpu},.c} -DLSBSOVER='"%{lsbsover}"' \
+  -DLDSO='"%{ldso}"' -DLSBLDSO='"/%{_lib}/%{lsbldso}"' -D_GNU_SOURCE
+%else
 gcc $RPM_OPT_FLAGS -Os -static -fno-stack-protector -o redhat_lsb_trigger{.%{_target_cpu},.c} -DLSBSOVER='"%{lsbsover}"' \
   -DLDSO='"%{ldso}"' -DLSBLDSO='"/%{_lib}/%{lsbldso}"' -D_GNU_SOURCE
+%endif
 install -p -m 700 redhat_lsb_trigger.%{_target_cpu} \
   $RPM_BUILD_ROOT%{_sbindir}/redhat_lsb_trigger.%{_target_cpu}
 
@@ -570,44 +631,6 @@ fi
     done
   fi
 %endif
-if ! grep -s -q '^hosts: \+files \+dns *$' /etc/nsswitch.conf;then
-    cat /etc/nsswitch.conf >%{_datadir}/lsb/nsswitch.conf.orig
-    ed -s /etc/nsswitch.conf <<EOF
-/^hosts: \+files \+/s/.*/hosts:      files dns/
-w
-q
-EOF
-    cat /etc/nsswitch.conf > %{_datadir}/lsb/nsswitch.conf
-fi
-
-%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
-if ! grep -s -q '^hosts: \+files \+dns *$' /etc/nsswitch.conf;then
-     cat /etc/nsswitch.conf >%{_datadir}/lsb/nsswitch.conf.orig
-     ed -s /etc/nsswitch.conf <<EOF
-/^hosts: \+files \+/s/.*/hosts:      files dns/
-w
-q
-EOF
-cat /etc/nsswitch.conf >%{_datadir}/lsb/nsswitch.conf
-fi
-
-%preun
-if [ $1 -eq 0 ];then
-    if [ -e %{_datadir}/lsb/nsswitch.conf -a -e  %{_datadir}/lsb/nsswitch.conf.orig ];then
-        if cmp -s %{_datadir}/lsb/nsswitch.conf /etc/nsswitch.conf;then
-            cat %{_datadir}/lsb/nsswitch.conf.orig >/etc/nsswitch.conf
-        fi
-        rm -f %{_datadir}/lsb/{nsswitch.conf,nsswitch.conf.orig}
-    fi
-fi
 
 %postun submod-security -p <lua>
 os.remove("%{_datadir}/lsb/%{lsbrelver}/submodules")
@@ -662,6 +685,8 @@ os.remove("%{_datadir}/lsb")
 %{_datadir}/lsb/%{lsbrelver}/submodules/multimedia-%{lsbrelver}-noarch
 
 %files core
+%doc README README.lsb_release
+%license COPYING
 %{_sysconfdir}/redhat-lsb
 %dir %{_sysconfdir}/lsb-release.d
 %{_mandir}/*/*
@@ -721,13 +746,158 @@ os.remove("%{_datadir}/lsb")
 %{_sysconfdir}/lsb-release.d/trialuse*
 %{_datadir}/lsb/%{lsbrelver}/modules/trialuse
 
+%files supplemental
+#no files, just dependencies
+
 
 %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
+- 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
+- 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)
+
+* Thu Aug 08 2013 Ondrej Vasik <ovasik@redhat.com> - 4.1-19
+- Require sil-abyssinica-fonts in supplemental(#994341)
+- Fully specify requirements on subpackages(#971386)
+
+* Sat Aug 03 2013 Petr Pisar <ppisar@redhat.com> - 4.1-18
+- Perl 5.18 rebuild
+
+* Fri Jul 26 2013 Dennis Gilmore <dennis@ausil.us> - 4.1-17
+- dont use -static when compiling redhat_lsb_trigger on arm
+
+* Wed Jul 17 2013 Petr Pisar <ppisar@redhat.com> - 4.1-16
+- Perl 5.18 rebuild
+
+* Tue Jun 11 2013 Ondrej Vasik <ovasik@redhat.com> - 4.1-15
+- fix build on aarch64 (#973343)
+- fix the defines for arm and aarch64 (may need adjustment)
+
+* Thu May 23 2013 Ondrej Vasik <ovasik@redhat.com> - 4.1-14
+- require spax instead of pax (more POSIX compatible) (#965658)
+- require another set of perl modules in -languages (#959129)
+- polish a bit the nsswitch.conf hack - include mdns4_minimal (#915147)
+
+* Tue Mar 12 2013 Ondrej Vasik <ovasik@redhat.com> - 4.1-13
+- require /usr/bin/cpio (binary moved as part of UsrMove)
+
+* Fri Mar 01 2013 Ondrej Vasik <ovasik@redhat.com> - 4.1-12
+- require perl(Pod::Checker), perl(B::Lint) and
+  perl(Text::Soundex) in languages (#916898)
+
+* Fri Feb 08 2013 Ondrej Vasik <ovasik@redhat.com> - 4.1-11
+- require perl(Pod::LaTeX) in languages (#908705)
+- require xorg-x11-server-Xvfb in supplemental (#896058)
+
+* Thu Jan 10 2013 Ondrej Vasik <ovasik@redhat.com> - 4.1-10
+- require abattis-cantarell-fonts in supplemental (#892998)
+
+* Fri Dec 14 2012 Ondrej Vasik <ovasik@redhat.com> - 4.1-9
+- ship README and COPYING file in -core subpackage
+  (#887195)
+
+* Wed Dec 12 2012 Ondrej Vasik <ovasik@redhat.com> - 4.1-8
+- require libpng12.so.0 in other architectures (#881596)
+
+* Wed Dec 05 2012 Ondrej Vasik <ovasik@redhat.com> - 4.1-7
+- add new subpackage -supplemental for LSB testuite-only dependencies
+- require net-tools in -supplemental (#882122)
+- require xorg-x11-fonts-ISO8859-1-{75,100}dpi in -supplemental
+  (#883385)
+- require perl(XML::LibXML) (#880954)
+- keep usermodified /etc/nsswitch.conf as /etc/nsswitch.conf.rpmsave,
+  warn about modification (#867124)
+
+* Mon Nov 05 2012 Parag <pnemade AT redhat DOT com> - 4.1-6
+- Resolves:rh#873066 - missing dependency /bin/su moved to /usr/bin/su
+
+* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
 * Tue May 29 2012 xning <xning AT redhat DOT com> - 4.1-4
 - Resolves:rh:#825261: redhat-lsb scripts blow away my /etc/nsswitch.conf
 
 * Wed May 23 2012 Parag <pnemade AT redhat DOT com> - 4.1-3
-- Resolves:rh#824305: Dependency glibc-common%{?_isa} should be changed to glibc-common only
+- Resolves:rh#824305: Dependency glibc-common%%{?_isa} should be changed to glibc-common only
 
 * Mon May 14 2012 xning <xning AT redhat DOT com> - 4.1-2
 - Resolves:rh:#806190: gethostbyaddr sets h_errno to 3, not HOST_NOT_FOUND
@@ -798,18 +968,18 @@ os.remove("%{_datadir}/lsb")
 * Thu Aug 28 2008 Hao Liu <hliu@redhat.com> 3.2-2
 - Modify "Requires: /usr/bin/mailx" to "Requires: mailx" (Bug #460249)
 
-* Wed Aug 18 2008 Hao Liu <hliu@redhat.com> 3.2-1
+* Wed Aug 20 2008 Hao Liu <hliu@redhat.com> 3.2-1
 - Port forward to LSB 3.2
 - Remove symlink for mailx if user is upgrading from the redhat-lsb of older version 
 - Since F10 put mailx under /usr/bin, change the corresponding requires
 
-* Thu Aug 5 2008 Hao Liu <hliu@redhat.com> - 3.1-22
+* Tue Aug 5 2008 Hao Liu <hliu@redhat.com> - 3.1-22
 - Remove 2 requires which provided by redhat-lsb
 - Add comments explaining why hard-coded path is kept
 - Resolve some hard-coded path problems
 - Add comments explaining why importing '-static' option while compiling redhat_lsb_trigger
-- Replace %{_libdir}/lsb with /usr/lib/lsb
-- Replace /%{_lib}/* with /%{_lib}/*so*
+- Replace %%{_libdir}/lsb with /usr/lib/lsb
+- Replace /%%{_lib}/* with /%%{_lib}/*so*
 - Replace /lib/lsb with /lib/lsb*
 
 * Thu Jul 31 2008 Lawrence Lim <llim@redhat.com> - 3.1-21
@@ -830,14 +1000,14 @@ os.remove("%{_datadir}/lsb")
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 3.1-17
 - Rebuild for selinux ppc32 issue.
 
-* Fri Aug 20 2007 Lawrence Lim <llim@redhat.com> - 3.1-16
+* Mon Aug 20 2007 Lawrence Lim <llim@redhat.com> - 3.1-16
 - update spec file in accordance to feedback provided through merge review - merge-review.patch - #226363
 
 * Wed Jul 18 2007 Lawrence Lim <llim@redhat.com> - 3.1-15.f8
 - Resolved: #239842 - /lib/lsb/init-functions shall use aliases but not functions
 - forward port the patch from 3.1-12.3.EL which fix #217566, #233530, #240916
 
-* Wed Jul 2 2007 Lawrence Lim <llim@redhat.com> - 3.1-14.fc7
+* Wed Jul 4 2007 Lawrence Lim <llim@redhat.com> - 3.1-14.fc7
 - fixed Bug 232918 for new glibc version
 
 * Tue Jun 26 2007 Lawrence Lim <llim@redhat.com> - 3.1-12.3.EL
@@ -926,7 +1096,7 @@ os.remove("%{_datadir}/lsb")
 
 * Fri Jan 21 2005 Leon Ho <llch@redhat.com> 1.3-7
 - Add to support multiple LSB test suite version
-- Add %endif in trigger postun
+- Add %%endif in trigger postun
 
 * Thu Nov 11 2004 Phil Knirsch <pknirsch@redhat.com> 1.3-6
 - Fixed invalid sln call for trigger in postun on ia64 (#137647)