From 1948afe0b779f4461231ab57735eb0acb26e4a1a Mon Sep 17 00:00:00 2001 From: Sérgio M. Basto Date: Oct 06 2023 15:39:32 +0000 Subject: spec cleanup like replace define by global and recomended comments --- diff --git a/redhat-lsb/redhat-lsb.spec b/redhat-lsb/redhat-lsb.spec index 46b9dda..c7b5d7a 100644 --- a/redhat-lsb/redhat-lsb.spec +++ b/redhat-lsb/redhat-lsb.spec @@ -1,54 +1,74 @@ # Define this to link to which library version eg. /lib64/ld-lsb-x86-64.so.3 -%define lsbsover 3 +%global lsbsover 3 %ifarch %{ix86} -%define ldso ld-linux.so.2 -%define lsbldso ld-lsb.so +%global ldso ld-linux.so.2 +%global lsbldso ld-lsb.so +%endif + +%ifarch alpha +%global ldso ld-linux-alpha.so.2 +%global lsbldso ld-lsb-alpha.so %endif %ifarch ia64 -%define ldso ld-linux-ia64.so.2 -%define lsbldso ld-lsb-ia64.so +%global ldso ld-linux-ia64.so.2 +%global lsbldso ld-lsb-ia64.so %endif %ifarch ppc -%define ldso ld.so.1 -%define lsbldso ld-lsb-ppc32.so +%global ldso ld.so.1 +%global lsbldso ld-lsb-ppc32.so %endif %ifarch ppc64 -%define ldso ld64.so.1 -%define lsbldso ld-lsb-ppc64.so +%global ldso ld64.so.1 +%global lsbldso ld-lsb-ppc64.so +%endif + +%ifarch ppc64le +%global ldso ld64.so.2 +%global lsbldso ld-lsb-ppc64le.so %endif %ifarch s390 -%define ldso ld.so.1 -%define lsbldso ld-lsb-s390.so +%global ldso ld.so.1 +%global lsbldso ld-lsb-s390.so %endif %ifarch s390x -%define ldso ld64.so.1 -%define lsbldso ld-lsb-s390x.so +%global ldso ld64.so.1 +%global lsbldso ld-lsb-s390x.so %endif %ifarch x86_64 -%define ldso ld-linux-x86-64.so.2 -%define lsbldso ld-lsb-x86-64.so +%global ldso ld-linux-x86-64.so.2 +%global lsbldso ld-lsb-x86-64.so +%endif + +%ifarch %{arm} +%global ldso ld-linux.so.2 +%global lsbldso ld-lsb-arm.so +%endif + +%ifarch aarch64 +%global ldso ld-linux-aarch64.so.1 +%global lsbldso ld-lsb-aarch64.so %endif %ifarch ia64 ppc64 s390x x86_64 -%define qual ()(64bit) +%global qual ()(64bit) %else -%define qual %{nil} +%global qual %{nil} %endif -%define upstreamlsbrelver 2.0 -%define lsbrelver 4.0 -%define srcrelease 1 +%global upstreamlsbrelver 2.0 +%global lsbrelver 4.1 +%global srcrelease 1 -Summary: LSB support for Red Hat Linux +Summary: Implementation of Linux Standard Base specification Name: redhat-lsb -Version: 4.0 +Version: 4.1 Release: 1%{?dist} URL: http://www.linuxfoundation.org/collaborate/workgroups/lsb Source0: %{name}-%{version}-%{srcrelease}.tar.bz2 @@ -64,25 +84,28 @@ BuildRequires: glibc-static Provides: lsb = %{version} # dependency for primary LSB application for v2.0 and v3.0 %ifarch %{ix86} -%define archname ia32 +%global archname ia32 %endif %ifarch ia64 -%define archname ia64 +%global archname ia64 %endif %ifarch ppc -%define archname ppc32 +%global archname ppc32 %endif %ifarch ppc64 -%define archname ppc64 +%global archname ppc64 +%endif +%ifarch ppc64le +%global archname ppc64le %endif %ifarch s390 -%define archname s390 +%global archname s390 %endif %ifarch s390x -%define archname s390x +%global archname s390x %endif %ifarch x86_64 -%define archname amd64 +%global archname amd64 %endif Provides: lsb-core-%{archname} = %{version} Provides: lsb-graphics-%{archname} = %{version} @@ -697,18 +720,18 @@ fi * Thu Aug 28 2008 Hao Liu 3.2-2 - Modify "Requires: /usr/bin/mailx" to "Requires: mailx" (Bug #460249) -* Wed Aug 18 2008 Hao Liu 3.2-1 +* Wed Aug 20 2008 Hao Liu 3.2-1 - Port forward to LSB 3.2 - Remove symlink for mailx if user is upgrading from the redhat-lsb of older version - Since F10 put mailx under /usr/bin, change the corresponding requires -* Thu Aug 5 2008 Hao Liu - 3.1-22 +* Tue Aug 5 2008 Hao Liu - 3.1-22 - Remove 2 requires which provided by redhat-lsb - Add comments explaining why hard-coded path is kept - Resolve some hard-coded path problems - Add comments explaining why importing '-static' option while compiling redhat_lsb_trigger -- Replace %{_libdir}/lsb with /usr/lib/lsb -- Replace /%{_lib}/* with /%{_lib}/*so* +- Replace %%{_libdir}/lsb with /usr/lib/lsb +- Replace /%%{_lib}/* with /%%{_lib}/*so* - Replace /lib/lsb with /lib/lsb* * Thu Jul 31 2008 Lawrence Lim - 3.1-21 @@ -729,14 +752,14 @@ fi * Wed Aug 29 2007 Fedora Release Engineering - 3.1-17 - Rebuild for selinux ppc32 issue. -* Fri Aug 20 2007 Lawrence Lim - 3.1-16 +* Mon Aug 20 2007 Lawrence Lim - 3.1-16 - update spec file in accordance to feedback provided through merge review - merge-review.patch - #226363 * Wed Jul 18 2007 Lawrence Lim - 3.1-15.f8 - Resolved: #239842 - /lib/lsb/init-functions shall use aliases but not functions - forward port the patch from 3.1-12.3.EL which fix #217566, #233530, #240916 -* Wed Jul 2 2007 Lawrence Lim - 3.1-14.fc7 +* Wed Jul 4 2007 Lawrence Lim - 3.1-14.fc7 - fixed Bug 232918 for new glibc version * Tue Jun 26 2007 Lawrence Lim - 3.1-12.3.EL @@ -825,7 +848,7 @@ fi * Fri Jan 21 2005 Leon Ho 1.3-7 - Add to support multiple LSB test suite version -- Add %endif in trigger postun +- Add %%endif in trigger postun * Thu Nov 11 2004 Phil Knirsch 1.3-6 - Fixed invalid sln call for trigger in postun on ia64 (#137647) @@ -863,4 +886,3 @@ fi * Thu Jan 24 2002 Matt Wilson - Initial build. -