[packages/imap] - don't override _includedir

qboosh qboosh at pld-linux.org
Sat Sep 21 10:14:27 CEST 2024


commit ffa8197ca0d7f8a47fddfe0e1018740e3377863a
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Sep 21 09:38:42 2024 +0200

    - don't override _includedir

 imap.spec | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/imap.spec b/imap.spec
index a323326..57439ef 100644
--- a/imap.spec
+++ b/imap.spec
@@ -50,7 +50,6 @@ Obsoletes:	imapdaemon
 Conflicts:	courier-imap
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_includedir	%{_prefix}/include/imap
 %if "%{pld_release}" == "th"
 %define		sslcertsdir	/etc/openssl/certs
 %define		sslkeysdir	/etc/openssl/private
@@ -365,16 +364,16 @@ cd ..
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_includedir},%{_libdir}}
+install -d $RPM_BUILD_ROOT{%{_includedir}/imap,%{_libdir}}
 
-install c-client/*.h $RPM_BUILD_ROOT%{_includedir}
-install c-client/linkage.c $RPM_BUILD_ROOT%{_includedir}
+install c-client/*.h $RPM_BUILD_ROOT%{_includedir}/imap
+install c-client/linkage.c $RPM_BUILD_ROOT%{_includedir}/imap
 install libc-client.a $RPM_BUILD_ROOT%{_libdir}/libc-client.a
 install c-client/libc-client.so $RPM_BUILD_ROOT%{_libdir}/libc-client.so.%{version}.0
 ln -sf libc-client.so.%{version}.0 $RPM_BUILD_ROOT%{_libdir}/libc-client.so
 
-%{__rm} $RPM_BUILD_ROOT%{_includedir}/unix.h \
-	$RPM_BUILD_ROOT%{_includedir}/os_*
+%{__rm} $RPM_BUILD_ROOT%{_includedir}/imap/unix.h \
+	$RPM_BUILD_ROOT%{_includedir}/imap/os_*
 
 %if %{with server}
 install -d $RPM_BUILD_ROOT/etc/{pam.d,security,sysconfig/rc-inetd} \
@@ -489,7 +488,7 @@ fi
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libc-client.so
-%{_includedir}
+%{_includedir}/imap
 
 %files static
 %defattr(644,root,root,755)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/imap.git/commitdiff/4d46a2bf4068578ccb03cd888917e7887916d171



More information about the pld-cvs-commit mailing list