From 75ae095e91da6a56e6e6adab381ecde9beb6051d Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 13 Nov 2017 18:08:28 +0100 Subject: [PATCH 01/53] /usr/bin/*grep are in /bin still Signed-off-by: Igor Gnatenko --- redhat-lsb.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/redhat-lsb.spec b/redhat-lsb.spec index ecd6018..75fe200 100644 --- a/redhat-lsb.spec +++ b/redhat-lsb.spec @@ -191,12 +191,12 @@ Requires: /usr/bin/dmesg Requires: /usr/bin/du Requires: /usr/bin/echo Requires: /usr/bin/ed -Requires: /usr/bin/egrep +Requires: /bin/egrep Requires: /usr/bin/env Requires: /usr/bin/expand Requires: /usr/bin/expr Requires: /usr/bin/false -Requires: /usr/bin/fgrep +Requires: /bin/fgrep Requires: /usr/bin/file Requires: /usr/bin/find Requires: /usr/bin/fold @@ -204,7 +204,7 @@ Requires: /usr/sbin/fuser Requires: /usr/bin/gencat Requires: /usr/bin/getconf Requires: /usr/bin/gettext -Requires: /usr/bin/grep +Requires: /bin/grep Requires: /usr/sbin/groupadd Requires: /usr/sbin/groupdel Requires: /usr/sbin/groupmod @@ -748,6 +748,7 @@ os.remove("%{_datadir}/lsb") %changelog * Mon Nov 13 2017 Igor Gnatenko - 4.1-39 - /bin/ed is in /usr/bin/ed now +- /usr/bin/*grep are in /bin still * Thu Nov 09 2017 Igor Gnatenko - 4.1-38 - change /bin requirements to /usr/bin From 3eebfea3c5af4c7e35b518e6bf6fb70f08cd3398 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Santoro?= Date: Mon, 13 Nov 2017 20:20:37 +0100 Subject: [PATCH 02/53] /usr/bin/mailx -> /bin/mailx The mailx command is still located in /bin --- redhat-lsb.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/redhat-lsb.spec b/redhat-lsb.spec index 75fe200..c6aea14 100644 --- a/redhat-lsb.spec +++ b/redhat-lsb.spec @@ -58,7 +58,7 @@ Summary: Implementation of Linux Standard Base specification Name: redhat-lsb Version: 4.1 -Release: 39%{?dist} +Release: 40%{?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 @@ -230,7 +230,7 @@ Requires: /usr/bin/lp Requires: /usr/bin/lpr Requires: /usr/bin/ls Requires: /usr/bin/m4 -Requires: /usr/bin/mailx +Requires: /bin/mailx Requires: /usr/bin/make Requires: /usr/bin/man Requires: /usr/bin/md5sum @@ -746,6 +746,9 @@ os.remove("%{_datadir}/lsb") %changelog +* Mon Nov 13 2017 Sébastien Santoro - 4.1-40 +- Resolves:rh#1512650: /bin/mailx is still in /bin + * Mon Nov 13 2017 Igor Gnatenko - 4.1-39 - /bin/ed is in /usr/bin/ed now - /usr/bin/*grep are in /bin still From 8bb47e4e7f9283fc966bf8ba621978f82b8bcd37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 2 Feb 2018 17:04:10 +0000 Subject: [PATCH 03/53] greps are now in /usr/bin See https://bugzilla.redhat.com/show_bug.cgi?id=1540485 --- redhat-lsb.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/redhat-lsb.spec b/redhat-lsb.spec index c6aea14..43d53c9 100644 --- a/redhat-lsb.spec +++ b/redhat-lsb.spec @@ -191,12 +191,12 @@ Requires: /usr/bin/dmesg Requires: /usr/bin/du Requires: /usr/bin/echo Requires: /usr/bin/ed -Requires: /bin/egrep +Requires: /usr/bin/egrep Requires: /usr/bin/env Requires: /usr/bin/expand Requires: /usr/bin/expr Requires: /usr/bin/false -Requires: /bin/fgrep +Requires: /usr/bin/fgrep Requires: /usr/bin/file Requires: /usr/bin/find Requires: /usr/bin/fold @@ -204,7 +204,7 @@ Requires: /usr/sbin/fuser Requires: /usr/bin/gencat Requires: /usr/bin/getconf Requires: /usr/bin/gettext -Requires: /bin/grep +Requires: /usr/bin/grep Requires: /usr/sbin/groupadd Requires: /usr/sbin/groupdel Requires: /usr/sbin/groupmod From cc4241b4f1901688d3f2f2587f4f688ce2ad60cc Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sat, 3 Feb 2018 10:52:55 +0100 Subject: [PATCH 04/53] bump release Signed-off-by: Igor Gnatenko --- redhat-lsb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/redhat-lsb.spec b/redhat-lsb.spec index 43d53c9..b58860f 100644 --- a/redhat-lsb.spec +++ b/redhat-lsb.spec @@ -58,7 +58,7 @@ Summary: Implementation of Linux Standard Base specification Name: redhat-lsb Version: 4.1 -Release: 40%{?dist} +Release: 41%{?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 @@ -746,6 +746,9 @@ os.remove("%{_datadir}/lsb") %changelog +* Sat Feb 03 2018 Igor Gnatenko - 4.1-41 +- greps are now in /usr/bin + * Mon Nov 13 2017 Sébastien Santoro - 4.1-40 - Resolves:rh#1512650: /bin/mailx is still in /bin From d584361f882193efb439fffce5d5cc01499c6dc6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 12:55:04 +0000 Subject: [PATCH 05/53] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- redhat-lsb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/redhat-lsb.spec b/redhat-lsb.spec index b58860f..8f5ed1b 100644 --- a/redhat-lsb.spec +++ b/redhat-lsb.spec @@ -58,7 +58,7 @@ Summary: Implementation of Linux Standard Base specification Name: redhat-lsb Version: 4.1 -Release: 41%{?dist} +Release: 42%{?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 @@ -746,6 +746,9 @@ os.remove("%{_datadir}/lsb") %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 4.1-42 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Sat Feb 03 2018 Igor Gnatenko - 4.1-41 - greps are now in /usr/bin From 2184ad9d711a66f81a5462744a2dda954ce3b298 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Tue, 13 Feb 2018 17:16:02 +0100 Subject: [PATCH 06/53] fixed FTBS --- redhat-lsb.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/redhat-lsb.spec b/redhat-lsb.spec index 8f5ed1b..9bacef1 100644 --- a/redhat-lsb.spec +++ b/redhat-lsb.spec @@ -55,10 +55,14 @@ %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: 42%{?dist} +Release: 43%{?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 @@ -746,6 +750,9 @@ os.remove("%{_datadir}/lsb") %changelog +* Tue Feb 13 2018 Than Ngo - 4.1-43 +- fixed FTBS + * Fri Feb 09 2018 Fedora Release Engineering - 4.1-42 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 26423f95b100c033ebb7220c86e3362180b75384 Mon Sep 17 00:00:00 2001 From: Parag Nemade Date: Mon, 19 Feb 2018 18:37:42 +0530 Subject: [PATCH 07/53] Add BuildRequires: gcc as per packaging guidelines --- redhat-lsb.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/redhat-lsb.spec b/redhat-lsb.spec index 9bacef1..9d7b9cd 100644 --- a/redhat-lsb.spec +++ b/redhat-lsb.spec @@ -62,7 +62,7 @@ Summary: Implementation of Linux Standard Base specification Name: redhat-lsb Version: 4.1 -Release: 43%{?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 @@ -74,6 +74,7 @@ License: GPLv2 BuildRequires: glibc-static BuildRequires: perl-generators BuildRequires: perl(Getopt::Long) +BuildRequires: gcc %ifarch %{ix86} %global archname ia32 @@ -750,6 +751,9 @@ os.remove("%{_datadir}/lsb") %changelog +* Mon Feb 19 2018 Parag Nemade - 4.1-44 +- Add BuildRequires: gcc as per packaging guidelines + * Tue Feb 13 2018 Than Ngo - 4.1-43 - fixed FTBS From f34189a1432a587e4ee6d26f7b43ad3e8dd388d9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 03:28:36 +0000 Subject: [PATCH 08/53] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- redhat-lsb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/redhat-lsb.spec b/redhat-lsb.spec index 9d7b9cd..588fb40 100644 --- a/redhat-lsb.spec +++ b/redhat-lsb.spec @@ -62,7 +62,7 @@ Summary: Implementation of Linux Standard Base specification Name: redhat-lsb Version: 4.1 -Release: 44%{?dist} +Release: 45%{?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 @@ -751,6 +751,9 @@ os.remove("%{_datadir}/lsb") %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 4.1-45 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Mon Feb 19 2018 Parag Nemade - 4.1-44 - Add BuildRequires: gcc as per packaging guidelines From 8667bbdd27acdf2ba8f2c3d9e0d977eab59313fc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 2 Feb 2019 11:14:04 +0000 Subject: [PATCH 09/53] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- redhat-lsb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/redhat-lsb.spec b/redhat-lsb.spec index 588fb40..0735c4c 100644 --- a/redhat-lsb.spec +++ b/redhat-lsb.spec @@ -62,7 +62,7 @@ Summary: Implementation of Linux Standard Base specification Name: redhat-lsb Version: 4.1 -Release: 45%{?dist} +Release: 46%{?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 @@ -751,6 +751,9 @@ os.remove("%{_datadir}/lsb") %changelog +* Sat Feb 02 2019 Fedora Release Engineering - 4.1-46 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 14 2018 Fedora Release Engineering - 4.1-45 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From feb9737f3ab59f125caafdfa36fb18a5c004f842 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Thu, 7 Feb 2019 17:02:24 +0100 Subject: [PATCH 10/53] fixed FTBS in f30 --- redhat-lsb.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/redhat-lsb.spec b/redhat-lsb.spec index 0735c4c..54d193c 100644 --- a/redhat-lsb.spec +++ b/redhat-lsb.spec @@ -62,7 +62,7 @@ Summary: Implementation of Linux Standard Base specification Name: redhat-lsb Version: 4.1 -Release: 46%{?dist} +Release: 47%{?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 @@ -601,7 +601,7 @@ 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} +%ifarch %{arm} aarch64 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 @@ -751,6 +751,9 @@ os.remove("%{_datadir}/lsb") %changelog +* Thu Feb 07 2019 Than Ngo - 4.1-47 +- fixed FTBS in f30 + * Sat Feb 02 2019 Fedora Release Engineering - 4.1-46 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From b9036c327922e94275de610b1c4f72948fc8bfcd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 18:23:09 +0000 Subject: [PATCH 11/53] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- redhat-lsb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/redhat-lsb.spec b/redhat-lsb.spec index 54d193c..d7c6f30 100644 --- a/redhat-lsb.spec +++ b/redhat-lsb.spec @@ -62,7 +62,7 @@ Summary: Implementation of Linux Standard Base specification Name: redhat-lsb Version: 4.1 -Release: 47%{?dist} +Release: 48%{?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 @@ -751,6 +751,9 @@ os.remove("%{_datadir}/lsb") %changelog +* Fri Jul 26 2019 Fedora Release Engineering - 4.1-48 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Feb 07 2019 Than Ngo - 4.1-47 - fixed FTBS in f30 From c69ec9395b5937249b97f0e80722370ed347d766 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 30 Jan 2020 17:29:20 +0000 Subject: [PATCH 12/53] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- redhat-lsb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/redhat-lsb.spec b/redhat-lsb.spec index d7c6f30..b6bff65 100644 --- a/redhat-lsb.spec +++ b/redhat-lsb.spec @@ -62,7 +62,7 @@ Summary: Implementation of Linux Standard Base specification Name: redhat-lsb Version: 4.1 -Release: 48%{?dist} +Release: 49%{?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 @@ -751,6 +751,9 @@ os.remove("%{_datadir}/lsb") %changelog +* Thu Jan 30 2020 Fedora Release Engineering - 4.1-49 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Jul 26 2019 Fedora Release Engineering - 4.1-48 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 2e2ba7a88f7a36e991098ca88b61beb3800eb805 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Fri, 17 Jan 2020 21:02:19 +0000 Subject: [PATCH 13/53] Use macros when invoking for invoking make and gcc Replace make with %{make_build} [1] and gcc with %{__cc}. These changes make it easier for buildroots to insert extra arguments or use alternative tools. [1] https://docs.fedoraproject.org/en-US/packaging-guidelines/#_parallel_make --- redhat-lsb.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/redhat-lsb.spec b/redhat-lsb.spec index b6bff65..34bb202 100644 --- a/redhat-lsb.spec +++ b/redhat-lsb.spec @@ -62,7 +62,7 @@ Summary: Implementation of Linux Standard Base specification Name: redhat-lsb Version: 4.1 -Release: 49%{?dist} +Release: 50%{?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 @@ -482,7 +482,7 @@ to be on LSB conforming system. %build cd lsb-release-%{upstreamlsbrelver} -make +%make_build %pre # remove the extra symlink /bin/mailx -> /bin/mail @@ -602,10 +602,10 @@ 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} aarch64 -gcc $RPM_OPT_FLAGS -Os -fno-stack-protector -o redhat_lsb_trigger{.%{_target_cpu},.c} -DLSBSOVER='"%{lsbsover}"' \ +%{__cc} $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}"' \ +%{__cc} $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} \ @@ -751,6 +751,9 @@ os.remove("%{_datadir}/lsb") %changelog +* Mon Feb 03 2020 Tom Stellard - 4.1-50 +- Use macros when invoking for invoking make and gcc + * Thu Jan 30 2020 Fedora Release Engineering - 4.1-49 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From ca0739ce6f357e4b0a579d38231e5c27d73abcb1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 05:37:54 +0000 Subject: [PATCH 14/53] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- redhat-lsb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/redhat-lsb.spec b/redhat-lsb.spec index 34bb202..5e36a8f 100644 --- a/redhat-lsb.spec +++ b/redhat-lsb.spec @@ -62,7 +62,7 @@ Summary: Implementation of Linux Standard Base specification Name: redhat-lsb Version: 4.1 -Release: 50%{?dist} +Release: 51%{?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 @@ -751,6 +751,9 @@ os.remove("%{_datadir}/lsb") %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 4.1-51 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Feb 03 2020 Tom Stellard - 4.1-50 - Use macros when invoking for invoking make and gcc From dda09672cf072589a9e88396e3e57cd53da2b0ab Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Fri, 8 Jan 2021 20:43:07 +0000 Subject: [PATCH 15/53] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- redhat-lsb.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/redhat-lsb.spec b/redhat-lsb.spec index 5e36a8f..01b22cb 100644 --- a/redhat-lsb.spec +++ b/redhat-lsb.spec @@ -71,6 +71,7 @@ Patch2: redhat-lsb-trigger.patch Patch3: redhat-lsb-arm.patch Patch4: redhat-lsb-aarch64.patch License: GPLv2 +BuildRequires: make BuildRequires: glibc-static BuildRequires: perl-generators BuildRequires: perl(Getopt::Long) From 82e6d25154cda742f5066f746ad17d648c746889 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 15:10:53 +0000 Subject: [PATCH 16/53] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- redhat-lsb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/redhat-lsb.spec b/redhat-lsb.spec index 01b22cb..c4902ee 100644 --- a/redhat-lsb.spec +++ b/redhat-lsb.spec @@ -62,7 +62,7 @@ Summary: Implementation of Linux Standard Base specification Name: redhat-lsb Version: 4.1 -Release: 51%{?dist} +Release: 52%{?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 @@ -752,6 +752,9 @@ os.remove("%{_datadir}/lsb") %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 4.1-52 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 4.1-51 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From b57269e096e81173c1fe03505aac7e0ad43c58c0 Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Tue, 9 Oct 2018 14:00:16 +0200 Subject: [PATCH 17/53] Drop the recreation of symlinks since it is unnecessary Co-Authored-By: Lukas Nykryn Resolves: #1625584 --- redhat-lsb.spec | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/redhat-lsb.spec b/redhat-lsb.spec index c4902ee..79bb244 100644 --- a/redhat-lsb.spec +++ b/redhat-lsb.spec @@ -62,7 +62,7 @@ Summary: Implementation of Linux Standard Base specification Name: redhat-lsb Version: 4.1 -Release: 52%{?dist} +Release: 53%{?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 @@ -619,20 +619,6 @@ if [ -x /usr/sbin/redhat_lsb_trigger.%{_target_cpu} ]; then /usr/sbin/redhat_lsb_trigger.%{_target_cpu} fi -%ifnarch %{ix86} - /sbin/sln %{ldso} /%{_lib}/%{lsbldso} || : -%else - if [ -f /emul/ia32-linux/lib/%{ldso} ]; then - for LSBVER in %{lsbsover}; do - /sbin/sln /emul/ia32-linux/lib/%{ldso} /%{_lib}/%{lsbldso}.$LSBVER || : - done - else - for LSBVER in %{lsbsover}; do - /sbin/sln %{ldso} /%{_lib}/%{lsbldso}.$LSBVER || : - done - fi -%endif - %postun submod-security -p os.remove("%{_datadir}/lsb/%{lsbrelver}/submodules") os.remove("%{_datadir}/lsb/%{lsbrelver}/modules") @@ -752,6 +738,9 @@ os.remove("%{_datadir}/lsb") %changelog +* Tue May 25 2021 Florian Weimer - 4.1-53 +- Do not call non-existing lsn program on glibc updates (#1625584) + * Wed Jan 27 2021 Fedora Release Engineering - 4.1-52 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From ea0aa72046d2b8e90bd875bfa94994b0f2b93a3f Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Tue, 25 May 2021 13:17:31 +0200 Subject: [PATCH 18/53] Remove unnecessary redhat_lsb_trigger.* programs (#1964367) --- redhat-lsb-aarch64.patch | 131 -------------------------------------- redhat-lsb-arm.patch | 45 ------------- redhat-lsb-trigger.patch | 134 --------------------------------------- redhat-lsb.spec | 37 +++-------- 4 files changed, 8 insertions(+), 339 deletions(-) delete mode 100644 redhat-lsb-aarch64.patch delete mode 100644 redhat-lsb-arm.patch delete mode 100644 redhat-lsb-trigger.patch diff --git a/redhat-lsb-aarch64.patch b/redhat-lsb-aarch64.patch deleted file mode 100644 index 3701d95..0000000 --- a/redhat-lsb-aarch64.patch +++ /dev/null @@ -1,131 +0,0 @@ -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, diff --git a/redhat-lsb-arm.patch b/redhat-lsb-arm.patch deleted file mode 100644 index 42fcea8..0000000 --- a/redhat-lsb-arm.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- redhat-lsb-3.2.orig/redhat_lsb_trigger.c 2008-04-16 13:50:14.000000000 -0400 -+++ redhat-lsb-3.2/redhat_lsb_trigger.c 2009-02-03 04:39:06.000000000 -0500 -@@ -223,6 +223,42 @@ register void *__thread_self __asm ("g7" - # define ASMFMT_1 , "0" (gpr2) - # define ASMFMT_2 , "0" (gpr2), "d" (gpr3) - # define ASMFMT_3 , "0" (gpr2), "d" (gpr3), "d" (gpr4) -+#elif defined __arm__ -+# if defined (__ARM_EABI__) -+#undef INTERNAL_SYSCALL_DECL -+#define INTERNAL_SYSCALL_DECL(err) do { } while (0) -+#undef INTERNAL_SYSCALL_RAW -+#define INTERNAL_SYSCALL_RAW(name, err, nr, args...) \ -+ ({ \ -+ register int _a1 asm ("r0"), _nr asm ("r7"); \ -+ LOAD_ARGS_##nr (args) \ -+ _nr = name; \ -+ asm volatile ("swi 0x0 @ syscall " #name \ -+ : "=r" (_a1) \ -+ : "r" (_nr) ASM_ARGS_##nr \ -+ : "memory"); \ -+ _a1; }) -+ -+#undef INTERNAL_SYSCALL -+#define INTERNAL_SYSCALL(name, err, nr, args...) \ -+ INTERNAL_SYSCALL_RAW(SYS_ify(name), err, nr, args) -+ -+#define LOAD_ARGS_0() -+#define ASM_ARGS_0 -+#define LOAD_ARGS_1(a1) \ -+ int _a1tmp = (int) (a1); \ -+ LOAD_ARGS_0 () \ -+ _a1 = _a1tmp; -+#define ASM_ARGS_1 ASM_ARGS_0, "r" (_a1) -+#define LOAD_ARGS_2(a1, a2) \ -+ int _a2tmp = (int) (a2); \ -+ LOAD_ARGS_1 (a1) \ -+ register int _a2 asm ("a2") = _a2tmp; -+#define ASM_ARGS_2 ASM_ARGS_1, "r" (_a2) -+#undef SYS_ify -+#define SWI_BASE (0x900000) -+#define SYS_ify(syscall_name) (__NR_##syscall_name) -+#endif - #elif defined __sparc__ - # ifndef __arch64__ - # define __INTERNAL_SYSCALL_STRING \ diff --git a/redhat-lsb-trigger.patch b/redhat-lsb-trigger.patch deleted file mode 100644 index c2bab3c..0000000 --- a/redhat-lsb-trigger.patch +++ /dev/null @@ -1,134 +0,0 @@ ---- redhat_lsb_trigger.c.triggerfix 2008-04-16 18:50:14.000000000 +0100 -+++ redhat_lsb_trigger.c 2011-09-14 11:50:42.563080000 +0100 -@@ -423,10 +423,76 @@ - #define is_ia64() 0 - #endif - -+char * -+strtok (char *p, const char *delim) -+{ -+ static char *olds; -+ const char *d; -+ char *token; -+ if (p == NULL) -+ p = olds; -+ while (*p) -+ { -+ for (d = delim; *d; d++) -+ if (*p == *d) -+ break; -+ if (!*d) -+ break; -+ p++; -+ } -+ if (!*p) -+ { -+ olds = p; -+ return NULL; -+ } -+ token = p; -+ while (*p) -+ { -+ for (d = delim; *d; d++) -+ if (*p == *d) -+ break; -+ if (*d) -+ break; -+ p++; -+ } -+ if (!*p) -+ olds = p; -+ else -+ { -+ *p = '\0'; -+ olds = p + 1; -+ } -+ return token; -+} -+ -+size_t -+strlen (const char *s) -+{ -+ const char *p; -+ for (p = s; *p; ++p); -+ return p - s; -+} -+ -+void * -+mempcpy (void *dst, const void *src, size_t n) -+{ -+ char *d = dst; -+ const char *s = src; -+ while (n--) -+ *d++ = *s++; -+ return d; -+} -+ -+char * -+strcpy (char *dst, const char *src) -+{ -+ char *ret = dst; -+ while ((*dst++ = *src++) != '\0'); -+ return ret; -+} -+ - int main (int argc, char **argv) - { --/* redhat_lsb_trigger.c:428: warning: unused variable 'ret' */ --/* long ret; */ - INTERNAL_SYSCALL_DECL (err); - char lsbsover[] = LSBSOVER; - char *LSBVER, *p = lsbsover; -@@ -450,15 +516,38 @@ - int __libc_multiple_threads __attribute__((nocommon)); - int __libc_enable_asynccancel (void) { return 0; } - void __libc_disable_asynccancel (int x) { } -+#ifndef __arm__ - void __libc_csu_init (void) { } - void __libc_csu_fini (void) { } -+#endif - pid_t __fork (void) { return -1; } - char thr_buf[65536]; - --#ifndef __powerpc__ -+void -+__attribute__ ((noreturn)) -+__stack_chk_fail (void) -+{ -+ INTERNAL_SYSCALL_DECL (err); -+ while (1) -+ INTERNAL_SYSCALL (exit, err, 1, 1); -+} -+ -+#if defined __powerpc__ -+ -+struct startup_info -+{ -+ void *sda_base; -+ int (*main) (int, char **, char **, void *); -+ int (*init) (int, char **, char **, void *); -+ void (*fini) (void); -+}; -+ -+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__ - --/* /usr/lib/gcc/ppc64-redhat-linux/4.1.2/../../../../lib64/libc.a(libc-start.o): In function `__libc_start_main': -- * * (.opd+0x10): multiple definition of `__libc_start_main' */ - int ___libc_start_main (int (*main) (int argc, char **argv), - int argc, char **argv, - void (*init) (void), void (*fini) (void), -@@ -472,9 +561,7 @@ - void (*fini) (void); - }; - --/* /usr/lib/gcc/ppc64-redhat-linux/4.1.2/../../../../lib64/libc.a(libc-start.o): In function `__libc_start_main': -- * (.opd+0x10): multiple definition of `__libc_start_main' */ --int ___libc_start_main (int argc, char **argv, char **ev, -+int __libc_start_main (int argc, char **argv, char **ev, - void *auxvec, void (*rtld_fini) (void), - struct startup_info *stinfo, - char **stack_on_entry) diff --git a/redhat-lsb.spec b/redhat-lsb.spec index 79bb244..f975876 100644 --- a/redhat-lsb.spec +++ b/redhat-lsb.spec @@ -59,23 +59,22 @@ # and thus leading to the FTBS. %global __brp_ldconfig %{nil} +# The packages are architecture-specific, but do not contain any ELF +# binaries with debuginfo to extract. +%undefine _enable_debug_packages + Summary: Implementation of Linux Standard Base specification Name: redhat-lsb Version: 4.1 -Release: 53%{?dist} +Release: 54%{?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 BuildRequires: make -BuildRequires: glibc-static BuildRequires: perl-generators BuildRequires: perl(Getopt::Long) -BuildRequires: gcc %ifarch %{ix86} %global archname ia32 @@ -108,8 +107,6 @@ BuildRequires: gcc %global archname aarch64 %endif -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} Requires: redhat-lsb-desktop%{?_isa} = %{version}-%{release} @@ -477,9 +474,6 @@ to be on LSB conforming system. %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p0 -b .triggerfix -%patch3 -p1 -b .arm -%patch4 -p1 -b .aarch64 %build cd lsb-release-%{upstreamlsbrelver} @@ -600,25 +594,8 @@ ln -snf ../../../sbin/chkconfig $RPM_BUILD_ROOT/usr/lib/lsb/remove_initd #ln -snf /usr/share/X11/fonts $RPM_BUILD_ROOT/usr/X11R6/lib/X11/fonts #ln -snf /usr/share/X11/rgb.txt $RPM_BUILD_ROOT/usr/X11R6/lib/X11/rgb.txt -# 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} aarch64 -%{__cc} $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 -%{__cc} $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} - cp -p redhat_lsb_init $RPM_BUILD_ROOT/bin/redhat_lsb_init -%triggerpostun -- glibc -if [ -x /usr/sbin/redhat_lsb_trigger.%{_target_cpu} ]; then - /usr/sbin/redhat_lsb_trigger.%{_target_cpu} -fi - %postun submod-security -p os.remove("%{_datadir}/lsb/%{lsbrelver}/submodules") os.remove("%{_datadir}/lsb/%{lsbrelver}/modules") @@ -683,7 +660,6 @@ os.remove("%{_datadir}/lsb") /usr/lib/lsb /%{_lib}/*so* /lib/lsb* -%{_sbindir}/redhat_lsb_trigger.%{_target_cpu} %{_datadir}/lsb/%{lsbrelver}/modules/core %{_sysconfdir}/lsb-release.d/core* %{_datadir}/lsb/%{lsbrelver}/submodules/core-%{lsbrelver}-%{archname} @@ -738,6 +714,9 @@ os.remove("%{_datadir}/lsb") %changelog +* Tue May 25 2021 Florian Weimer - 4.1-54 +- Remove unnecessary redhat_lsb_trigger.* programs (#1964367) + * Tue May 25 2021 Florian Weimer - 4.1-53 - Do not call non-existing lsn program on glibc updates (#1625584) From c88aaf183cb12563875af7845d6b536c56d2ff6e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 11:18:06 +0000 Subject: [PATCH 19/53] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- redhat-lsb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/redhat-lsb.spec b/redhat-lsb.spec index f975876..708e1e8 100644 --- a/redhat-lsb.spec +++ b/redhat-lsb.spec @@ -66,7 +66,7 @@ Summary: Implementation of Linux Standard Base specification Name: redhat-lsb Version: 4.1 -Release: 54%{?dist} +Release: 55%{?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 @@ -714,6 +714,9 @@ os.remove("%{_datadir}/lsb") %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 4.1-55 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue May 25 2021 Florian Weimer - 4.1-54 - Remove unnecessary redhat_lsb_trigger.* programs (#1964367) From d276c26821375d5ef6edfc6269ee70a3b723aeb9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jan 2022 17:40:19 +0000 Subject: [PATCH 20/53] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- redhat-lsb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/redhat-lsb.spec b/redhat-lsb.spec index 708e1e8..fc165f2 100644 --- a/redhat-lsb.spec +++ b/redhat-lsb.spec @@ -66,7 +66,7 @@ Summary: Implementation of Linux Standard Base specification Name: redhat-lsb Version: 4.1 -Release: 55%{?dist} +Release: 56%{?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 @@ -714,6 +714,9 @@ os.remove("%{_datadir}/lsb") %changelog +* Fri Jan 21 2022 Fedora Release Engineering - 4.1-56 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 4.1-55 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 2cd4b78b1008f2063babf88cd874c32b01aa8773 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Mon, 27 Jun 2022 12:08:13 +0100 Subject: [PATCH 21/53] ncurses-compat-libs was dropped in F37, to workaround and fix FTI (fails to install), since F37 we use ncurses-libs --- redhat-lsb.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/redhat-lsb.spec b/redhat-lsb.spec index fc165f2..37b291d 100644 --- a/redhat-lsb.spec +++ b/redhat-lsb.spec @@ -66,7 +66,7 @@ Summary: Implementation of Linux Standard Base specification Name: redhat-lsb Version: 4.1 -Release: 56%{?dist} +Release: 57%{?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 @@ -157,8 +157,12 @@ Summary: LSB Core module support Requires: glibc%{?_isa} Requires: glibc-common Requires: libgcc%{?_isa} +%if 0%{?fedora} > 36 +Requires: ncurses-libs%{?_isa} +%else #LSB requires libncurses.so.5 for some reason Requires: ncurses-compat-libs%{?_isa} +%endif Requires: pam%{?_isa} Requires: zlib%{?_isa} @@ -714,6 +718,10 @@ os.remove("%{_datadir}/lsb") %changelog +* Mon Jun 27 2022 Sérgio Basto - 4.1-57 +- ncurses-compat-libs was dropped in F37, to workaround and fix FTI (fails to + install), since F37 we use ncurses-libs + * Fri Jan 21 2022 Fedora Release Engineering - 4.1-56 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 87bcbe094bb3d2992589ad1a6108a56c6d6c1c80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sat, 2 Jul 2022 04:47:44 +0100 Subject: [PATCH 22/53] Require libxcrypt-compat in core, as libcrypt.so.1 is mandatory (rhbz#2055953) --- redhat-lsb.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/redhat-lsb.spec b/redhat-lsb.spec index 37b291d..81f3600 100644 --- a/redhat-lsb.spec +++ b/redhat-lsb.spec @@ -66,7 +66,7 @@ Summary: Implementation of Linux Standard Base specification Name: redhat-lsb Version: 4.1 -Release: 57%{?dist} +Release: 58%{?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 @@ -157,6 +157,8 @@ Summary: LSB Core module support Requires: glibc%{?_isa} Requires: glibc-common Requires: libgcc%{?_isa} +#LSB requires libcrypt.so.1 +Requires: libxcrypt-compat%{?_isa} %if 0%{?fedora} > 36 Requires: ncurses-libs%{?_isa} %else @@ -718,6 +720,9 @@ os.remove("%{_datadir}/lsb") %changelog +* Sat Jul 02 2022 Sérgio Basto - 4.1-58 +- Require libxcrypt-compat in core, as libcrypt.so.1 is mandatory (rhbz#2055953) + * Mon Jun 27 2022 Sérgio Basto - 4.1-57 - ncurses-compat-libs was dropped in F37, to workaround and fix FTI (fails to install), since F37 we use ncurses-libs From 5866d5293a0891fa7987539541204eddc4baf3cf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 00:38:32 +0000 Subject: [PATCH 23/53] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- redhat-lsb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/redhat-lsb.spec b/redhat-lsb.spec index 81f3600..ab146fd 100644 --- a/redhat-lsb.spec +++ b/redhat-lsb.spec @@ -66,7 +66,7 @@ Summary: Implementation of Linux Standard Base specification Name: redhat-lsb Version: 4.1 -Release: 58%{?dist} +Release: 59%{?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 @@ -720,6 +720,9 @@ os.remove("%{_datadir}/lsb") %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 4.1-59 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jul 02 2022 Sérgio Basto - 4.1-58 - Require libxcrypt-compat in core, as libcrypt.so.1 is mandatory (rhbz#2055953) From 9a496a83f986f2cb5ca192ead4a16f11e79c5675 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 20 Jan 2023 19:35:52 +0000 Subject: [PATCH 24/53] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- redhat-lsb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/redhat-lsb.spec b/redhat-lsb.spec index ab146fd..8d85726 100644 --- a/redhat-lsb.spec +++ b/redhat-lsb.spec @@ -66,7 +66,7 @@ Summary: Implementation of Linux Standard Base specification Name: redhat-lsb Version: 4.1 -Release: 59%{?dist} +Release: 60%{?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 @@ -720,6 +720,9 @@ os.remove("%{_datadir}/lsb") %changelog +* Fri Jan 20 2023 Fedora Release Engineering - 4.1-60 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - 4.1-59 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 6552ef52a2cc557cbf46a4995bd2a4ba5d65a0fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sun, 12 Feb 2023 22:50:53 +0000 Subject: [PATCH 25/53] add alpha arch --- redhat-lsb.spec | 8 ++++ redhat-lsb.spec-arch-alpha.patch | 72 -------------------------------- 2 files changed, 8 insertions(+), 72 deletions(-) delete mode 100644 redhat-lsb.spec-arch-alpha.patch diff --git a/redhat-lsb.spec b/redhat-lsb.spec index 8d85726..91dfaca 100644 --- a/redhat-lsb.spec +++ b/redhat-lsb.spec @@ -6,6 +6,11 @@ %global lsbldso ld-lsb.so %endif +%ifarch alpha +%define ldso ld-linux-alpha.so.2 +%define lsbldso ld-lsb-alpha.so +%endif + %ifarch ia64 %global ldso ld-linux-ia64.so.2 %global lsbldso ld-lsb-ia64.so @@ -106,6 +111,9 @@ BuildRequires: perl(Getopt::Long) %ifarch aarch64 %global archname aarch64 %endif +%ifarch alpha +%define archname alpha +%endif Requires: redhat-lsb-core%{?_isa} = %{version}-%{release} Requires: redhat-lsb-cxx%{?_isa} = %{version}-%{release} diff --git a/redhat-lsb.spec-arch-alpha.patch b/redhat-lsb.spec-arch-alpha.patch deleted file mode 100644 index fe09c49..0000000 --- a/redhat-lsb.spec-arch-alpha.patch +++ /dev/null @@ -1,72 +0,0 @@ -Diff against 3.1-22: -Index: redhat-lsb.spec -=================================================================== -RCS file: /cvs/pkgs/devel/redhat-lsb/redhat-lsb.spec,v -retrieving revision 1.38 -diff -u -p -r1.38 redhat-lsb.spec ---- redhat-lsb.spec 7 Aug 2008 08:46:31 -0000 1.38 -+++ redhat-lsb.spec 11 Aug 2008 10:34:20 -0000 -@@ -36,6 +36,11 @@ - %define lsbldso ld-lsb-x86-64.so - %endif - -+%ifarch alpha -+%define ldso ld-linux-alpha.so.2 -+%define lsbldso ld-lsb-alpha.so -+%endif -+ - %ifarch ia64 ppc64 s390x x86_64 - %define qual ()(64bit) - %else -@@ -82,12 +87,15 @@ Provides: lsb = %{version} - %ifarch x86_64 - %define archname amd64 - %endif -+%ifarch alpha -+%define archname alpha -+%endif - Provides: lsb-core-%{archname} = %{version} - Provides: lsb-graphics-%{archname} = %{version} - Provides: lsb-core-noarch = %{version} - Provides: lsb-graphics-noarch = %{version} - --ExclusiveArch: i386 ia64 x86_64 ppc ppc64 s390 s390x -+ExclusiveArch: i386 ia64 x86_64 ppc ppc64 s390 s390x alpha - - %ifarch %{ix86} - # archLSB IA32 Base Libraries -@@ -187,16 +195,34 @@ Requires: libc.so.6()(64bit) - Requires: libstdc++.so.6()(64bit) - %endif - -+%ifarch alpha -+# archLSB Alpha Base Libraries -+Requires: libz.so.1 -+Requires: libutil.so.1.1 -+Requires: libpthread.so.0 -+Requires: libncurses.so.5 -+Requires: libm.so.6.1 -+Requires: libgcc_s.so.1 -+Requires: libdl.so.2.1 -+Requires: libcrypt.so.1.1 -+Requires: libc.so.6.1 -+Requires: libstdc++.so.6 -+%endif -+ - # gLSB Base/Utility/Stdc++/Graphics Libraries - Requires: libz.so.1%{qual} -+%ifnarch alpha - Requires: libutil.so.1%{qual} -+%endif - Requires: librt.so.1%{qual} - Requires: libpthread.so.0%{qual} - Requires: libpam.so.0%{qual} - Requires: libncurses.so.5%{qual} - Requires: libgcc_s.so.1%{qual} -+%ifnarch alpha - Requires: libdl.so.2%{qual} - Requires: libcrypt.so.1%{qual} -+%endif - Requires: libstdc++.so.6%{qual} - Requires: libXt.so.6%{qual} - Requires: libXi.so.6%{qual} From 05ede2f4710cab7c7eec29e16a36c7cea45b19be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Mon, 10 Apr 2023 01:33:15 +0100 Subject: [PATCH 26/53] Remove "Trial Use" specs, because LSB 5.0 Trial Use is completely outdated --- redhat-lsb.spec | 216 ++++-------------------------------------------- 1 file changed, 14 insertions(+), 202 deletions(-) diff --git a/redhat-lsb.spec b/redhat-lsb.spec index 91dfaca..82a53a5 100644 --- a/redhat-lsb.spec +++ b/redhat-lsb.spec @@ -7,8 +7,8 @@ %endif %ifarch alpha -%define ldso ld-linux-alpha.so.2 -%define lsbldso ld-lsb-alpha.so +%global ldso ld-linux-alpha.so.2 +%global lsbldso ld-lsb-alpha.so %endif %ifarch ia64 @@ -56,6 +56,12 @@ %global lsbldso ld-lsb-aarch64.so %endif +%ifarch ia64 ppc64 s390x x86_64 +%global qual ()(64bit) +%else +%global qual %{nil} +%endif + %global upstreamlsbrelver 2.0 %global lsbrelver 4.1 %global srcrelease 1 @@ -135,30 +141,6 @@ The lsb package provides utilities, libraries etc. needed for LSB Compliant Applications. It also contains requirements that will ensure that all components required by the LSB are installed on the system. -%package submod-security -Summary: LSB Security submodule support -Requires: nspr%{?_isa} -# Requires: nspr-devel -Requires: nss%{?_isa} - -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 -Summary: LSB Multimedia submodule support -Requires: alsa-lib%{?_isa} - -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 Summary: LSB Core module support # gLSB Library @@ -311,7 +293,6 @@ Requires: /usr/sbin/usermod 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}-%{release} Provides: lsb-core-noarch = %{version}-%{release} @@ -381,7 +362,6 @@ Requires: qt-x11%{?_isa} Requires: qt3%{?_isa} # xml Requires: libxml2%{?_isa} -Requires: redhat-lsb-submod-multimedia%{?_isa} = %{version}-%{release} Requires: redhat-lsb-core%{?_isa} = %{version}-%{release} Provides: lsb-desktop-%{archname} = %{version}-%{release} @@ -457,19 +437,6 @@ Obsoletes: redhat-lsb-printing < %{version}-%{release} The Linux Standard Base (LSB) Printing specifications define components that are required to be present on an LSB conforming system. -%package trialuse -Summary: LSB Trialuse module support -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}-%{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 @@ -503,94 +470,27 @@ fi %install # LSB uses /usr/lib rather than /usr/lib64 even for 64bit OS -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir} $RPM_BUILD_ROOT/%{_lib} $RPM_BUILD_ROOT%{_mandir} \ +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir} $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_mandir} \ $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT/usr/lib/lsb \ - $RPM_BUILD_ROOT%{_sysconfdir}/lsb-release.d/ $RPM_BUILD_ROOT%{_sbindir} \ - $RPM_BUILD_ROOT%{_datadir}/lsb/%{lsbrelver} + $RPM_BUILD_ROOT%{_sbindir} + # manually add Locale::Constants. This module is just an alias of Locale::Codes::Constants mkdir -p $RPM_BUILD_ROOT%{perl_vendorlib}/Locale cp -p Constants.pm $RPM_BUILD_ROOT%{perl_vendorlib}/Locale cp -p Constants.pod $RPM_BUILD_ROOT%{perl_vendorlib}/Locale -make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" +%make_install 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}/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" -submodules="${submodules} xml multimedia security desktop-misc graphics graphics-ext" -submodules="${submodules} printing" - -core="core security" -cxx="cpp" -desktop="desktop-misc graphics graphics-ext multimedia toolkit-gtk toolkit-qt toolkit-qt3" -desktop="${desktop} xml" -languages="perl python" -printing="printing" -trialuse="security multimedia" - -for mod in ${modules};do - touch $RPM_BUILD_ROOT%{_sysconfdir}/lsb-release.d/${mod}-%{lsbrelver}-%{archname} - touch $RPM_BUILD_ROOT%{_sysconfdir}/lsb-release.d/${mod}-%{lsbrelver}-noarch -done - -for submod in ${submodules};do - touch $RPM_BUILD_ROOT%{_datadir}/lsb/%{lsbrelver}/submodules/${submod}-%{lsbrelver}-%{archname} - touch $RPM_BUILD_ROOT%{_datadir}/lsb/%{lsbrelver}/submodules/${submod}-%{lsbrelver}-noarch -done -for moddir in ${modules};do - mkdir -p $RPM_BUILD_ROOT%{_datadir}/lsb/%{lsbrelver}/modules/${moddir} -done - -for submod in ${core};do - ln -snf ../../submodules/${submod}-%{lsbrelver}-%{archname} \ -$RPM_BUILD_ROOT%{_datadir}/lsb/%{lsbrelver}/modules/core/${submod}-%{lsbrelver}-%{archname} - ln -snf ../../submodules/${submod}-%{lsbrelver}-noarch \ -$RPM_BUILD_ROOT%{_datadir}/lsb/%{lsbrelver}/modules/core/${submod}-%{lsbrelver}-noarch -done -for submod in ${cxx};do - ln -snf ../../submodules/${submod}-%{lsbrelver}-%{archname} \ -$RPM_BUILD_ROOT%{_datadir}/lsb/%{lsbrelver}/modules/cxx/${submod}-%{lsbrelver}-%{archname} - ln -snf ../../submodules/${submod}-%{lsbrelver}-noarch \ -$RPM_BUILD_ROOT%{_datadir}/lsb/%{lsbrelver}/modules/cxx/${submod}-%{lsbrelver}-noarch -done -for submod in ${desktop};do - ln -snf ../../submodules/${submod}-%{lsbrelver}-%{archname} \ -$RPM_BUILD_ROOT%{_datadir}/lsb/%{lsbrelver}/modules/desktop/${submod}-%{lsbrelver}-%{archname} - ln -snf ../../submodules/${submod}-%{lsbrelver}-noarch \ -$RPM_BUILD_ROOT%{_datadir}/lsb/%{lsbrelver}/modules/desktop/${submod}-%{lsbrelver}-noarch -done -for submod in ${languages};do - ln -snf ../../submodules/${submod}-%{lsbrelver}-%{archname} \ -$RPM_BUILD_ROOT%{_datadir}/lsb/%{lsbrelver}/modules/languages/${submod}-%{lsbrelver}-%{archname} - ln -snf ../../submodules/${submod}-%{lsbrelver}-noarch \ -$RPM_BUILD_ROOT%{_datadir}/lsb/%{lsbrelver}/modules/languages/${submod}-%{lsbrelver}-noarch -done -for submod in ${printing};do - ln -snf ../../submodules/${submod}-%{lsbrelver}-%{archname} \ -$RPM_BUILD_ROOT%{_datadir}/lsb/%{lsbrelver}/modules/printing/${submod}-%{lsbrelver}-%{archname} - ln -snf ../../submodules/${submod}-%{lsbrelver}-noarch \ -$RPM_BUILD_ROOT%{_datadir}/lsb/%{lsbrelver}/modules/printing/${submod}-%{lsbrelver}-noarch -done -for submod in ${trialuse};do - ln -snf ../../submodules/${submod}-%{lsbrelver}-%{archname} \ -$RPM_BUILD_ROOT%{_datadir}/lsb/%{lsbrelver}/modules/trialuse/${submod}-%{lsbrelver}-%{archname} - ln -snf ../../submodules/${submod}-%{lsbrelver}-noarch \ -$RPM_BUILD_ROOT%{_datadir}/lsb/%{lsbrelver}/modules/trialuse/${submod}-%{lsbrelver}-noarch -done - for LSBVER in %{lsbsover}; do - ln -snf %{ldso} $RPM_BUILD_ROOT/%{_lib}/%{lsbldso}.$LSBVER + ln -snf %{ldso} $RPM_BUILD_ROOT/%{_libdir}/%{lsbldso}.$LSBVER done mkdir -p $RPM_BUILD_ROOT/bin @@ -610,118 +510,30 @@ ln -snf ../../../sbin/chkconfig $RPM_BUILD_ROOT/usr/lib/lsb/remove_initd cp -p redhat_lsb_init $RPM_BUILD_ROOT/bin/redhat_lsb_init -%postun submod-security -p -os.remove("%{_datadir}/lsb/%{lsbrelver}/submodules") -os.remove("%{_datadir}/lsb/%{lsbrelver}/modules") -os.remove("%{_datadir}/lsb/%{lsbrelver}") -os.remove("%{_datadir}/lsb") -%postun submod-multimedia -p -os.remove("%{_datadir}/lsb/%{lsbrelver}/submodules") -os.remove("%{_datadir}/lsb/%{lsbrelver}/modules") -os.remove("%{_datadir}/lsb/%{lsbrelver}") -os.remove("%{_datadir}/lsb") -%postun core -p -os.remove("%{_datadir}/lsb/%{lsbrelver}/submodules") -os.remove("%{_datadir}/lsb/%{lsbrelver}/modules") -os.remove("%{_datadir}/lsb/%{lsbrelver}") -os.remove("%{_datadir}/lsb") -%postun cxx -p -os.remove("%{_datadir}/lsb/%{lsbrelver}/submodules") -os.remove("%{_datadir}/lsb/%{lsbrelver}/modules") -os.remove("%{_datadir}/lsb/%{lsbrelver}") -os.remove("%{_datadir}/lsb") -%postun desktop -p -os.remove("%{_datadir}/lsb/%{lsbrelver}/submodules") -os.remove("%{_datadir}/lsb/%{lsbrelver}/modules") -os.remove("%{_datadir}/lsb/%{lsbrelver}") -os.remove("%{_datadir}/lsb") -%postun languages -p -os.remove("%{_datadir}/lsb/%{lsbrelver}/submodules") -os.remove("%{_datadir}/lsb/%{lsbrelver}/modules") -os.remove("%{_datadir}/lsb/%{lsbrelver}") -os.remove("%{_datadir}/lsb") -%postun printing -p -os.remove("%{_datadir}/lsb/%{lsbrelver}/submodules") -os.remove("%{_datadir}/lsb/%{lsbrelver}/modules") -os.remove("%{_datadir}/lsb/%{lsbrelver}") -os.remove("%{_datadir}/lsb") -%postun trialuse -p -os.remove("%{_datadir}/lsb/%{lsbrelver}/submodules") -os.remove("%{_datadir}/lsb/%{lsbrelver}/modules") -os.remove("%{_datadir}/lsb/%{lsbrelver}") -os.remove("%{_datadir}/lsb") %files -%{_datadir}/lsb/ - -%files submod-security -%{_datadir}/lsb/%{lsbrelver}/submodules/security-%{lsbrelver}-%{archname} -%{_datadir}/lsb/%{lsbrelver}/submodules/security-%{lsbrelver}-noarch - -%files submod-multimedia -%{_datadir}/lsb/%{lsbrelver}/submodules/multimedia-%{lsbrelver}-%{archname} -%{_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}/*/* %{_bindir}/* #/bin/mailx /bin/redhat_lsb_init /usr/lib/lsb -/%{_lib}/*so* +%{_libdir}/*so* /lib/lsb* -%{_datadir}/lsb/%{lsbrelver}/modules/core -%{_sysconfdir}/lsb-release.d/core* -%{_datadir}/lsb/%{lsbrelver}/submodules/core-%{lsbrelver}-%{archname} -%{_datadir}/lsb/%{lsbrelver}/submodules/core-%{lsbrelver}-noarch %files cxx -%{_sysconfdir}/lsb-release.d/cxx* -%{_datadir}/lsb/%{lsbrelver}/modules/cxx -%{_datadir}/lsb/%{lsbrelver}/submodules/cpp-%{lsbrelver}-%{archname} -%{_datadir}/lsb/%{lsbrelver}/submodules/cpp-%{lsbrelver}-noarch %files desktop -%{_sysconfdir}/lsb-release.d/desktop* -%{_datadir}/lsb/%{lsbrelver}/modules/desktop -%{_datadir}/lsb/%{lsbrelver}/submodules/toolkit-gtk-%{lsbrelver}-%{archname} -%{_datadir}/lsb/%{lsbrelver}/submodules/toolkit-gtk-%{lsbrelver}-noarch -%{_datadir}/lsb/%{lsbrelver}/submodules/toolkit-qt-%{lsbrelver}-%{archname} -%{_datadir}/lsb/%{lsbrelver}/submodules/toolkit-qt-%{lsbrelver}-noarch -%{_datadir}/lsb/%{lsbrelver}/submodules/toolkit-qt3-%{lsbrelver}-%{archname} -%{_datadir}/lsb/%{lsbrelver}/submodules/toolkit-qt3-%{lsbrelver}-noarch -%{_datadir}/lsb/%{lsbrelver}/submodules/xml-%{lsbrelver}-%{archname} -%{_datadir}/lsb/%{lsbrelver}/submodules/xml-%{lsbrelver}-noarch -%{_datadir}/lsb/%{lsbrelver}/submodules/desktop-misc-%{lsbrelver}-%{archname} -%{_datadir}/lsb/%{lsbrelver}/submodules/desktop-misc-%{lsbrelver}-noarch -%{_datadir}/lsb/%{lsbrelver}/submodules/graphics-%{lsbrelver}-%{archname} -%{_datadir}/lsb/%{lsbrelver}/submodules/graphics-%{lsbrelver}-noarch -%{_datadir}/lsb/%{lsbrelver}/submodules/graphics-ext-%{lsbrelver}-%{archname} -%{_datadir}/lsb/%{lsbrelver}/submodules/graphics-ext-%{lsbrelver}-noarch %files languages -%{_sysconfdir}/lsb-release.d/languages* -%{_datadir}/lsb/%{lsbrelver}/modules/languages -%{_datadir}/lsb/%{lsbrelver}/submodules/perl-%{lsbrelver}-%{archname} -%{_datadir}/lsb/%{lsbrelver}/submodules/perl-%{lsbrelver}-noarch %{perl_vendorlib}/Locale/Constants.pm %{perl_vendorlib}/Locale/Constants.pod -%{_datadir}/lsb/%{lsbrelver}/submodules/python-%{lsbrelver}-%{archname} -%{_datadir}/lsb/%{lsbrelver}/submodules/python-%{lsbrelver}-noarch %files printing -%{_sysconfdir}/lsb-release.d/printing* -%{_datadir}/lsb/%{lsbrelver}/modules/printing -%{_datadir}/lsb/%{lsbrelver}/submodules/printing-%{lsbrelver}-%{archname} -%{_datadir}/lsb/%{lsbrelver}/submodules/printing-%{lsbrelver}-noarch - -%files trialuse -%{_sysconfdir}/lsb-release.d/trialuse* -%{_datadir}/lsb/%{lsbrelver}/modules/trialuse %files supplemental #no files, just dependencies From 579f823012e22c76e37200dea315f3795132db60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Mon, 10 Apr 2023 04:05:10 +0100 Subject: [PATCH 27/53] add changelog --- redhat-lsb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/redhat-lsb.spec b/redhat-lsb.spec index 82a53a5..8610752 100644 --- a/redhat-lsb.spec +++ b/redhat-lsb.spec @@ -77,7 +77,7 @@ Summary: Implementation of Linux Standard Base specification Name: redhat-lsb Version: 4.1 -Release: 60%{?dist} +Release: 61%{?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 @@ -540,6 +540,9 @@ cp -p redhat_lsb_init $RPM_BUILD_ROOT/bin/redhat_lsb_init %changelog +* Mon Apr 10 2023 Sérgio Basto - 4.1-61 +- Remove "Trial Use" specs, because LSB 5.0 Trial Use is completely outdated + * Fri Jan 20 2023 Fedora Release Engineering - 4.1-60 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From ad7864c7228e04fbe488f183177aecf39291f1ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Mon, 10 Apr 2023 10:30:27 +0100 Subject: [PATCH 28/53] Remove mailx hacking --- redhat-lsb.spec | 9 --------- 1 file changed, 9 deletions(-) diff --git a/redhat-lsb.spec b/redhat-lsb.spec index 8610752..2765b5d 100644 --- a/redhat-lsb.spec +++ b/redhat-lsb.spec @@ -460,14 +460,6 @@ to be on LSB conforming system. cd lsb-release-%{upstreamlsbrelver} %make_build -%pre -# remove the extra symlink /bin/mailx -> /bin/mail -if [ -e /bin/mailx ]; then - if [ -L /bin/mailx ]; then - rm -f /bin/mailx - fi -fi - %install # LSB uses /usr/lib rather than /usr/lib64 even for 64bit OS mkdir -p $RPM_BUILD_ROOT%{_sysconfdir} $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_mandir} \ @@ -519,7 +511,6 @@ cp -p redhat_lsb_init $RPM_BUILD_ROOT/bin/redhat_lsb_init %{_sysconfdir}/redhat-lsb %{_mandir}/*/* %{_bindir}/* -#/bin/mailx /bin/redhat_lsb_init /usr/lib/lsb %{_libdir}/*so* From 4c63167ae4b02ef6bc4f417469e32acd3f7c544f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Mon, 10 Apr 2023 10:34:36 +0100 Subject: [PATCH 29/53] Clean trailing white spaces --- redhat-lsb.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/redhat-lsb.spec b/redhat-lsb.spec index 2765b5d..12a588b 100644 --- a/redhat-lsb.spec +++ b/redhat-lsb.spec @@ -313,9 +313,9 @@ Provides: lsb-cxx-noarch = %{version}-%{release} %description cxx The Linux Standard Base (LSB) CXX module supports the core interfaces by -providing system interfaces, libraries, and a runtime environment for -applications built using the C++ programming language. These interfaces -provide low-level support for the core constructs of the language, and +providing system interfaces, libraries, and a runtime environment for +applications built using the C++ programming language. These interfaces +provide low-level support for the core constructs of the language, and implement the standard base C++ libraries. %package desktop @@ -434,7 +434,7 @@ Provides: lsb-printing-noarch = %{version}-%{release} Obsoletes: redhat-lsb-printing < %{version}-%{release} %description printing -The Linux Standard Base (LSB) Printing specifications define components that +The Linux Standard Base (LSB) Printing specifications define components that are required to be present on an LSB conforming system. %package supplemental From c4ee3e5fb2f8e00623d9f772193224414c11918b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 16:41:03 +0000 Subject: [PATCH 30/53] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- redhat-lsb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/redhat-lsb.spec b/redhat-lsb.spec index 12a588b..ff29e2f 100644 --- a/redhat-lsb.spec +++ b/redhat-lsb.spec @@ -77,7 +77,7 @@ Summary: Implementation of Linux Standard Base specification Name: redhat-lsb Version: 4.1 -Release: 61%{?dist} +Release: 62%{?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 @@ -531,6 +531,9 @@ cp -p redhat_lsb_init $RPM_BUILD_ROOT/bin/redhat_lsb_init %changelog +* Fri Jul 21 2023 Fedora Release Engineering - 4.1-62 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Mon Apr 10 2023 Sérgio Basto - 4.1-61 - Remove "Trial Use" specs, because LSB 5.0 Trial Use is completely outdated From 96822c937990fb95ca8343d1102bc6146e2fabaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sun, 23 Apr 2023 07:44:02 +0100 Subject: [PATCH 31/53] Centos-8 package merged and ncurses-compat-libs is back drop qt3 (#1298936) --- redhat-lsb.spec | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/redhat-lsb.spec b/redhat-lsb.spec index ff29e2f..c036311 100644 --- a/redhat-lsb.spec +++ b/redhat-lsb.spec @@ -149,12 +149,8 @@ Requires: glibc-common Requires: libgcc%{?_isa} #LSB requires libcrypt.so.1 Requires: libxcrypt-compat%{?_isa} -%if 0%{?fedora} > 36 -Requires: ncurses-libs%{?_isa} -%else #LSB requires libncurses.so.5 for some reason Requires: ncurses-compat-libs%{?_isa} -%endif Requires: pam%{?_isa} Requires: zlib%{?_isa} @@ -355,11 +351,11 @@ Requires: gdk-pixbuf2%{?_isa} Requires: glib2%{?_isa} Requires: gtk2%{?_isa} Requires: pango%{?_isa} -# toolkit-qt +%if 0%{?fedora} || 0%{?epel} +# toolkit-qt is not in rhel Requires: qt%{?_isa} Requires: qt-x11%{?_isa} -# toolkit-qt3 -Requires: qt3%{?_isa} +%endif # xml Requires: libxml2%{?_isa} Requires: redhat-lsb-core%{?_isa} = %{version}-%{release} @@ -408,8 +404,8 @@ Requires: perl(File::CheckTree) Requires: perl(Sys::Syslog) Requires: perl(Getopt::Long) -# python -Requires: /usr/bin/python +# python3 +Requires: /usr/bin/python3 # java Requires: redhat-lsb-core%{?_isa} = %{version}-%{release} From f67bc37a0120db0ba2a922e7101be9c7152bc04a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Mon, 10 Apr 2023 01:38:43 +0100 Subject: [PATCH 32/53] redhat-lsb 5.0 with new source location --- .gitignore | 1 + lsb-release-2.0-disable-etc-lsb-release.patch | 26 ---- lsb-release-3.1-update-init-functions.patch | 32 ----- redhat-lsb-lsb_start_daemon-fix.patch | 43 ------- redhat-lsb-snapshot.sh | 23 ++++ redhat-lsb.spec | 113 ++++++++++-------- sources | 2 +- 7 files changed, 89 insertions(+), 151 deletions(-) delete mode 100644 lsb-release-2.0-disable-etc-lsb-release.patch delete mode 100644 lsb-release-3.1-update-init-functions.patch delete mode 100644 redhat-lsb-lsb_start_daemon-fix.patch create mode 100755 redhat-lsb-snapshot.sh diff --git a/.gitignore b/.gitignore index 997938c..73501a5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ redhat-lsb-4.0-1.tar.bz2 /redhat-lsb-4.1-1.tar.bz2 +/redhat-lsb-20231006git92f8ab57.tar.gz diff --git a/lsb-release-2.0-disable-etc-lsb-release.patch b/lsb-release-2.0-disable-etc-lsb-release.patch deleted file mode 100644 index 49db48d..0000000 --- a/lsb-release-2.0-disable-etc-lsb-release.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- lsb-release-2.0.orig/lsb_release 2004-07-01 03:30:34.000000000 +1000 -+++ lsb-release-2.0/lsb_release 2005-08-03 23:31:58.000000000 +1000 -@@ -188,15 +188,6 @@ - - # Get/Init LSB infos (maybe Distrib infos too) - GetLSBInfo() { -- if [ -f "$INFO_ROOT/$INFO_LSB_FILE" ] -- then -- # should init at least LSB_VERSION -- . "$INFO_ROOT/$INFO_LSB_FILE" -- fi -- if [ -z "$LSB_VERSION" ] -- then -- LSB_VERSION=$MSG_NA -- else - # if we found LSB_VERSION, continue to look in directory - if [ -d "$INFO_ROOT/$INFO_LSB_DIR" ] - then -@@ -205,7 +196,6 @@ - LSB_VERSION=$LSB_VERSION:`basename $tag` - done - fi -- fi - } - - # Get the whole distrib information string (from ARG $1 file) diff --git a/lsb-release-3.1-update-init-functions.patch b/lsb-release-3.1-update-init-functions.patch deleted file mode 100644 index 1211cb7..0000000 --- a/lsb-release-3.1-update-init-functions.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -urN redhat-lsb-3.1/init-functions redhat-lsb-3.1.mod/init-functions ---- redhat-lsb-3.1/init-functions 2006-12-06 12:24:29.000000000 +1000 -+++ redhat-lsb-3.1.mod/init-functions 2007-06-26 15:41:35.000000000 +1000 -@@ -1,6 +1,10 @@ - #!/bin/sh - - # LSB initscript functions, as defined in the LSB Spec 1.1.0 -+# -+# Lawrence Lim - Tue, 26 June 2007 -+# Updated to the latest LSB 3.1 spec -+# http://refspecs.freestandards.org/LSB_3.1.0/LSB-Core-generic/LSB-Core-generic_lines.txt - - start_daemon () { - /etc/redhat-lsb/lsb_start_daemon "$@" -@@ -10,7 +14,7 @@ - /etc/redhat-lsb/lsb_killproc "$@" - } - --pidofprof () { -+pidofproc () { - /etc/redhat-lsb/lsb_pidofproc "$@" - } - -@@ -22,7 +26,7 @@ - /etc/redhat-lsb/lsb_log_message failure "$@" - } - --log_warning_message () { -+log_warning_msg () { - /etc/redhat-lsb/lsb_log_message warning "$@" - } - diff --git a/redhat-lsb-lsb_start_daemon-fix.patch b/redhat-lsb-lsb_start_daemon-fix.patch deleted file mode 100644 index 69f5f28..0000000 --- a/redhat-lsb-lsb_start_daemon-fix.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -up redhat-lsb-3.1/lsb_start_daemon.orig redhat-lsb-3.1/lsb_start_daemon ---- redhat-lsb-3.1/lsb_start_daemon.orig 2009-05-15 11:20:17.000000000 -0400 -+++ redhat-lsb-3.1/lsb_start_daemon 2009-05-15 11:33:03.000000000 -0400 -@@ -4,6 +4,9 @@ - - nice= - force= -+pidfile= -+user= -+check= - RETVAL= - while [ "$1" != "${1##[-+]}" ]; do - case $1 in -@@ -15,7 +18,28 @@ while [ "$1" != "${1##[-+]}" ]; do - nice=$2 - shift 2 - ;; -+ -p) -+ pidfile="--pidfile $2" -+ shift 2 -+ ;; -+ -u) -+ user="--user $2" -+ shift 2 -+ ;; -+ -c) -+ check="--check $2" -+ shift 2 -+ ;; -+ *) -+ echo "Unknown Option $1" -+ echo "Options are:" -+ echo "-f" -+ echo "-p {pidfile}" -+ echo "-n [+/-nicelevel]" -+ echo "-u {user}" -+ echo "-c {base}" -+ exit 1;; - esac - done --LSB=LSB-1.1 daemon ${force:-} ${nice:-} $* -+LSB=LSB-1.1 daemon ${force:-} ${nice:-} ${pidfile:-} ${user:-} ${check:-} $* - exit $? diff --git a/redhat-lsb-snapshot.sh b/redhat-lsb-snapshot.sh new file mode 100755 index 0000000..d2e09a7 --- /dev/null +++ b/redhat-lsb-snapshot.sh @@ -0,0 +1,23 @@ +package=redhat-lsb +branch=main +commit=HEAD + +if [ ! -d redhat-lsb.pagure ]; then + git clone ssh://git@pagure.io/redhat-lsb.git redhat-lsb.pagure +fi + +pushd redhat-lsb.pagure +tag=$(git rev-list HEAD -n 1 | cut -c 1-8) +date=$(git log -1 --format=%cd --date=short | tr -d \-) +git archive --prefix="${package}-${date}git${tag}/" --format=tar ${branch} | gzip > ../${package}-${date}git${tag}.tar.gz +popd + +echo \# globals for ${package}-${date}git${tag}.tar.gz +echo %global gitdate ${date} +echo %global gitversion ${tag} + +sed -i "s|^# globals for .*|# globals for ${package}-${date}git${tag}.tar.gz|" redhat-lsb.spec +sed -i "s|^%global gitdate .*|%global gitdate ${date}|" redhat-lsb.spec +sed -i "s|^%global gitversion .*|%global gitversion ${tag}|" redhat-lsb.spec + +echo fedpkg new-sources $(spectool -l --sources redhat-lsb.spec | sed 's/.*: //;s/.*\///') diff --git a/redhat-lsb.spec b/redhat-lsb.spec index c036311..fec6993 100644 --- a/redhat-lsb.spec +++ b/redhat-lsb.spec @@ -1,3 +1,10 @@ +# globals for redhat-lsb-20231006git92f8ab57.tar.gz +%global gitdate 20231006 +%global gitversion 92f8ab57 + +%global snapshot %{gitdate}git%{gitversion} +%global gver .%{gitdate}git%{gitversion} + # Define this to link to which library version eg. /lib64/ld-lsb-x86-64.so.3 %global lsbsover 3 @@ -56,15 +63,8 @@ %global lsbldso ld-lsb-aarch64.so %endif -%ifarch ia64 ppc64 s390x x86_64 -%global qual ()(64bit) -%else -%global qual %{nil} -%endif - %global upstreamlsbrelver 2.0 -%global lsbrelver 4.1 -%global srcrelease 1 +%global lsbrelver 5.0 # for >= f28, __brp_ldconfig is added in __os_install_post, it removes the symlink %%{lsbldso} # and thus leading to the FTBS. @@ -76,12 +76,11 @@ Summary: Implementation of Linux Standard Base specification Name: redhat-lsb -Version: 4.1 -Release: 62%{?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 +Version: 5.0 +Release: 0.1%{gver}%{?dist} +URL: https://wiki.linuxfoundation.org/lsb/start +# https://github.com/LinuxStandardBase/lsb-samples/ +Source0: redhat-lsb-%{snapshot}.tar.gz License: GPLv2 BuildRequires: make BuildRequires: perl-generators @@ -126,7 +125,7 @@ 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} +Obsoletes: redhat-lsb-trialuse <= 5 Provides: lsb = %{version}-%{release} Provides: lsb-%{archname} = %{version}-%{release} @@ -448,85 +447,101 @@ passing LSB (Linux Standard Base) certification testsuite, but not directly requ to be on LSB conforming system. %prep -%setup -q -%patch0 -p1 -%patch1 -p1 +%setup -q -n redhat-lsb-%{snapshot} %build -cd lsb-release-%{upstreamlsbrelver} +cd lsb_release/src %make_build %install -# LSB uses /usr/lib rather than /usr/lib64 even for 64bit OS -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir} $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_mandir} \ - $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT/usr/lib/lsb \ - $RPM_BUILD_ROOT%{_sbindir} - +pushd redhat-lsb +%make_install # manually add Locale::Constants. This module is just an alias of Locale::Codes::Constants -mkdir -p $RPM_BUILD_ROOT%{perl_vendorlib}/Locale -cp -p Constants.pm $RPM_BUILD_ROOT%{perl_vendorlib}/Locale -cp -p Constants.pod $RPM_BUILD_ROOT%{perl_vendorlib}/Locale +mkdir -p %{buildroot}%{perl_vendorlib}/Locale +cp -p Constants.pm %{buildroot}%{perl_vendorlib}/Locale +cp -p Constants.pod %{buildroot}%{perl_vendorlib}/Locale +popd -%make_install -cd lsb-release-%{upstreamlsbrelver} -make mandir=$RPM_BUILD_ROOT/%{_mandir} prefix=$RPM_BUILD_ROOT/%{_prefix} install -cd .. +pushd lsb_release/src +make mandir=%{buildroot}%{_mandir} prefix=%{buildroot}%{_prefix} install +popd #prepare installation of doc -cp -p lsb-release-2.0/COPYING . -cp -p lsb-release-2.0/README README.lsb_release +cp -p lsb_release/src/COPYING . +cp -p lsb_release/src/README README.lsb_release -for LSBVER in %{lsbsover}; do - ln -snf %{ldso} $RPM_BUILD_ROOT/%{_libdir}/%{lsbldso}.$LSBVER +# modules +mkdir -p %{buildroot}%{_sysconfdir}/lsb-release.d/ +modules="core cxx desktop languages printing" + +core="core security" +cxx="cpp" +desktop="desktop-misc graphics graphics-ext multimedia toolkit-gtk toolkit-qt toolkit-qt3" +desktop="${desktop} xml" +languages="perl python" +printing="printing" +trialuse="security multimedia" + +for mod in ${modules};do + touch $RPM_BUILD_ROOT%{_sysconfdir}/lsb-release.d/${mod}-%{lsbrelver}-%{archname} + touch $RPM_BUILD_ROOT%{_sysconfdir}/lsb-release.d/${mod}-%{lsbrelver}-noarch done -mkdir -p $RPM_BUILD_ROOT/bin +mkdir -p %{buildroot}%{_libdir} +for LSBVER in %{lsbsover}; do + ln -snf %{ldso} %{buildroot}%{_libdir}/%{lsbldso}.$LSBVER +done # LSB uses /usr/lib rather than /usr/lib64 even for 64bit OS -# According to the lsb-core documentation provided by +# According to the lsb-core documentation provided by # http://refspecs.linux-foundation.org/LSB_3.2.0/LSB-Core-generic/LSB-Core-generic.pdf # it's OK to put non binary in /usr/lib. -ln -snf ../../../sbin/chkconfig $RPM_BUILD_ROOT/usr/lib/lsb/install_initd -ln -snf ../../../sbin/chkconfig $RPM_BUILD_ROOT/usr/lib/lsb/remove_initd -#ln -snf mail $RPM_BUILD_ROOT/bin/mailx +ln -snf ../../../sbin/chkconfig %{buildroot}/usr/lib/lsb/install_initd +ln -snf ../../../sbin/chkconfig %{buildroot}/usr/lib/lsb/remove_initd +#ln -snf mail %{buildroot}/bin/mailx -#mkdir -p $RPM_BUILD_ROOT/usr/X11R6/lib/X11/xserver -#ln -snf /usr/%{_lib}/xserver/SecurityPolicy $RPM_BUILD_ROOT/usr/X11R6/lib/X11/xserver/SecurityPolicy -#ln -snf /usr/share/X11/fonts $RPM_BUILD_ROOT/usr/X11R6/lib/X11/fonts -#ln -snf /usr/share/X11/rgb.txt $RPM_BUILD_ROOT/usr/X11R6/lib/X11/rgb.txt - -cp -p redhat_lsb_init $RPM_BUILD_ROOT/bin/redhat_lsb_init +#mkdir -p %{buildroot}/usr/X11R6/lib/X11/xserver +#ln -snf /usr/%{_lib}/xserver/SecurityPolicy %{buildroot}/usr/X11R6/lib/X11/xserver/SecurityPolicy +#ln -snf /usr/share/X11/fonts %{buildroot}/usr/X11R6/lib/X11/fonts +#ln -snf /usr/share/X11/rgb.txt %{buildroot}/usr/X11R6/lib/X11/rgb.txt %files %files core -%doc README README.lsb_release +%doc README.md README.lsb_release %license COPYING %{_sysconfdir}/redhat-lsb +%dir %{_sysconfdir}/lsb-release.d %{_mandir}/*/* %{_bindir}/* -/bin/redhat_lsb_init /usr/lib/lsb %{_libdir}/*so* -/lib/lsb* +%{_sysconfdir}/lsb-release.d/core* %files cxx +%{_sysconfdir}/lsb-release.d/cxx* %files desktop +%{_sysconfdir}/lsb-release.d/desktop* %files languages +%{_sysconfdir}/lsb-release.d/languages* %{perl_vendorlib}/Locale/Constants.pm %{perl_vendorlib}/Locale/Constants.pod %files printing +%{_sysconfdir}/lsb-release.d/printing* %files supplemental #no files, just dependencies %changelog +* Fri Oct 06 2023 Sérgio Basto - 5.0-0.1.20231006git92f8ab57 +- redhat-lsb 5.0 with new source location + * Fri Jul 21 2023 Fedora Release Engineering - 4.1-62 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index c24d88d..1b82379 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9c1e474cb81c0ee1941c3129e0e50ea1 redhat-lsb-4.1-1.tar.bz2 +SHA512 (redhat-lsb-20231006git92f8ab57.tar.gz) = c47767cbcf72ec030faf1327b227c529cb059904a0875525623b0e71860f3b4053a4a020d5c2427e0adec2786b444e6c6b4cec25ced70b558b11d658c6c278a5 From 4d8597730ff396bb49db87a2e7a02639b770b368 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Fri, 6 Oct 2023 16:44:18 +0100 Subject: [PATCH 33/53] Update README.md with actual status --- .gitignore | 2 ++ redhat-lsb-snapshot.sh | 2 ++ redhat-lsb.spec | 9 ++++++--- sources | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 73501a5..7ceefad 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ redhat-lsb-4.0-1.tar.bz2 /redhat-lsb-4.1-1.tar.bz2 /redhat-lsb-20231006git92f8ab57.tar.gz +/redhat-lsb-20231006gita9c49411.tar.gz +/redhat-lsb-20231006git8d00acdc.tar.gz diff --git a/redhat-lsb-snapshot.sh b/redhat-lsb-snapshot.sh index d2e09a7..f2e8df7 100755 --- a/redhat-lsb-snapshot.sh +++ b/redhat-lsb-snapshot.sh @@ -21,3 +21,5 @@ sed -i "s|^%global gitdate .*|%global gitdate ${date}|" redhat-lsb.spec sed -i "s|^%global gitversion .*|%global gitversion ${tag}|" redhat-lsb.spec echo fedpkg new-sources $(spectool -l --sources redhat-lsb.spec | sed 's/.*: //;s/.*\///') +echo \MSG="\"Update README.md with actual status\"" +echo rpmdev-bumpspec -c \"\$MSG\" $(basename $(pwd)).spec diff --git a/redhat-lsb.spec b/redhat-lsb.spec index fec6993..cf15cd1 100644 --- a/redhat-lsb.spec +++ b/redhat-lsb.spec @@ -1,6 +1,6 @@ -# globals for redhat-lsb-20231006git92f8ab57.tar.gz +# globals for redhat-lsb-20231006git8d00acdc.tar.gz %global gitdate 20231006 -%global gitversion 92f8ab57 +%global gitversion 8d00acdc %global snapshot %{gitdate}git%{gitversion} %global gver .%{gitdate}git%{gitversion} @@ -77,7 +77,7 @@ Summary: Implementation of Linux Standard Base specification Name: redhat-lsb Version: 5.0 -Release: 0.1%{gver}%{?dist} +Release: 0.2%{gver}%{?dist} URL: https://wiki.linuxfoundation.org/lsb/start # https://github.com/LinuxStandardBase/lsb-samples/ Source0: redhat-lsb-%{snapshot}.tar.gz @@ -539,6 +539,9 @@ ln -snf ../../../sbin/chkconfig %{buildroot}/usr/lib/lsb/remove_initd %changelog +* Fri Oct 06 2023 Sérgio Basto - 5.0-0.2.20231006gita9c49411 +- Update README.md with actual status + * Fri Oct 06 2023 Sérgio Basto - 5.0-0.1.20231006git92f8ab57 - redhat-lsb 5.0 with new source location diff --git a/sources b/sources index 1b82379..1202e62 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (redhat-lsb-20231006git92f8ab57.tar.gz) = c47767cbcf72ec030faf1327b227c529cb059904a0875525623b0e71860f3b4053a4a020d5c2427e0adec2786b444e6c6b4cec25ced70b558b11d658c6c278a5 +SHA512 (redhat-lsb-20231006git8d00acdc.tar.gz) = c6c357c48fbc7805fd40a69c08f0a64589d57a9c25e9afff6b5a5e7d215ded6a6f16feefd3d5cd79d6ef39e0c2d1a2699860e3feeab37e5349e9cb1fe407b5a6 From 275aaa297b3095c1a6cd07e3058ec5ac32bef9b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sat, 7 Oct 2023 21:30:52 +0100 Subject: [PATCH 34/53] Fix some requires mostly on epel9 --- redhat-lsb.spec | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/redhat-lsb.spec b/redhat-lsb.spec index cf15cd1..3043459 100644 --- a/redhat-lsb.spec +++ b/redhat-lsb.spec @@ -77,7 +77,7 @@ Summary: Implementation of Linux Standard Base specification Name: redhat-lsb Version: 5.0 -Release: 0.2%{gver}%{?dist} +Release: 0.3%{gver}%{?dist} URL: https://wiki.linuxfoundation.org/lsb/start # https://github.com/LinuxStandardBase/lsb-samples/ Source0: redhat-lsb-%{snapshot}.tar.gz @@ -147,7 +147,9 @@ Requires: glibc%{?_isa} Requires: glibc-common Requires: libgcc%{?_isa} #LSB requires libcrypt.so.1 +%if 0%{?fedora} Requires: libxcrypt-compat%{?_isa} +%endif #LSB requires libncurses.so.5 for some reason Requires: ncurses-compat-libs%{?_isa} Requires: pam%{?_isa} @@ -246,7 +248,10 @@ Requires: /usr/bin/paste Requires: /usr/bin/patch Requires: /usr/bin/pathchk #better POSIX conformance of /usr/bin/pax +%if 0%{?fedora} || 0%{?epel} <= 8 +# not available on epel9 Requires: spax +%endif Requires: /usr/bin/pidof Requires: /usr/bin/pr Requires: /usr/bin/printf @@ -350,7 +355,8 @@ Requires: gdk-pixbuf2%{?_isa} Requires: glib2%{?_isa} Requires: gtk2%{?_isa} Requires: pango%{?_isa} -%if 0%{?fedora} || 0%{?epel} +%if 0%{?fedora} +# qt4 not available on epel9 and epel8 # toolkit-qt is not in rhel Requires: qt%{?_isa} Requires: qt-x11%{?_isa} @@ -374,7 +380,6 @@ Summary: LSB Languages module support # Perl and Perl non-builtin modules Requires: /usr/bin/perl Requires: perl(CGI) -Requires: perl(Class::ISA) Requires: perl(CPAN) # Locale::Constants has been Locale::Codes::Costants, so we need # create a /usr/share/perl5/vendor_perl/Constants.pm manually. @@ -389,19 +394,22 @@ Requires: perl(Scalar::Util) 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) +%if 0%{?fedora} || 0%{?epel} <= 8 +Requires: perl(B::Lint) +Requires: perl(Class::ISA) +Requires: perl(File::CheckTree) +Requires: perl(Pod::LaTeX) +Requires: perl(Pod::Plainer) +%endif # python3 Requires: /usr/bin/python3 @@ -539,6 +547,9 @@ ln -snf ../../../sbin/chkconfig %{buildroot}/usr/lib/lsb/remove_initd %changelog +* Sat Oct 07 2023 Sérgio Basto - 5.0-0.3.20231006git8d00acdc +- Fix some requires mostly on epel9 + * Fri Oct 06 2023 Sérgio Basto - 5.0-0.2.20231006gita9c49411 - Update README.md with actual status From 6e69922c79b6b5552e3e54569befd5f753c23ae5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Wed, 25 Oct 2023 01:14:50 +0100 Subject: [PATCH 35/53] Recommends the software which is not available on epel --- redhat-lsb.spec | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/redhat-lsb.spec b/redhat-lsb.spec index 3043459..53f8e8c 100644 --- a/redhat-lsb.spec +++ b/redhat-lsb.spec @@ -77,7 +77,7 @@ Summary: Implementation of Linux Standard Base specification Name: redhat-lsb Version: 5.0 -Release: 0.3%{gver}%{?dist} +Release: 0.4%{gver}%{?dist} URL: https://wiki.linuxfoundation.org/lsb/start # https://github.com/LinuxStandardBase/lsb-samples/ Source0: redhat-lsb-%{snapshot}.tar.gz @@ -147,9 +147,7 @@ Requires: glibc%{?_isa} Requires: glibc-common Requires: libgcc%{?_isa} #LSB requires libcrypt.so.1 -%if 0%{?fedora} Requires: libxcrypt-compat%{?_isa} -%endif #LSB requires libncurses.so.5 for some reason Requires: ncurses-compat-libs%{?_isa} Requires: pam%{?_isa} @@ -251,6 +249,8 @@ Requires: /usr/bin/pathchk %if 0%{?fedora} || 0%{?epel} <= 8 # not available on epel9 Requires: spax +%else +Recommends: spax %endif Requires: /usr/bin/pidof Requires: /usr/bin/pr @@ -360,6 +360,9 @@ Requires: pango%{?_isa} # toolkit-qt is not in rhel Requires: qt%{?_isa} Requires: qt-x11%{?_isa} +%else +Recommends: qt%{?_isa} +Recommends: qt-x11%{?_isa} %endif # xml Requires: libxml2%{?_isa} @@ -409,6 +412,12 @@ Requires: perl(Class::ISA) Requires: perl(File::CheckTree) Requires: perl(Pod::LaTeX) Requires: perl(Pod::Plainer) +%else +Recommends: perl(B::Lint) +Recommends: perl(Class::ISA) +Recommends: perl(File::CheckTree) +Recommends: perl(Pod::LaTeX) +Recommends: perl(Pod::Plainer) %endif # python3 @@ -547,6 +556,9 @@ ln -snf ../../../sbin/chkconfig %{buildroot}/usr/lib/lsb/remove_initd %changelog +* Wed Oct 25 2023 Sérgio Basto - 5.0-0.4.20231006git8d00acdc +- Recommends the software which is not available on epel + * Sat Oct 07 2023 Sérgio Basto - 5.0-0.3.20231006git8d00acdc - Fix some requires mostly on epel9 From fcd7301f2140fc7ff1b680ecaf9d7b92e9e9a397 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Mon, 30 Oct 2023 01:49:59 +0000 Subject: [PATCH 36/53] Obsolete submod packages and use isa tag on PNG --- redhat-lsb.spec | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/redhat-lsb.spec b/redhat-lsb.spec index 53f8e8c..667de8f 100644 --- a/redhat-lsb.spec +++ b/redhat-lsb.spec @@ -126,6 +126,8 @@ Requires: redhat-lsb-desktop%{?_isa} = %{version}-%{release} Requires: redhat-lsb-languages = %{version}-%{release} Requires: redhat-lsb-printing = %{version}-%{release} Obsoletes: redhat-lsb-trialuse <= 5 +Obsoletes: redhat-lsb-submod-multimedia <= 5 +Obsoletes: redhat-lsb-submod-security <= 5 Provides: lsb = %{version}-%{release} Provides: lsb-%{archname} = %{version}-%{release} @@ -339,13 +341,7 @@ Requires: /usr/bin/fc-match Requires: cairo%{?_isa} Requires: freetype%{?_isa} Requires: libjpeg-turbo%{?_isa} - -%ifarch %{ix86} ppc s390 arm -Requires: libpng12.so.0 -%endif -%ifarch x86_64 ppc64 s390x aarch64 ppc64le -Requires: libpng12.so.0()(64bit) -%endif +Requires: libpng12.so.0%{?_isa} Requires: libpng%{?_isa} Requires: libXft%{?_isa} Requires: libXrender%{?_isa} From 755ae4eef69aedf6e18b92ea4f1167a8246e3f22 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 11:09:15 +0000 Subject: [PATCH 37/53] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- redhat-lsb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/redhat-lsb.spec b/redhat-lsb.spec index 667de8f..16478dd 100644 --- a/redhat-lsb.spec +++ b/redhat-lsb.spec @@ -77,7 +77,7 @@ Summary: Implementation of Linux Standard Base specification Name: redhat-lsb Version: 5.0 -Release: 0.4%{gver}%{?dist} +Release: 0.5%{gver}%{?dist} URL: https://wiki.linuxfoundation.org/lsb/start # https://github.com/LinuxStandardBase/lsb-samples/ Source0: redhat-lsb-%{snapshot}.tar.gz @@ -552,6 +552,9 @@ ln -snf ../../../sbin/chkconfig %{buildroot}/usr/lib/lsb/remove_initd %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 5.0-0.5.20231006git8d00acdc +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Oct 25 2023 Sérgio Basto - 5.0-0.4.20231006git8d00acdc - Recommends the software which is not available on epel From 60483108ed264495aeb342534efdf62ef05b581b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jan 2024 15:00:57 +0000 Subject: [PATCH 38/53] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- redhat-lsb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/redhat-lsb.spec b/redhat-lsb.spec index 16478dd..1a2a96b 100644 --- a/redhat-lsb.spec +++ b/redhat-lsb.spec @@ -77,7 +77,7 @@ Summary: Implementation of Linux Standard Base specification Name: redhat-lsb Version: 5.0 -Release: 0.5%{gver}%{?dist} +Release: 0.6%{gver}%{?dist} URL: https://wiki.linuxfoundation.org/lsb/start # https://github.com/LinuxStandardBase/lsb-samples/ Source0: redhat-lsb-%{snapshot}.tar.gz @@ -552,6 +552,9 @@ ln -snf ../../../sbin/chkconfig %{buildroot}/usr/lib/lsb/remove_initd %changelog +* Fri Jan 26 2024 Fedora Release Engineering - 5.0-0.6.20231006git8d00acdc +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Mon Jan 22 2024 Fedora Release Engineering - 5.0-0.5.20231006git8d00acdc - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From af8e1f64209356057412fa13e686ea93180a610a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Wed, 7 Feb 2024 01:03:04 +0000 Subject: [PATCH 39/53] Remove require of libpng12.so.0, to fix FTI - lsb-desktop already require libpng - redhat-lsb now provides lsb_release, in future maybe we can remove the rest since LSB 5.0 is out of date, so compliance is not possible because various components are missing from Fedora. - more cleanups --- redhat-lsb.spec | 122 +++++++++++++++++++----------------------------- 1 file changed, 48 insertions(+), 74 deletions(-) diff --git a/redhat-lsb.spec b/redhat-lsb.spec index 1a2a96b..0095c24 100644 --- a/redhat-lsb.spec +++ b/redhat-lsb.spec @@ -11,56 +11,67 @@ %ifarch %{ix86} %global ldso ld-linux.so.2 %global lsbldso ld-lsb.so +%global archname ia32 %endif %ifarch alpha %global ldso ld-linux-alpha.so.2 %global lsbldso ld-lsb-alpha.so +%define archname alpha %endif %ifarch ia64 %global ldso ld-linux-ia64.so.2 %global lsbldso ld-lsb-ia64.so +%global archname ia64 %endif %ifarch ppc %global ldso ld.so.1 %global lsbldso ld-lsb-ppc32.so +%global archname ppc32 %endif %ifarch ppc64 %global ldso ld64.so.1 %global lsbldso ld-lsb-ppc64.so +%global archname ppc64 %endif %ifarch ppc64le %global ldso ld64.so.2 %global lsbldso ld-lsb-ppc64le.so +%global archname ppc64le %endif %ifarch s390 %global ldso ld.so.1 %global lsbldso ld-lsb-s390.so +%global archname s390 %endif %ifarch s390x %global ldso ld64.so.1 %global lsbldso ld-lsb-s390x.so +%global archname s390x %endif %ifarch x86_64 %global ldso ld-linux-x86-64.so.2 %global lsbldso ld-lsb-x86-64.so +%global archname amd64 %endif %ifarch %{arm} %global ldso ld-linux.so.2 %global lsbldso ld-lsb-arm.so +%global archname arm %endif %ifarch aarch64 %global ldso ld-linux-aarch64.so.1 %global lsbldso ld-lsb-aarch64.so +%global archname aarch64 %endif %global upstreamlsbrelver 2.0 @@ -77,7 +88,7 @@ Summary: Implementation of Linux Standard Base specification Name: redhat-lsb Version: 5.0 -Release: 0.6%{gver}%{?dist} +Release: 0.7%{gver}%{?dist} URL: https://wiki.linuxfoundation.org/lsb/start # https://github.com/LinuxStandardBase/lsb-samples/ Source0: redhat-lsb-%{snapshot}.tar.gz @@ -86,56 +97,16 @@ BuildRequires: make BuildRequires: perl-generators BuildRequires: perl(Getopt::Long) -%ifarch %{ix86} -%global archname ia32 -%endif -%ifarch ia64 -%global archname ia64 -%endif -%ifarch ppc -%global archname ppc32 -%endif -%ifarch ppc64 -%global archname ppc64 -%endif -%ifarch ppc64le -%global archname ppc64le -%endif -%ifarch s390 -%global archname s390 -%endif -%ifarch s390x -%global archname s390x -%endif -%ifarch x86_64 -%global archname amd64 -%endif -%ifarch %{arm} -%global archname arm -%endif -%ifarch aarch64 -%global archname aarch64 -%endif -%ifarch alpha -%define archname alpha -%endif - -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} +Provides: lsb = %{version}-%{release} +Provides: lsb-%{archname} = %{version}-%{release} +Provides: lsb-noarch = %{version}-%{release} Obsoletes: redhat-lsb-trialuse <= 5 Obsoletes: redhat-lsb-submod-multimedia <= 5 Obsoletes: redhat-lsb-submod-security <= 5 -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 -will increase compatibility among Linux distributions. It is designed to be +will increase compatibility among Linux distributions. It is designed to be binary-compatible and produce a stable application binary interface (ABI) for independent software vendors. The lsb package provides utilities, libraries etc. needed for LSB Compliant @@ -144,6 +115,10 @@ components required by the LSB are installed on the system. %package core Summary: LSB Core module support +Requires: redhat-lsb = %{version}-%{release} +Provides: lsb-core-%{archname} = %{version}-%{release} +Provides: lsb-core-noarch = %{version}-%{release} + # gLSB Library Requires: glibc%{?_isa} Requires: glibc-common @@ -296,10 +271,6 @@ Requires: /usr/bin/wc Requires: /usr/bin/xargs Requires: /usr/bin/zcat -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 system interfaces, libraries, and runtime environment upon which all conforming @@ -307,12 +278,12 @@ applications and libraries depend. %package cxx Summary: LSB CXX module support -Requires: libstdc++%{?_isa} Requires: redhat-lsb-core%{?_isa} = %{version}-%{release} - Provides: lsb-cxx-%{archname} = %{version}-%{release} Provides: lsb-cxx-noarch = %{version}-%{release} +Requires: libstdc++%{?_isa} + %description cxx The Linux Standard Base (LSB) CXX module supports the core interfaces by providing system interfaces, libraries, and a runtime environment for @@ -322,6 +293,13 @@ implement the standard base C++ libraries. %package desktop Summary: LSB Desktop module support +Requires: redhat-lsb-core%{?_isa} = %{version}-%{release} +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} + Requires: xdg-utils # LSB_Graphics library Requires: libICE%{?_isa} @@ -341,7 +319,6 @@ Requires: /usr/bin/fc-match Requires: cairo%{?_isa} Requires: freetype%{?_isa} Requires: libjpeg-turbo%{?_isa} -Requires: libpng12.so.0%{?_isa} Requires: libpng%{?_isa} Requires: libXft%{?_isa} Requires: libXrender%{?_isa} @@ -362,13 +339,6 @@ Recommends: qt-x11%{?_isa} %endif # xml Requires: libxml2%{?_isa} -Requires: redhat-lsb-core%{?_isa} = %{version}-%{release} - -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 @@ -376,6 +346,10 @@ required to be present on an LSB conforming system. %package languages Summary: LSB Languages module support +Requires: redhat-lsb-core%{?_isa} = %{version}-%{release} +Provides: lsb-languages-%{archname} = %{version}-%{release} +Provides: lsb-languages-noarch = %{version}-%{release} + # Perl and Perl non-builtin modules Requires: /usr/bin/perl Requires: perl(CGI) @@ -415,14 +389,9 @@ Recommends: perl(File::CheckTree) Recommends: perl(Pod::LaTeX) Recommends: perl(Pod::Plainer) %endif - # python3 Requires: /usr/bin/python3 # java -Requires: redhat-lsb-core%{?_isa} = %{version}-%{release} - -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 @@ -430,16 +399,15 @@ languages which are found on an LSB conforming system. %package printing Summary: LSB Printing module support +Requires: redhat-lsb-core%{?_isa} = %{version}-%{release} +Provides: lsb-printing-%{archname} = %{version}-%{release} +Provides: lsb-printing-noarch = %{version}-%{release} + # 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}-%{release} - -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 @@ -521,15 +489,15 @@ ln -snf ../../../sbin/chkconfig %{buildroot}/usr/lib/lsb/remove_initd %files - -%files core %doc README.md README.lsb_release %license COPYING %{_sysconfdir}/redhat-lsb -%dir %{_sysconfdir}/lsb-release.d -%{_mandir}/*/* -%{_bindir}/* +%{_mandir}/*/lsb_release* +%{_bindir}/lsb_release /usr/lib/lsb + +%files core +%dir %{_sysconfdir}/lsb-release.d %{_libdir}/*so* %{_sysconfdir}/lsb-release.d/core* @@ -552,6 +520,12 @@ ln -snf ../../../sbin/chkconfig %{buildroot}/usr/lib/lsb/remove_initd %changelog +* Tue Feb 06 2024 Sérgio Basto - 5.0-0.7.20231006git8d00acdc +- Remove require of libpng12.so.0, lsb-desktop already require libpng +- redhat-lsb now provides lsb_release, in future maybe we can remove the rest since LSB 5.0 is out of date, so + compliance is not possible because various components are missing from Fedora. +- more cleanups + * Fri Jan 26 2024 Fedora Release Engineering - 5.0-0.6.20231006git8d00acdc - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From f3022a48649a0c96f90eb54f7e5786ad3525ce77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Wed, 7 Feb 2024 01:06:34 +0000 Subject: [PATCH 40/53] Report that is not LSB compliance, because various components are missing from Fedora, so compliance is not possible --- redhat-lsb.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/redhat-lsb.spec b/redhat-lsb.spec index 0095c24..89e294d 100644 --- a/redhat-lsb.spec +++ b/redhat-lsb.spec @@ -109,6 +109,12 @@ The Linux Standard Base (LSB) is an attempt to develop a set of standards that will increase compatibility among Linux distributions. It is designed to be binary-compatible and produce a stable application binary interface (ABI) for independent software vendors. + +This package is not compliance with LSB, because various components are missing +from Fedora, so compliance is not possible. +Fedora explicitly declines add support the missing components of LSB 5.0 or +earlier because they are complely obsolete. + The lsb package provides utilities, libraries etc. needed for LSB Compliant Applications. It also contains requirements that will ensure that all components required by the LSB are installed on the system. @@ -522,9 +528,9 @@ ln -snf ../../../sbin/chkconfig %{buildroot}/usr/lib/lsb/remove_initd %changelog * Tue Feb 06 2024 Sérgio Basto - 5.0-0.7.20231006git8d00acdc - Remove require of libpng12.so.0, lsb-desktop already require libpng -- redhat-lsb now provides lsb_release, in future maybe we can remove the rest since LSB 5.0 is out of date, so - compliance is not possible because various components are missing from Fedora. +- redhat-lsb now provides lsb_release, in future maybe we can remove the rest since LSB 5.0 is out of date - more cleanups +- Report that is not LSB compliance, because various components are missing from Fedora, so compliance is not possible * Fri Jan 26 2024 Fedora Release Engineering - 5.0-0.6.20231006git8d00acdc - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 71cf4513374be8ebd51d2786db564d3827cc1a70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Wed, 7 Feb 2024 01:24:23 +0000 Subject: [PATCH 41/53] fix typo --- redhat-lsb.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/redhat-lsb.spec b/redhat-lsb.spec index 89e294d..2410fdc 100644 --- a/redhat-lsb.spec +++ b/redhat-lsb.spec @@ -113,7 +113,7 @@ independent software vendors. This package is not compliance with LSB, because various components are missing from Fedora, so compliance is not possible. Fedora explicitly declines add support the missing components of LSB 5.0 or -earlier because they are complely obsolete. +earlier because they are completely obsolete. The lsb package provides utilities, libraries etc. needed for LSB Compliant Applications. It also contains requirements that will ensure that all From 1e1606689cb19018d7952f6c1dec01bbda124c27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Wed, 14 Feb 2024 16:41:48 +0000 Subject: [PATCH 42/53] revert commit 6e69922 and not recommends the software which is not available on epel --- redhat-lsb.spec | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/redhat-lsb.spec b/redhat-lsb.spec index 2410fdc..9941322 100644 --- a/redhat-lsb.spec +++ b/redhat-lsb.spec @@ -232,8 +232,6 @@ Requires: /usr/bin/pathchk %if 0%{?fedora} || 0%{?epel} <= 8 # not available on epel9 Requires: spax -%else -Recommends: spax %endif Requires: /usr/bin/pidof Requires: /usr/bin/pr @@ -339,9 +337,6 @@ Requires: pango%{?_isa} # toolkit-qt is not in rhel Requires: qt%{?_isa} Requires: qt-x11%{?_isa} -%else -Recommends: qt%{?_isa} -Recommends: qt-x11%{?_isa} %endif # xml Requires: libxml2%{?_isa} @@ -388,12 +383,6 @@ Requires: perl(Class::ISA) Requires: perl(File::CheckTree) Requires: perl(Pod::LaTeX) Requires: perl(Pod::Plainer) -%else -Recommends: perl(B::Lint) -Recommends: perl(Class::ISA) -Recommends: perl(File::CheckTree) -Recommends: perl(Pod::LaTeX) -Recommends: perl(Pod::Plainer) %endif # python3 Requires: /usr/bin/python3 From 4864b5fe44710456c6aa61842bd29b2462ea3413 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sat, 17 Feb 2024 15:41:38 +0000 Subject: [PATCH 43/53] Globalize disclamer --- redhat-lsb.spec | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/redhat-lsb.spec b/redhat-lsb.spec index 9941322..9dd4626 100644 --- a/redhat-lsb.spec +++ b/redhat-lsb.spec @@ -76,6 +76,13 @@ %global upstreamlsbrelver 2.0 %global lsbrelver 5.0 +%global disclaimer This package is not compliance with LSB, because various \ +components are missing from Fedora or EPEL, so compliance is not possible. \ +Fedora or EPEL explicitly declines add support the missing components from LSB \ +5.0 or earlier because these components are very outdated and have been \ +removed from the repositories and possibly replaced with new ones. \ +This package tries its best to comply with the LSB. Hoping to be helpful and \ +continue to support the LSB project and software that uses it # for >= f28, __brp_ldconfig is added in __os_install_post, it removes the symlink %%{lsbldso} # and thus leading to the FTBS. @@ -88,7 +95,7 @@ Summary: Implementation of Linux Standard Base specification Name: redhat-lsb Version: 5.0 -Release: 0.7%{gver}%{?dist} +Release: 0.8%{gver}%{?dist} URL: https://wiki.linuxfoundation.org/lsb/start # https://github.com/LinuxStandardBase/lsb-samples/ Source0: redhat-lsb-%{snapshot}.tar.gz @@ -110,10 +117,7 @@ will increase compatibility among Linux distributions. It is designed to be binary-compatible and produce a stable application binary interface (ABI) for independent software vendors. -This package is not compliance with LSB, because various components are missing -from Fedora, so compliance is not possible. -Fedora explicitly declines add support the missing components of LSB 5.0 or -earlier because they are completely obsolete. +%{disclaimer} The lsb package provides utilities, libraries etc. needed for LSB Compliant Applications. It also contains requirements that will ensure that all @@ -276,10 +280,13 @@ Requires: /usr/bin/xargs Requires: /usr/bin/zcat %description core +%{disclaimer} + The Linux Standard Base (LSB) Core module support provides the fundamental system interfaces, libraries, and runtime environment upon which all conforming applications and libraries depend. + %package cxx Summary: LSB CXX module support Requires: redhat-lsb-core%{?_isa} = %{version}-%{release} @@ -289,6 +296,8 @@ Provides: lsb-cxx-noarch = %{version}-%{release} Requires: libstdc++%{?_isa} %description cxx +%{disclaimer} + The Linux Standard Base (LSB) CXX module supports the core interfaces by providing system interfaces, libraries, and a runtime environment for applications built using the C++ programming language. These interfaces @@ -342,6 +351,8 @@ Requires: qt-x11%{?_isa} Requires: libxml2%{?_isa} %description desktop +%{disclaimer} + The Linux Standard Base (LSB) Desktop Specifications define components that are required to be present on an LSB conforming system. @@ -389,6 +400,8 @@ Requires: /usr/bin/python3 # java %description languages +%{disclaimer} + The Linux Standard Base (LSB) Languages module supports components for runtime languages which are found on an LSB conforming system. @@ -418,6 +431,8 @@ Requires: sil-abyssinica-fonts Requires: xorg-x11-server-Xvfb %description supplemental +%{disclaimer} + 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. @@ -515,6 +530,9 @@ ln -snf ../../../sbin/chkconfig %{buildroot}/usr/lib/lsb/remove_initd %changelog +* Sat Feb 17 2024 Sérgio Basto - 5.0-0.8.20231006git8d00acdc +- Globalize disclamer + * Tue Feb 06 2024 Sérgio Basto - 5.0-0.7.20231006git8d00acdc - Remove require of libpng12.so.0, lsb-desktop already require libpng - redhat-lsb now provides lsb_release, in future maybe we can remove the rest since LSB 5.0 is out of date From 0be7fdce778b5b4727da57b984d12d5260be9b13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sat, 17 Feb 2024 20:58:56 +0000 Subject: [PATCH 44/53] Add Requires of ncurses which includes infocmp, tic and tput --- redhat-lsb.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/redhat-lsb.spec b/redhat-lsb.spec index 9dd4626..50640ff 100644 --- a/redhat-lsb.spec +++ b/redhat-lsb.spec @@ -137,6 +137,11 @@ Requires: libgcc%{?_isa} Requires: libxcrypt-compat%{?_isa} #LSB requires libncurses.so.5 for some reason Requires: ncurses-compat-libs%{?_isa} +# ncurses includes +# infocmp +# tic +# tput +Requires: ncurses Requires: pam%{?_isa} Requires: zlib%{?_isa} @@ -532,6 +537,7 @@ ln -snf ../../../sbin/chkconfig %{buildroot}/usr/lib/lsb/remove_initd %changelog * Sat Feb 17 2024 Sérgio Basto - 5.0-0.8.20231006git8d00acdc - Globalize disclamer +- Add Requires of ncurses which includes infocmp, tic and tput * Tue Feb 06 2024 Sérgio Basto - 5.0-0.7.20231006git8d00acdc - Remove require of libpng12.so.0, lsb-desktop already require libpng From 1a8e0792e2ecd4a85e79d40c9fcba967eb854281 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sat, 2 Mar 2024 22:54:42 +0000 Subject: [PATCH 45/53] Add conflicts required by Fedora package guidelines --- redhat-lsb.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/redhat-lsb.spec b/redhat-lsb.spec index 50640ff..1fa31a8 100644 --- a/redhat-lsb.spec +++ b/redhat-lsb.spec @@ -95,7 +95,7 @@ continue to support the LSB project and software that uses it Summary: Implementation of Linux Standard Base specification Name: redhat-lsb Version: 5.0 -Release: 0.8%{gver}%{?dist} +Release: 0.9%{gver}%{?dist} URL: https://wiki.linuxfoundation.org/lsb/start # https://github.com/LinuxStandardBase/lsb-samples/ Source0: redhat-lsb-%{snapshot}.tar.gz @@ -107,9 +107,10 @@ BuildRequires: perl(Getopt::Long) Provides: lsb = %{version}-%{release} Provides: lsb-%{archname} = %{version}-%{release} Provides: lsb-noarch = %{version}-%{release} -Obsoletes: redhat-lsb-trialuse <= 5 -Obsoletes: redhat-lsb-submod-multimedia <= 5 -Obsoletes: redhat-lsb-submod-security <= 5 +Obsoletes: redhat-lsb-trialuse < 5 +Obsoletes: redhat-lsb-submod-multimedia < 5 +Obsoletes: redhat-lsb-submod-security < 5 +Conflicts: lsb_release %description The Linux Standard Base (LSB) is an attempt to develop a set of standards that @@ -535,6 +536,9 @@ ln -snf ../../../sbin/chkconfig %{buildroot}/usr/lib/lsb/remove_initd %changelog +* Sat Mar 02 2024 Sérgio Basto - 5.0-0.9.20231006git8d00acdc +- Add conflicts required by Fedora package guidelines + * Sat Feb 17 2024 Sérgio Basto - 5.0-0.8.20231006git8d00acdc - Globalize disclamer - Add Requires of ncurses which includes infocmp, tic and tput From 18cf32c8698e74bae440ade0951478e2f564cda1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Wed, 5 Jun 2024 00:51:39 +0100 Subject: [PATCH 46/53] The packages are architecture-specific, but do not contain any ELF binaries with debuginfo to extract, so we need disable debuginfo. --- redhat-lsb.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/redhat-lsb.spec b/redhat-lsb.spec index 1fa31a8..786cefb 100644 --- a/redhat-lsb.spec +++ b/redhat-lsb.spec @@ -90,12 +90,12 @@ continue to support the LSB project and software that uses it # The packages are architecture-specific, but do not contain any ELF # binaries with debuginfo to extract. -%undefine _enable_debug_packages +%global debug_package %{nil} Summary: Implementation of Linux Standard Base specification Name: redhat-lsb Version: 5.0 -Release: 0.9%{gver}%{?dist} +Release: 0.10%{gver}%{?dist} URL: https://wiki.linuxfoundation.org/lsb/start # https://github.com/LinuxStandardBase/lsb-samples/ Source0: redhat-lsb-%{snapshot}.tar.gz @@ -536,6 +536,10 @@ ln -snf ../../../sbin/chkconfig %{buildroot}/usr/lib/lsb/remove_initd %changelog +* Tue Jun 04 2024 Sérgio Basto - 5.0-0.10.20231006git8d00acdc +- The packages are architecture-specific, but do not contain any ELF + binaries with debuginfo to extract, so we need disable debuginfo. + * Sat Mar 02 2024 Sérgio Basto - 5.0-0.9.20231006git8d00acdc - Add conflicts required by Fedora package guidelines From f19ff69e7f4d0c88287eb263152ae633715dc9df Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 18:24:38 +0000 Subject: [PATCH 47/53] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- redhat-lsb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/redhat-lsb.spec b/redhat-lsb.spec index 786cefb..ed95c3f 100644 --- a/redhat-lsb.spec +++ b/redhat-lsb.spec @@ -95,7 +95,7 @@ continue to support the LSB project and software that uses it Summary: Implementation of Linux Standard Base specification Name: redhat-lsb Version: 5.0 -Release: 0.10%{gver}%{?dist} +Release: 0.11%{gver}%{?dist} URL: https://wiki.linuxfoundation.org/lsb/start # https://github.com/LinuxStandardBase/lsb-samples/ Source0: redhat-lsb-%{snapshot}.tar.gz @@ -536,6 +536,9 @@ ln -snf ../../../sbin/chkconfig %{buildroot}/usr/lib/lsb/remove_initd %changelog +* Fri Jul 19 2024 Fedora Release Engineering - 5.0-0.11.20231006git8d00acdc +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Jun 04 2024 Sérgio Basto - 5.0-0.10.20231006git8d00acdc - The packages are architecture-specific, but do not contain any ELF binaries with debuginfo to extract, so we need disable debuginfo. From 97f05d5845004613dffa6deab662f7cb5f2bc2f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 29 Jul 2024 12:00:27 +0200 Subject: [PATCH 48/53] convert GPLv2 license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- redhat-lsb.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/redhat-lsb.spec b/redhat-lsb.spec index ed95c3f..450505b 100644 --- a/redhat-lsb.spec +++ b/redhat-lsb.spec @@ -95,11 +95,12 @@ continue to support the LSB project and software that uses it Summary: Implementation of Linux Standard Base specification Name: redhat-lsb Version: 5.0 -Release: 0.11%{gver}%{?dist} +Release: 0.12%{gver}%{?dist} URL: https://wiki.linuxfoundation.org/lsb/start # https://github.com/LinuxStandardBase/lsb-samples/ Source0: redhat-lsb-%{snapshot}.tar.gz -License: GPLv2 +# Automatically converted from old format: GPLv2 - review is highly recommended. +License: GPL-2.0-only BuildRequires: make BuildRequires: perl-generators BuildRequires: perl(Getopt::Long) @@ -536,6 +537,9 @@ ln -snf ../../../sbin/chkconfig %{buildroot}/usr/lib/lsb/remove_initd %changelog +* Mon Jul 29 2024 Miroslav Suchý - 5.0-0.12.20231006git8d00acdc +- convert license to SPDX + * Fri Jul 19 2024 Fedora Release Engineering - 5.0-0.11.20231006git8d00acdc - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 4a2989421a12418de4f5cac25f1fd70e117537ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Thu, 28 Nov 2024 19:36:26 +0000 Subject: [PATCH 49/53] Remove sub-pacakges: redhat-lsb-core, redhat-lsb-cxx, redhat-lsb-desktop, redhat-lsb-languages and redhat-lsb-printing aren't useful for a long time Switch to a noarch package --- redhat-lsb.spec | 477 ++---------------------------------------------- 1 file changed, 15 insertions(+), 462 deletions(-) diff --git a/redhat-lsb.spec b/redhat-lsb.spec index 450505b..b9fdd95 100644 --- a/redhat-lsb.spec +++ b/redhat-lsb.spec @@ -5,75 +5,6 @@ %global snapshot %{gitdate}git%{gitversion} %global gver .%{gitdate}git%{gitversion} -# Define this to link to which library version eg. /lib64/ld-lsb-x86-64.so.3 -%global lsbsover 3 - -%ifarch %{ix86} -%global ldso ld-linux.so.2 -%global lsbldso ld-lsb.so -%global archname ia32 -%endif - -%ifarch alpha -%global ldso ld-linux-alpha.so.2 -%global lsbldso ld-lsb-alpha.so -%define archname alpha -%endif - -%ifarch ia64 -%global ldso ld-linux-ia64.so.2 -%global lsbldso ld-lsb-ia64.so -%global archname ia64 -%endif - -%ifarch ppc -%global ldso ld.so.1 -%global lsbldso ld-lsb-ppc32.so -%global archname ppc32 -%endif - -%ifarch ppc64 -%global ldso ld64.so.1 -%global lsbldso ld-lsb-ppc64.so -%global archname ppc64 -%endif - -%ifarch ppc64le -%global ldso ld64.so.2 -%global lsbldso ld-lsb-ppc64le.so -%global archname ppc64le -%endif - -%ifarch s390 -%global ldso ld.so.1 -%global lsbldso ld-lsb-s390.so -%global archname s390 -%endif - -%ifarch s390x -%global ldso ld64.so.1 -%global lsbldso ld-lsb-s390x.so -%global archname s390x -%endif - -%ifarch x86_64 -%global ldso ld-linux-x86-64.so.2 -%global lsbldso ld-lsb-x86-64.so -%global archname amd64 -%endif - -%ifarch %{arm} -%global ldso ld-linux.so.2 -%global lsbldso ld-lsb-arm.so -%global archname arm -%endif - -%ifarch aarch64 -%global ldso ld-linux-aarch64.so.1 -%global lsbldso ld-lsb-aarch64.so -%global archname aarch64 -%endif - %global upstreamlsbrelver 2.0 %global lsbrelver 5.0 %global disclaimer This package is not compliance with LSB, because various \ @@ -84,26 +15,17 @@ removed from the repositories and possibly replaced with new ones. \ This package tries its best to comply with the LSB. Hoping to be helpful and \ continue to support the LSB project and software that uses it -# 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} - -# The packages are architecture-specific, but do not contain any ELF -# binaries with debuginfo to extract. -%global debug_package %{nil} - Summary: Implementation of Linux Standard Base specification Name: redhat-lsb Version: 5.0 -Release: 0.12%{gver}%{?dist} +Release: 0.13%{gver}%{?dist} URL: https://wiki.linuxfoundation.org/lsb/start # https://github.com/LinuxStandardBase/lsb-samples/ Source0: redhat-lsb-%{snapshot}.tar.gz # Automatically converted from old format: GPLv2 - review is highly recommended. License: GPL-2.0-only BuildRequires: make -BuildRequires: perl-generators -BuildRequires: perl(Getopt::Long) +BuildRequires: help2man Provides: lsb = %{version}-%{release} Provides: lsb-%{archname} = %{version}-%{release} @@ -111,8 +33,16 @@ Provides: lsb-noarch = %{version}-%{release} Obsoletes: redhat-lsb-trialuse < 5 Obsoletes: redhat-lsb-submod-multimedia < 5 Obsoletes: redhat-lsb-submod-security < 5 +Obsoletes: redhat-lsb-core <= 5.0-0.12 +Obsoletes: redhat-lsb-cxx <= 5.0-0.12 +Obsoletes: redhat-lsb-desktop <= 5.0-0.12 +Obsoletes: redhat-lsb-languages <= 5.0-0.12 +Obsoletes: redhat-lsb-printing <= 5.0-0.12 +Obsoletes: redhat-lsb-supplemental <= 5.0-0.12 Conflicts: lsb_release +BuildArch: noarch + %description The Linux Standard Base (LSB) is an attempt to develop a set of standards that will increase compatibility among Linux distributions. It is designed to be @@ -125,325 +55,6 @@ The lsb package provides utilities, libraries etc. needed for LSB Compliant Applications. It also contains requirements that will ensure that all components required by the LSB are installed on the system. -%package core -Summary: LSB Core module support -Requires: redhat-lsb = %{version}-%{release} -Provides: lsb-core-%{archname} = %{version}-%{release} -Provides: lsb-core-noarch = %{version}-%{release} - -# gLSB Library -Requires: glibc%{?_isa} -Requires: glibc-common -Requires: libgcc%{?_isa} -#LSB requires libcrypt.so.1 -Requires: libxcrypt-compat%{?_isa} -#LSB requires libncurses.so.5 for some reason -Requires: ncurses-compat-libs%{?_isa} -# ncurses includes -# infocmp -# tic -# tput -Requires: ncurses -Requires: pam%{?_isa} -Requires: zlib%{?_isa} - -# gLSB Command and Utilities -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 -Requires: /usr/bin/passwd -Requires: /usr/bin/paste -Requires: /usr/bin/patch -Requires: /usr/bin/pathchk -#better POSIX conformance of /usr/bin/pax -%if 0%{?fedora} || 0%{?epel} <= 8 -# not available on epel9 -Requires: spax -%endif -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/sbin/useradd -Requires: /usr/sbin/userdel -Requires: /usr/sbin/usermod -Requires: /usr/bin/wc -Requires: /usr/bin/xargs -Requires: /usr/bin/zcat - -%description core -%{disclaimer} - -The Linux Standard Base (LSB) Core module support provides the fundamental -system interfaces, libraries, and runtime environment upon which all conforming -applications and libraries depend. - - -%package cxx -Summary: LSB CXX module support -Requires: redhat-lsb-core%{?_isa} = %{version}-%{release} -Provides: lsb-cxx-%{archname} = %{version}-%{release} -Provides: lsb-cxx-noarch = %{version}-%{release} - -Requires: libstdc++%{?_isa} - -%description cxx -%{disclaimer} - -The Linux Standard Base (LSB) CXX module supports the core interfaces by -providing system interfaces, libraries, and a runtime environment for -applications built using the C++ programming language. These interfaces -provide low-level support for the core constructs of the language, and -implement the standard base C++ libraries. - -%package desktop -Summary: LSB Desktop module support -Requires: redhat-lsb-core%{?_isa} = %{version}-%{release} -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} - -Requires: xdg-utils -# LSB_Graphics library -Requires: libICE%{?_isa} -Requires: libSM%{?_isa} -Requires: libX11%{?_isa} -Requires: libXext%{?_isa} -Requires: libXi%{?_isa} -Requires: libXt%{?_isa} -Requires: libXtst%{?_isa} -Requires: mesa-libGL%{?_isa} -Requires: mesa-libGLU%{?_isa} -# gLSB Graphics and gLSB Graphics Ext Command and Utilities -Requires: /usr/bin/fc-cache -Requires: /usr/bin/fc-list -Requires: /usr/bin/fc-match -# gLSB Graphics Ext library -Requires: cairo%{?_isa} -Requires: freetype%{?_isa} -Requires: libjpeg-turbo%{?_isa} -Requires: libpng%{?_isa} -Requires: libXft%{?_isa} -Requires: libXrender%{?_isa} -# toolkit-gtk -Requires: atk%{?_isa} -Requires: gdk-pixbuf2%{?_isa} -Requires: glib2%{?_isa} -Requires: gtk2%{?_isa} -Requires: pango%{?_isa} -%if 0%{?fedora} -# qt4 not available on epel9 and epel8 -# toolkit-qt is not in rhel -Requires: qt%{?_isa} -Requires: qt-x11%{?_isa} -%endif -# xml -Requires: libxml2%{?_isa} - -%description desktop -%{disclaimer} - -The Linux Standard Base (LSB) Desktop Specifications define components that are -required to be present on an LSB conforming system. - -%package languages -Summary: LSB Languages module support -Requires: redhat-lsb-core%{?_isa} = %{version}-%{release} -Provides: lsb-languages-%{archname} = %{version}-%{release} -Provides: lsb-languages-noarch = %{version}-%{release} - -# Perl and Perl non-builtin modules -Requires: /usr/bin/perl -Requires: perl(CGI) -Requires: perl(CPAN) -# Locale::Constants has been Locale::Codes::Costants, so we need -# create a /usr/share/perl5/vendor_perl/Constants.pm manually. -# Requires: perl(Locale::Constants) -# perl(Locale::Constants) requires perl(Locale::Codes) -# DB module is a builtin module, but perl package doesn't contain this provide. -# Requires: perl(DB) -# we also need perl(Pod::Plainer), we need to rpm this package ourself -Requires: perl(Locale::Codes) -Requires: perl(File::Spec) -Requires: perl(Scalar::Util) -Requires: perl(Test::Harness) -Requires: perl(Test::Simple) -Requires: perl(ExtUtils::MakeMaker) -Requires: perl(XML::LibXML) -Requires: perl(Pod::Checker) -Requires: perl(Text::Soundex) -Requires: perl(Env) -Requires: perl(Time::HiRes) -Requires: perl(Locale::Maketext) -Requires: perl(Fatal) -Requires: perl(Sys::Syslog) -Requires: perl(Getopt::Long) -%if 0%{?fedora} || 0%{?epel} <= 8 -Requires: perl(B::Lint) -Requires: perl(Class::ISA) -Requires: perl(File::CheckTree) -Requires: perl(Pod::LaTeX) -Requires: perl(Pod::Plainer) -%endif -# python3 -Requires: /usr/bin/python3 -# java - -%description languages -%{disclaimer} - -The Linux Standard Base (LSB) Languages module supports components for runtime -languages which are found on an LSB conforming system. - -%package printing -Summary: LSB Printing module support -Requires: redhat-lsb-core%{?_isa} = %{version}-%{release} -Provides: lsb-printing-%{archname} = %{version}-%{release} -Provides: lsb-printing-noarch = %{version}-%{release} - -# gLSB Printing Libraries -Requires: cups-libs -# gLSB Printing Command and Utilities -Requires: /usr/bin/foomatic-rip -Requires: /usr/bin/gs - -%description printing -The Linux Standard Base (LSB) Printing specifications define components that -are required to be present on an LSB conforming system. - -%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 -%{disclaimer} - -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 -n redhat-lsb-%{snapshot} @@ -454,11 +65,6 @@ cd lsb_release/src %install pushd redhat-lsb %make_install - -# manually add Locale::Constants. This module is just an alias of Locale::Codes::Constants -mkdir -p %{buildroot}%{perl_vendorlib}/Locale -cp -p Constants.pm %{buildroot}%{perl_vendorlib}/Locale -cp -p Constants.pod %{buildroot}%{perl_vendorlib}/Locale popd pushd lsb_release/src @@ -469,42 +75,6 @@ popd cp -p lsb_release/src/COPYING . cp -p lsb_release/src/README README.lsb_release -# modules -mkdir -p %{buildroot}%{_sysconfdir}/lsb-release.d/ -modules="core cxx desktop languages printing" - -core="core security" -cxx="cpp" -desktop="desktop-misc graphics graphics-ext multimedia toolkit-gtk toolkit-qt toolkit-qt3" -desktop="${desktop} xml" -languages="perl python" -printing="printing" -trialuse="security multimedia" - -for mod in ${modules};do - touch $RPM_BUILD_ROOT%{_sysconfdir}/lsb-release.d/${mod}-%{lsbrelver}-%{archname} - touch $RPM_BUILD_ROOT%{_sysconfdir}/lsb-release.d/${mod}-%{lsbrelver}-noarch -done - -mkdir -p %{buildroot}%{_libdir} -for LSBVER in %{lsbsover}; do - ln -snf %{ldso} %{buildroot}%{_libdir}/%{lsbldso}.$LSBVER -done - -# LSB uses /usr/lib rather than /usr/lib64 even for 64bit OS -# According to the lsb-core documentation provided by -# http://refspecs.linux-foundation.org/LSB_3.2.0/LSB-Core-generic/LSB-Core-generic.pdf -# it's OK to put non binary in /usr/lib. -ln -snf ../../../sbin/chkconfig %{buildroot}/usr/lib/lsb/install_initd -ln -snf ../../../sbin/chkconfig %{buildroot}/usr/lib/lsb/remove_initd -#ln -snf mail %{buildroot}/bin/mailx - -#mkdir -p %{buildroot}/usr/X11R6/lib/X11/xserver -#ln -snf /usr/%{_lib}/xserver/SecurityPolicy %{buildroot}/usr/X11R6/lib/X11/xserver/SecurityPolicy -#ln -snf /usr/share/X11/fonts %{buildroot}/usr/X11R6/lib/X11/fonts -#ln -snf /usr/share/X11/rgb.txt %{buildroot}/usr/X11R6/lib/X11/rgb.txt - - %files %doc README.md README.lsb_release %license COPYING @@ -513,30 +83,13 @@ ln -snf ../../../sbin/chkconfig %{buildroot}/usr/lib/lsb/remove_initd %{_bindir}/lsb_release /usr/lib/lsb -%files core -%dir %{_sysconfdir}/lsb-release.d -%{_libdir}/*so* -%{_sysconfdir}/lsb-release.d/core* - -%files cxx -%{_sysconfdir}/lsb-release.d/cxx* - -%files desktop -%{_sysconfdir}/lsb-release.d/desktop* - -%files languages -%{_sysconfdir}/lsb-release.d/languages* -%{perl_vendorlib}/Locale/Constants.pm -%{perl_vendorlib}/Locale/Constants.pod - -%files printing -%{_sysconfdir}/lsb-release.d/printing* - -%files supplemental -#no files, just dependencies - %changelog +* Thu Nov 28 2024 Sérgio Basto - 5.0-0.13.20231006git8d00acdc +- Remove sub-pacakges: redhat-lsb-core, redhat-lsb-cxx, redhat-lsb-desktop, + redhat-lsb-languages and redhat-lsb-printing aren't useful for a long time +- Switch to a noarch package + * Mon Jul 29 2024 Miroslav Suchý - 5.0-0.12.20231006git8d00acdc - convert license to SPDX From 2bd343070585dddfb0446322edca89ebc1641fb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sat, 7 Dec 2024 04:10:51 +0000 Subject: [PATCH 50/53] (#2330590) Fix Unexpadned macro --- redhat-lsb.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/redhat-lsb.spec b/redhat-lsb.spec index b9fdd95..fb3ef87 100644 --- a/redhat-lsb.spec +++ b/redhat-lsb.spec @@ -18,7 +18,7 @@ continue to support the LSB project and software that uses it Summary: Implementation of Linux Standard Base specification Name: redhat-lsb Version: 5.0 -Release: 0.13%{gver}%{?dist} +Release: 0.14%{gver}%{?dist} URL: https://wiki.linuxfoundation.org/lsb/start # https://github.com/LinuxStandardBase/lsb-samples/ Source0: redhat-lsb-%{snapshot}.tar.gz @@ -28,7 +28,6 @@ BuildRequires: make BuildRequires: help2man Provides: lsb = %{version}-%{release} -Provides: lsb-%{archname} = %{version}-%{release} Provides: lsb-noarch = %{version}-%{release} Obsoletes: redhat-lsb-trialuse < 5 Obsoletes: redhat-lsb-submod-multimedia < 5 @@ -85,6 +84,9 @@ cp -p lsb_release/src/README README.lsb_release %changelog +* Sat Dec 07 2024 Sérgio Basto - 5.0-0.14.20231006git8d00acdc +- (#2330590) Fix Unexpadned macro + * Thu Nov 28 2024 Sérgio Basto - 5.0-0.13.20231006git8d00acdc - Remove sub-pacakges: redhat-lsb-core, redhat-lsb-cxx, redhat-lsb-desktop, redhat-lsb-languages and redhat-lsb-printing aren't useful for a long time From 049190d34b5d90491338ecdf95c067c4088c0a67 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 22:14:57 +0000 Subject: [PATCH 51/53] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- redhat-lsb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/redhat-lsb.spec b/redhat-lsb.spec index fb3ef87..30d1fe3 100644 --- a/redhat-lsb.spec +++ b/redhat-lsb.spec @@ -18,7 +18,7 @@ continue to support the LSB project and software that uses it Summary: Implementation of Linux Standard Base specification Name: redhat-lsb Version: 5.0 -Release: 0.14%{gver}%{?dist} +Release: 0.15%{gver}%{?dist} URL: https://wiki.linuxfoundation.org/lsb/start # https://github.com/LinuxStandardBase/lsb-samples/ Source0: redhat-lsb-%{snapshot}.tar.gz @@ -84,6 +84,9 @@ cp -p lsb_release/src/README README.lsb_release %changelog +* Sat Jan 18 2025 Fedora Release Engineering - 5.0-0.15.20231006git8d00acdc +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sat Dec 07 2024 Sérgio Basto - 5.0-0.14.20231006git8d00acdc - (#2330590) Fix Unexpadned macro From 86f5dba018d1e08f9f6649ea08de1517a86b7777 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Wed, 16 Apr 2025 13:34:04 +0100 Subject: [PATCH 52/53] Require util-linux Modification of sumamry and description to express that is not compliant with LSB --- redhat-lsb.spec | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/redhat-lsb.spec b/redhat-lsb.spec index 30d1fe3..0d33c80 100644 --- a/redhat-lsb.spec +++ b/redhat-lsb.spec @@ -15,10 +15,10 @@ removed from the repositories and possibly replaced with new ones. \ This package tries its best to comply with the LSB. Hoping to be helpful and \ continue to support the LSB project and software that uses it -Summary: Implementation of Linux Standard Base specification +Summary: Partial implementation of Linux Standard Base specification Name: redhat-lsb Version: 5.0 -Release: 0.15%{gver}%{?dist} +Release: 0.16%{gver}%{?dist} URL: https://wiki.linuxfoundation.org/lsb/start # https://github.com/LinuxStandardBase/lsb-samples/ Source0: redhat-lsb-%{snapshot}.tar.gz @@ -26,6 +26,7 @@ Source0: redhat-lsb-%{snapshot}.tar.gz License: GPL-2.0-only BuildRequires: make BuildRequires: help2man +Requires: util-linux Provides: lsb = %{version}-%{release} Provides: lsb-noarch = %{version}-%{release} @@ -50,9 +51,9 @@ independent software vendors. %{disclaimer} -The lsb package provides utilities, libraries etc. needed for LSB Compliant -Applications. It also contains requirements that will ensure that all -components required by the LSB are installed on the system. +The lsb package provides utilities, libraries etc. needed for LSB Compliant +Applications. + %prep %setup -q -n redhat-lsb-%{snapshot} @@ -84,6 +85,10 @@ cp -p lsb_release/src/README README.lsb_release %changelog +* Wed Apr 16 2025 Sérgio Basto - 5.0-0.16.20231006git8d00acdc +- Require util-linux +- Modification of sumamry and description to express that is not compliant with LSB + * Sat Jan 18 2025 Fedora Release Engineering - 5.0-0.15.20231006git8d00acdc - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 3c1c5e1013bba30a3d9c912746c1c5b6e349d87e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 11:51:26 +0000 Subject: [PATCH 53/53] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- redhat-lsb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/redhat-lsb.spec b/redhat-lsb.spec index 0d33c80..f7e51a2 100644 --- a/redhat-lsb.spec +++ b/redhat-lsb.spec @@ -18,7 +18,7 @@ continue to support the LSB project and software that uses it Summary: Partial implementation of Linux Standard Base specification Name: redhat-lsb Version: 5.0 -Release: 0.16%{gver}%{?dist} +Release: 0.17%{gver}%{?dist} URL: https://wiki.linuxfoundation.org/lsb/start # https://github.com/LinuxStandardBase/lsb-samples/ Source0: redhat-lsb-%{snapshot}.tar.gz @@ -85,6 +85,9 @@ cp -p lsb_release/src/README README.lsb_release %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 5.0-0.17.20231006git8d00acdc +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Wed Apr 16 2025 Sérgio Basto - 5.0-0.16.20231006git8d00acdc - Require util-linux - Modification of sumamry and description to express that is not compliant with LSB