Drop compat-devel package
This commit is contained in:
parent
cb277a8220
commit
7555571a0e
@ -52,7 +52,7 @@ fi \
|
|||||||
|
|
||||||
Name: libxcrypt
|
Name: libxcrypt
|
||||||
Version: 4.2.1
|
Version: 4.2.1
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
Summary: Extended crypt library for DES, MD5, Blowfish and others
|
Summary: Extended crypt library for DES, MD5, Blowfish and others
|
||||||
|
|
||||||
# For explicit license breakdown, see the
|
# For explicit license breakdown, see the
|
||||||
@ -140,18 +140,6 @@ encrypt_r, setkey, setkey_r, and fcrypt functions.
|
|||||||
|
|
||||||
All existing binary executables linked against glibc's libcrypt should
|
All existing binary executables linked against glibc's libcrypt should
|
||||||
work unmodified with this version of the libxcrypt.
|
work unmodified with this version of the libxcrypt.
|
||||||
|
|
||||||
|
|
||||||
%package compat-devel
|
|
||||||
Summary: Development files for %{name}-compat
|
|
||||||
|
|
||||||
Requires: %{name}-compat%{?_isa} == %{version}-%{release}
|
|
||||||
Requires: %{name}-devel%{?_isa} == %{version}-%{release}
|
|
||||||
|
|
||||||
%description compat-devel
|
|
||||||
You really do NOT need this package, unless your application needs to
|
|
||||||
be linked against one of the legacy API functions: encrypt, encrypt_r,
|
|
||||||
setkey, setkey_r, or fcrypt provided by libcrypt.so.1.
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
|
||||||
@ -172,12 +160,11 @@ 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}-compat-devel%{?_isa} == %{version}-%{release}
|
|
||||||
Requires: %{name}-devel%{?_isa} == %{version}-%{release}
|
Requires: %{name}-devel%{?_isa} == %{version}-%{release}
|
||||||
Requires: glibc-static%{?_isa} >= 2.26.9000-46
|
Requires: glibc-static%{?_isa} >= 2.26.9000-46
|
||||||
|
|
||||||
%description static
|
%description static
|
||||||
This package contains the libxcrypt static libraries for -static
|
This package contains the libxcrypt static library for -static
|
||||||
linking.
|
linking.
|
||||||
|
|
||||||
You don't need this, unless you link statically, which is highly
|
You don't need this, unless you link statically, which is highly
|
||||||
@ -224,21 +211,12 @@ popd
|
|||||||
%install
|
%install
|
||||||
%if %{with new_api}
|
%if %{with new_api}
|
||||||
%make_install -C %{_vpath_builddir}-compat
|
%make_install -C %{_vpath_builddir}-compat
|
||||||
%{__rm} -fr %{buildroot}%{_bindir} \
|
%{__rm} -fr %{buildroot}%{_bindir} \
|
||||||
%{buildroot}%{_includedir} \
|
%{buildroot}%{_includedir} \
|
||||||
%{buildroot}%{_libdir}/pkgconfig/libcrypt.pc \
|
%{buildroot}%{_libdir}/libcrypt.{a,so} \
|
||||||
%{buildroot}%{_mandir} \
|
%{buildroot}%{_libdir}/pkgconfig \
|
||||||
|
%{buildroot}%{_mandir} \
|
||||||
%{buildroot}%{_sbindir}
|
%{buildroot}%{_sbindir}
|
||||||
%{__mv} -f %{buildroot}/%{_lib}/libcrypt.so \
|
|
||||||
%{buildroot}/%{_lib}/libcrypt%{csoc}.so
|
|
||||||
%{__mv} -f %{buildroot}/%{_lib}/libcrypt.a \
|
|
||||||
%{buildroot}/%{_lib}/libcrypt%{csoc}.a
|
|
||||||
%{__mv} -f %{buildroot}%{_libdir}/pkgconfig/%{name}.pc \
|
|
||||||
%{buildroot}%{_libdir}/pkgconfig/%{name}%{csoc}.pc
|
|
||||||
%{__sed} -i -e 's!\-lcrypt!&%{csoc}!g' -e 's!%{name}!&%{csoc}!g' \
|
|
||||||
%{buildroot}%{_libdir}/pkgconfig/%{name}%{csoc}.pc
|
|
||||||
%{__ln_s} %{name}%{csoc}.pc \
|
|
||||||
%{buildroot}%{_libdir}/pkgconfig/libcrypt%{csoc}.pc
|
|
||||||
%endif
|
%endif
|
||||||
%make_install -C %{_vpath_builddir}
|
%make_install -C %{_vpath_builddir}
|
||||||
|
|
||||||
@ -298,12 +276,6 @@ done
|
|||||||
%files compat
|
%files compat
|
||||||
/%{_lib}/.libcrypt.so.{%{csoc},%{csov}}.hmac
|
/%{_lib}/.libcrypt.so.{%{csoc},%{csov}}.hmac
|
||||||
/%{_lib}/libcrypt.so.{%{csoc},%{csov}}
|
/%{_lib}/libcrypt.so.{%{csoc},%{csov}}
|
||||||
|
|
||||||
|
|
||||||
%files compat-devel
|
|
||||||
/%{_lib}/libcrypt%{csoc}.so
|
|
||||||
%{_libdir}/pkgconfig/libcrypt%{csoc}.pc
|
|
||||||
%{_libdir}/pkgconfig/%{name}%{csoc}.pc
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
|
||||||
@ -319,12 +291,12 @@ done
|
|||||||
|
|
||||||
%files static
|
%files static
|
||||||
/%{_lib}/libcrypt.a
|
/%{_lib}/libcrypt.a
|
||||||
%if %{with new_api}
|
|
||||||
/%{_lib}/libcrypt%{csoc}.a
|
|
||||||
%endif
|
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Oct 01 2018 Björn Esser <besser82@fedoraproject.org> - 4.2.1-3
|
||||||
|
- Drop compat-devel package
|
||||||
|
|
||||||
* Sun Sep 30 2018 Björn Esser <besser82@fedoraproject.org> - 4.2.1-2
|
* Sun Sep 30 2018 Björn Esser <besser82@fedoraproject.org> - 4.2.1-2
|
||||||
- Build out-of-tree
|
- Build out-of-tree
|
||||||
- Split off noarch-bits into common sub-package
|
- Split off noarch-bits into common sub-package
|
||||||
|
Loading…
Reference in New Issue
Block a user