From 989ff674f4a43c74d45147bf70dab879d99aab42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 24 Jan 2019 09:29:52 +0100 Subject: [PATCH] Optimize file removal for compatibility library --- libxcrypt.spec | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/libxcrypt.spec b/libxcrypt.spec index 547f798..41e36e3 100644 --- a/libxcrypt.spec +++ b/libxcrypt.spec @@ -110,7 +110,7 @@ fi \ Name: libxcrypt Version: 4.4.2 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Extended crypt library for descrypt, md5crypt, bcrypt, and others # For explicit license breakdown, see the @@ -284,19 +284,17 @@ popd %make_install -C %{_vpath_builddir}-compat # Cleanup everything we do not need from the compatibility library. -%{__rm} -fr %{buildroot}%{_bindir} \ - %{buildroot}%{_includedir} \ - %{buildroot}/%{_lib}/lib{,x}crypt.{a,so} \ - %{buildroot}%{_libdir}/pkgconfig \ - %{buildroot}%{_mandir} \ - %{buildroot}%{_sbindir} +%{_bindir}/find %{buildroot} -xtype f -not -name 'libcrypt.so.%{csoc}*' \ + -delete -print +%{_bindir}/find %{buildroot} -type l -not -name 'libcrypt.so.%{csoc}*' \ + -delete -print %endif # Install the default system library. %make_install -C %{_vpath_builddir} # Get rid of libtool crap. -%{_bindir}/find %{buildroot} -name '*.la' -print -delete +%{_bindir}/find %{buildroot} -name '*.la' -delete -print # Install documentation to shared %%_pkgdocdir. %{__install} -Dpm 0644 -t %{buildroot}%{_pkgdocdir} \ @@ -378,6 +376,9 @@ done %changelog +* Thu Jan 24 2019 Björn Esser - 4.4.2-8 +- Optimize file removal for compatibility library + * Mon Jan 21 2019 Björn Esser - 4.4.2-7 - Add two upstream patches to fix build with GCC 9