[packages/libxcrypt] don't customize _includedir when building as default crypt

atler atler at pld-linux.org
Sun Oct 25 02:22:10 CEST 2020


commit f7f4363a9f9945f0f5e1d32ac4ed14d94b6e5f9f
Author: Jan Palus <atler at pld-linux.org>
Date:   Sun Oct 25 02:20:14 2020 +0200

    don't customize _includedir when building as default crypt

 libxcrypt.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/libxcrypt.spec b/libxcrypt.spec
index 1f46a14..84055e3 100644
--- a/libxcrypt.spec
+++ b/libxcrypt.spec
@@ -86,7 +86,7 @@ Ten pakiet zawiera statyczną wersję biblioteki libxcrypt.
 %{__autoheader}
 %{__automake}
 %configure \
-	--includedir=%{_includedir}/xcrypt \
+	%{!?with_default_crypt:--includedir=%{_includedir}/xcrypt} \
 	--disable-werror \
 	--disable-xcrypt-compat-files
 %{__make}
@@ -123,7 +123,11 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{libname}.so
+%if %{with default_crypt}
+%{_includedir}/*.h
+%else
 %{_includedir}/xcrypt
+%endif
 %{_pkgconfigdir}/libcrypt.pc
 %{_pkgconfigdir}/libxcrypt.pc
 %{_mandir}/man3/crypt_checksalt.3*
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libxcrypt.git/commitdiff/f7f4363a9f9945f0f5e1d32ac4ed14d94b6e5f9f



More information about the pld-cvs-commit mailing list