rpms/libxcrypt
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix versioned requirements on glibc

Browse Source
This commit is contained in:
Björn Esser 2019-02-19 14:56:11 +01:00
parent bd7ef773f1
commit 860bcd60c8
No known key found for this signature in database
GPG Key ID: F52E98007594C21D
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
libxcrypt.spec
View File

@ -148,7 +148,7 @@ fi \
Name: libxcrypt Name: libxcrypt
Version: 4.4.3 Version: 4.4.3
Release: 9%{?dist} Release: 10%{?dist}
Summary: Extended crypt library for descrypt, md5crypt, bcrypt, and others Summary: Extended crypt library for descrypt, md5crypt, bcrypt, and others
# For explicit license breakdown, see the # For explicit license breakdown, see the
@ -174,28 +174,28 @@ BuildRequires: valgrind
# We do not need to keep this forever. # We do not need to keep this forever.
%if !(0%{?fedora} > 31 || 0%{?rhel} > 10) %if !(0%{?fedora} > 31 || 0%{?rhel} > 10)
# Inherited from former libcrypt package. # Inherited from former libcrypt package.
Obsoletes: libcrypt-nss < %{glibc_minver} Obsoletes: libcrypt-nss < %{glibc_minver}
Provides: libcrypt-nss = %{glibc_minver} Provides: libcrypt-nss = %{glibc_minver}
Provides: libcrypt-nss%{?_isa} = %{glibc_minver} Provides: libcrypt-nss%{?_isa} = %{glibc_minver}
# Obsolete former libcrypt properly and provide a virtual libcrypt # Obsolete former libcrypt properly and provide a virtual libcrypt
# package as it has been done by the former packages, which were # package as it has been done by the former packages, which were
# built by glibc before. # built by glibc before.
Obsoletes: libcrypt < %{glibc_minver} Obsoletes: libcrypt < %{glibc_minver}
Provides: libcrypt = %{glibc_minver} Provides: libcrypt = %{glibc_minver}
Provides: libcrypt%{?_isa} = %{glibc_minver} Provides: libcrypt%{?_isa} = %{glibc_minver}
# Obsolete former libxcrypt-common properly. # Obsolete former libxcrypt-common properly.
Obsoletes: %{name}-common < 4.3.3-4 Obsoletes: %{name}-common < 4.3.3-4
Provides: %{name}-common = %{version}-%{release} Provides: %{name}-common = %{version}-%{release}
%endif %endif
%if %{with new_api} && %{without compat_pkg} %if %{with new_api} && %{without compat_pkg}
Obsoletes: %{name}-compat < %{version}-%{release} Obsoletes: %{name}-compat < %{version}-%{release}
%endif %endif
# We need a version of glibc, that doesn't build libcrypt anymore. # We need a version of glibc, that doesn't build libcrypt anymore.
Requires: glibc%{?_isa} > %{glibc_minver} Requires: glibc%{?_isa} >= %{glibc_minver}
%if 0%{?fedora} %if 0%{?fedora}
Recommends: whois-mkpasswd Recommends: whois-mkpasswd
@ -227,8 +227,8 @@ that have been provided by glibc's libcrypt.so.1.
%package compat %package compat
Summary: Compatibility library providing legacy API functions Summary: Compatibility library providing legacy API functions
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: glibc%{?_isa} > %{glibc_minver} Requires: glibc%{?_isa} >= %{glibc_minver}
%description compat %description compat
This package contains the library providing the compatibility API This package contains the library providing the compatibility API
@ -246,10 +246,10 @@ work unmodified with the library supplied by this package.
%package devel %package devel
Summary: Development files for %{name} Summary: Development files for %{name}
Conflicts: man-pages < 4.15-3 Conflicts: man-pages < 4.15-3
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: glibc-devel%{?_isa} > %{glibc_minver} Requires: glibc-devel%{?_isa} >= %{glibc_minver}
%description devel %description devel
The %{name}-devel package contains libraries and header files for The %{name}-devel package contains libraries and header files for
@ -260,9 +260,9 @@ developing applications that use %{name}.
%package static %package static
Summary: Static library for -static linking with %{name} Summary: Static library for -static linking with %{name}
Requires: %{name}-devel%{?_isa} = %{version}-%{release} Requires: %{name}-devel%{?_isa} = %{version}-%{release}
Requires: glibc-devel%{?_isa} > %{glibc_minver} Requires: glibc-devel%{?_isa} >= %{glibc_minver}
Requires: glibc-static%{?_isa} > %{glibc_minver} Requires: glibc-static%{?_isa} >= %{glibc_minver}
%description static %description static
This package contains the libxcrypt static library for -static This package contains the libxcrypt static library for -static
@ -463,6 +463,9 @@ done
%changelog %changelog
* Tue Feb 19 2019 Björn Esser <besser82@fedoraproject.org> - 4.4.3-10
- Fix versioned requirements on glibc
* Tue Feb 19 2019 Björn Esser <besser82@fedoraproject.org> - 4.4.3-9 * Tue Feb 19 2019 Björn Esser <besser82@fedoraproject.org> - 4.4.3-9
- Fix conditional in __spec_install_post - Fix conditional in __spec_install_post