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

Move library from %%_lib to %%_libdir

Browse Source
This commit is contained in:
Björn Esser 2020-04-02 23:15:40 +02:00
parent 2277b813c0
commit c31a4a552f
No known key found for this signature in database
GPG Key ID: F52E98007594C21D
1 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
libxcrypt.spec
View File

@ -103,7 +103,6 @@
# Common configure options. # Common configure options.
%global common_configure_options \\\ %global common_configure_options \\\
--libdir=/%{_lib} \\\
--disable-failure-tokens \\\ --disable-failure-tokens \\\
--disable-silent-rules \\\ --disable-silent-rules \\\
--enable-shared \\\ --enable-shared \\\
@ -124,29 +123,29 @@
# Add generation of HMAC checksums of the final stripped # Add generation of HMAC checksums of the final stripped
# binaries. %%define with lazy globbing is used here # binaries. %%define with lazy globbing is used here
# intentionally, because using %%global does not work. # intentionally, because using %%global does not work.
%define __spec_install_post \ %define __spec_install_post \
%{?__debug_package:%{__debug_install_post}} \ %{?__debug_package:%{__debug_install_post}} \
%{__arch_install_post} \ %{__arch_install_post} \
%{__os_install_post} \ %{__os_install_post} \
fipshmac %{buildroot}/%{_lib}/libcrypt.so.%{sov} \ fipshmac %{buildroot}%{_libdir}/libcrypt.so.%{sov} \
ln -s .libcrypt.so.%{sov}.hmac \\\ ln -s .libcrypt.so.%{sov}.hmac \\\
%{buildroot}/%{_lib}/.libcrypt.so.%{soc}.hmac \ %{buildroot}%{_libdir}/.libcrypt.so.%{soc}.hmac \
if [[ %{with staticlib} == 1 ]]; then \ if [[ %{with staticlib} == 1 ]]; then \
fipshmac %{buildroot}/%{_lib}/libcrypt.a \ fipshmac %{buildroot}%{_libdir}/libcrypt.a \
ln -s .libcrypt.a.hmac \\\ ln -s .libcrypt.a.hmac \\\
%{buildroot}/%{_lib}/.libxcrypt.a.hmac \ %{buildroot}%{_libdir}/.libxcrypt.a.hmac \
fi \ fi \
if [[ %{with compat_pkg} == 1 ]]; then \ if [[ %{with compat_pkg} == 1 ]]; then \
fipshmac %{buildroot}/%{_lib}/libcrypt.so.%{csov} \ fipshmac %{buildroot}%{_libdir}/libcrypt.so.%{csov} \
ln -s .libcrypt.so.%{csov}.hmac \\\ ln -s .libcrypt.so.%{csov}.hmac \\\
%{buildroot}/%{_lib}/.libcrypt.so.%{csoc}.hmac \ %{buildroot}%{_libdir}/.libcrypt.so.%{csoc}.hmac \
fi \ fi \
%{nil} %{nil}
Name: libxcrypt Name: libxcrypt
Version: 4.4.15 Version: 4.4.15
Release: 1%{?dist} Release: 2%{?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
@ -427,8 +426,8 @@ done
%endif %endif
%doc %{_pkgdocdir}/THANKS %doc %{_pkgdocdir}/THANKS
%license AUTHORS COPYING.LIB LICENSING %license AUTHORS COPYING.LIB LICENSING
/%{_lib}/.libcrypt.so.{%{soc},%{sov}}.hmac %{_libdir}/.libcrypt.so.{%{soc},%{sov}}.hmac
/%{_lib}/libcrypt.so.{%{soc},%{sov}} %{_libdir}/libcrypt.so.{%{soc},%{sov}}
%{_mandir}/man5/crypt.5.* %{_mandir}/man5/crypt.5.*
@ -437,15 +436,15 @@ done
%if %{with enosys_stubs} %if %{with enosys_stubs}
%doc %{_pkgdocdir}/README.posix %doc %{_pkgdocdir}/README.posix
%endif %endif
/%{_lib}/.libcrypt.so.{%{csoc},%{csov}}.hmac %{_libdir}/.libcrypt.so.{%{csoc},%{csov}}.hmac
/%{_lib}/libcrypt.so.{%{csoc},%{csov}} %{_libdir}/libcrypt.so.{%{csoc},%{csov}}
%endif %endif
%files devel %files devel
%doc %{_pkgdocdir}/ChangeLog %doc %{_pkgdocdir}/ChangeLog
%doc %{_pkgdocdir}/TODO %doc %{_pkgdocdir}/TODO
/%{_lib}/lib{,x}crypt.so %{_libdir}/lib{,x}crypt.so
%{_includedir}/{,x}crypt.h %{_includedir}/{,x}crypt.h
%{_libdir}/pkgconfig/{libcrypt,%{name}}.pc %{_libdir}/pkgconfig/{libcrypt,%{name}}.pc
%{_mandir}/man3/crypt{,_r,_ra,_rn}.3.* %{_mandir}/man3/crypt{,_r,_ra,_rn}.3.*
@ -457,12 +456,15 @@ done
%if %{with staticlib} %if %{with staticlib}
%files static %files static
%doc %{_pkgdocdir}/README.static %doc %{_pkgdocdir}/README.static
/%{_lib}/.lib{,x}crypt.a.hmac %{_libdir}/.lib{,x}crypt.a.hmac
/%{_lib}/lib{,x}crypt.a %{_libdir}/lib{,x}crypt.a
%endif %endif
%changelog %changelog
* Thu Apr 02 2020 Björn Esser <besser82@fedoraproject.org> - 4.4.15-2
- Move library from %%_lib to %%_libdir
* Wed Feb 26 2020 Björn Esser <besser82@fedoraproject.org> - 4.4.15-1 * Wed Feb 26 2020 Björn Esser <besser82@fedoraproject.org> - 4.4.15-1
- New upstream release - New upstream release