Drop the common sub-package
This commit is contained in:
parent
6e1c0b07e1
commit
d692c1ed47
@ -85,10 +85,6 @@ fi \
|
|||||||
%{nil}
|
%{nil}
|
||||||
|
|
||||||
|
|
||||||
# Needed for shared licensedir.
|
|
||||||
%global _pkglicensedir %{_defaultlicensedir}/%{name}
|
|
||||||
|
|
||||||
|
|
||||||
Name: libxcrypt
|
Name: libxcrypt
|
||||||
Version: 4.3.3
|
Version: 4.3.3
|
||||||
Release: 3%{?dist}
|
Release: 3%{?dist}
|
||||||
@ -129,8 +125,11 @@ Provides: libcrypt == 2.26.9000-47
|
|||||||
Provides: libcrypt%{?_isa} == 2.26.9000-47
|
Provides: libcrypt%{?_isa} == 2.26.9000-47
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
# Obsolete former libxcrypt-common properly.
|
||||||
|
Obsoletes: %{name}-common <= 4.3.3-3
|
||||||
|
Provides: %{name}-common == %{version}-%{release}
|
||||||
|
|
||||||
Requires: glibc%{_isa} >= 2.26.9000-46
|
Requires: glibc%{_isa} >= 2.26.9000-46
|
||||||
Requires: %{name}-common == %{version}-%{release}
|
|
||||||
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -156,14 +155,6 @@ that have been provided by glibc's libcrypt.so.1.
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%package common
|
|
||||||
Summary: Common files for %{name}
|
|
||||||
BuildArch: noarch
|
|
||||||
|
|
||||||
%description common
|
|
||||||
This package contains common files for %{name}.
|
|
||||||
|
|
||||||
|
|
||||||
%if %{with new_api}
|
%if %{with new_api}
|
||||||
%package compat
|
%package compat
|
||||||
Summary: Compatibility library providing legacy API functions
|
Summary: Compatibility library providing legacy API functions
|
||||||
@ -182,8 +173,7 @@ Provides: libcrypt == 2.26.9000-47
|
|||||||
Provides: libcrypt%{?_isa} == 2.26.9000-47
|
Provides: libcrypt%{?_isa} == 2.26.9000-47
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
Requires: glibc%{_isa} >= 2.26.9000-46
|
Requires: %{name}%{?_isa} == %{version}-%{release}
|
||||||
Requires: %{name}-common == %{version}-%{release}
|
|
||||||
|
|
||||||
%description compat
|
%description compat
|
||||||
This package contains the library providing the compatibility API for
|
This package contains the library providing the compatibility API for
|
||||||
@ -272,10 +262,6 @@ if [ -f README.fedora ]; then
|
|||||||
README.fedora
|
README.fedora
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Install license files to shared %%_licensedir.
|
|
||||||
%{__install} -Dpm 0644 -t %{buildroot}%{_pkglicensedir} \
|
|
||||||
AUTHORS COPYING.LIB LICENSING
|
|
||||||
|
|
||||||
|
|
||||||
%check
|
%check
|
||||||
%if %{with new_api}
|
%if %{with new_api}
|
||||||
@ -311,19 +297,13 @@ done
|
|||||||
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
/%{_lib}/.libcrypt.so.{%{soc},%{sov}}.hmac
|
|
||||||
/%{_lib}/libcrypt.so.{%{soc},%{sov}}
|
|
||||||
|
|
||||||
|
|
||||||
%files common
|
|
||||||
%doc %dir %{_pkgdocdir}
|
%doc %dir %{_pkgdocdir}
|
||||||
%doc %{_pkgdocdir}/NEWS
|
%doc %{_pkgdocdir}/NEWS
|
||||||
%doc %{_pkgdocdir}/README*
|
%doc %{_pkgdocdir}/README*
|
||||||
%doc %{_pkgdocdir}/THANKS
|
%doc %{_pkgdocdir}/THANKS
|
||||||
%license %dir %{_pkglicensedir}
|
%license AUTHORS COPYING.LIB LICENSING
|
||||||
%license %{_pkglicensedir}/AUTHORS
|
/%{_lib}/.libcrypt.so.{%{soc},%{sov}}.hmac
|
||||||
%license %{_pkglicensedir}/COPYING.LIB
|
/%{_lib}/libcrypt.so.{%{soc},%{sov}}
|
||||||
%license %{_pkglicensedir}/LICENSING
|
|
||||||
%{_mandir}/man5/crypt.5.*
|
%{_mandir}/man5/crypt.5.*
|
||||||
|
|
||||||
|
|
||||||
@ -354,6 +334,7 @@ done
|
|||||||
* Wed Nov 14 2018 Björn Esser <besser82@fedoraproject.org> - 4.3.3-3
|
* Wed Nov 14 2018 Björn Esser <besser82@fedoraproject.org> - 4.3.3-3
|
||||||
- Add two upstream patches with minor fixes
|
- Add two upstream patches with minor fixes
|
||||||
- Add HMAC checksum file for the static library
|
- Add HMAC checksum file for the static library
|
||||||
|
- Drop the common sub-package
|
||||||
|
|
||||||
* Tue Nov 13 2018 Björn Esser <besser82@fedoraproject.org> - 4.3.3-2
|
* Tue Nov 13 2018 Björn Esser <besser82@fedoraproject.org> - 4.3.3-2
|
||||||
- Add a patch to define crypt_gensalt_r as macro, so applications
|
- Add a patch to define crypt_gensalt_r as macro, so applications
|
||||||
|
Loading…
Reference in New Issue
Block a user