From be29e0df41939562561ebb07de8604bf32efe644 Mon Sep 17 00:00:00 2001 From: mgb01105731 Date: Wed, 19 Oct 2022 15:47:14 +0800 Subject: [PATCH] optimise spec file --- libxcrypt.spec | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/libxcrypt.spec b/libxcrypt.spec index 2a210ca..50033d2 100644 --- a/libxcrypt.spec +++ b/libxcrypt.spec @@ -1,3 +1,4 @@ +%define anolis_release 2 %bcond_without new_api %bcond_without compat_pkg %bcond_without enosys_stubs @@ -122,11 +123,9 @@ BuildRequires: %{_bindir}/sha256sum Obsoletes: libcrypt-nss < %{glibc_minver} Provides: libcrypt-nss = %{glibc_minver} -Provides: libcrypt-nss%{?_isa} = %{glibc_minver} Obsoletes: libcrypt < %{glibc_minver} Provides: libcrypt = %{glibc_minver} -Provides: libcrypt%{?_isa} = %{glibc_minver} Obsoletes: %{name}-common < 4.3.3-4 Provides: %{name}-common = %{version}-%{release} @@ -135,7 +134,7 @@ Provides: %{name}-common = %{version}-%{release} Obsoletes: %{name}-compat < %{version}-%{release} %endif -Requires: glibc%{?_isa} >= %{glibc_minver} +Requires: glibc >= %{glibc_minver} Requires: mkpasswd %description @@ -167,7 +166,7 @@ Summary: Compatibility library providing legacy API functions # For testing the glibc compatibility symbols. BuildRequires: libxcrypt-compat -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name} = %{version}-%{release} %description compat This package contains the library providing the compatibility API @@ -187,8 +186,8 @@ Summary: Development files for %{name} Conflicts: man-pages < %{man_pages_minver} -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: glibc-devel%{?_isa} >= %{glibc_minver} +Requires: %{name} = %{version}-%{release} +Requires: glibc-devel >= %{glibc_minver} %description devel The %{name}-devel package contains libraries and header files for @@ -199,9 +198,9 @@ developing applications that use %{name}. %package static Summary: Static library for -static linking with %{name} -Requires: %{name}-devel%{?_isa} = %{version}-%{release} -Requires: glibc-devel%{?_isa} >= %{glibc_minver} -Requires: glibc-static%{?_isa} >= %{glibc_minver} +Requires: %{name}-devel = %{version}-%{release} +Requires: glibc-devel >= %{glibc_minver} +Requires: glibc-static >= %{glibc_minver} %description static This package contains the libxcrypt static library for -static @@ -353,6 +352,7 @@ install -Dpm 0644 -t %{buildroot}%{_pkgdocdir} \ rm -f %{buildroot}%{_pkgdocdir}/README.md +%generate_compatibility_deps %check build_dirs="%{_vpath_builddir}" @@ -396,7 +396,8 @@ done %{_libdir}/libcrypt.so.%{soc} %{_libdir}/libcrypt.so.%{sov} %{_mandir}/man5/crypt.5* - +%dir %{abidir} +%{abidir}/libcrypt*.dump %if %{with compat_pkg} %files compat @@ -451,5 +452,8 @@ done %changelog +* Wed Oct 19 2022 mgb01105731 - 4.4.28-2 +- optimise spec file + * Thu Mar 17 2022 forrest_ly - 4.4.28-1 - Init for Anolis OS 23 -- Gitee