diff --git a/libxcrypt.spec b/libxcrypt.spec index 8fe86dc..9bab4c0 100644 --- a/libxcrypt.spec +++ b/libxcrypt.spec @@ -26,7 +26,7 @@ Name: libxcrypt Version: 4.0.0 -Release: 0.200%{?gitrel}%{?dist} +Release: 0.201%{?gitrel}%{?dist} Summary: Extended crypt library for DES, MD5, Blowfish and others # For explicit license breakdown, see the @@ -38,12 +38,18 @@ Source0: %{url}/archive/%{commit}/%{name}-%{version}%{?gitver}.tar.gz BuildRequires: fipscheck BuildRequires: libtool -Requires: glibc%{_isa} +Requires: glibc%{_isa} >= 2.26.9000-46 -%if 0%{?fedora} >= 28 && 0%{?fedora} <= 31 -Obsoletes: libcrypt <= 2.26.9000-46 -Obsoletes: libcrypt-nss <= 2.26.9000-33 +# We do not need to keep this forever. +%if 0%{?fedora} && 0%{?fedora} <= 31 +# Inherited from former libcrypt package. +Obsoletes: libcrypt-nss%{?_isa} <= 2.26.9000-33 +# Obsolete former libcrypt properly. +Obsoletes: libcrypt%{?_isa} <= 2.26.9000-46 + +# Provide virtual libcrypt as it has been done +# by former libcrypt{,-nss} packages from glibc. Provides: libcrypt == 2.26.9000-46.1 Provides: libcrypt%{?_isa} == 2.26.9000-46.1 %endif @@ -85,7 +91,8 @@ legacy APIs supplied by glibc's libcrypt ('encrypt', 'encrypt_r', Summary: Development files for %{name} Requires: %{name}%{?_isa} == %{version}-%{release} -Requires: glibc-devel%{?_isa} +Requires: glibc-devel%{?_isa} >= 2.26.9000-46 +Requires: glibc-headers%{?_isa} >= 2.26.9000-46 %description devel The %{name}-devel package contains libraries and header files for @@ -96,7 +103,7 @@ developing applications that use %{name}. Summary: Static library for -static linking with %{name} Requires: %{name}-devel%{?_isa} == %{version}-%{release} -Requires: glibc-static%{?_isa} +Requires: glibc-static%{?_isa} >= 2.26.9000-46 %description static This package contains the libxcrypt static libraries for -static @@ -182,6 +189,11 @@ is highly discouraged. %changelog +* Sat Jan 20 2018 Björn Esser - 4.0.0-0.201.20171109git15447aa +- Use archful Obsoletes for libcrypt +- Add versioned Requires on glibc packages not shipping libcrypt +- Add comments about the packaging logic for replacing former libcrypt + * Fri Jan 12 2018 Björn Esser - 4.0.0-0.200.20171109git15447aa - Initial import (rhbz#1532794) - Add Obsoletes/Provides for libcrypt