[packages/mailx] - avoid BC heimdal-devel; just patch makeconfig when needed

arekm arekm at pld-linux.org
Sat Feb 16 21:58:27 CET 2013


commit 9d2b7fd0cb44a9efa8fd2452d8a8fedcb5873cc1
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sat Feb 16 21:58:25 2013 +0100

    - avoid BC heimdal-devel; just patch makeconfig when needed

 mailx.spec | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
---
diff --git a/mailx.spec b/mailx.spec
index bccfb28..48da531 100644
--- a/mailx.spec
+++ b/mailx.spec
@@ -18,12 +18,7 @@ Patch3:		%{name}-openssl.patch
 Patch4:		%{name}-ipv6.patch
 Patch5:		%{name}-pager.patch
 URL:		http://heirloom.sourceforge.net/mailx.html
-%if %{with kerberos5}
-BuildRequires:	heimdal-devel
-%else
-BuildConflicts:	heimdal-devel
-BuildConflicts:	krb5-devel
-%endif
+%{?with_kerberos5:BuildRequires:	heimdal-devel}
 BuildRequires:	openssl-devel >= 0.9.7d
 Obsoletes:	nail
 Obsoletes:	nail-mail
@@ -53,6 +48,8 @@ IMAP, wątkowanie wiadomości, punktacja i filtrowanie.
 %patch4 -p1
 %patch5 -p1
 
+%{!?with_kerberos5:sed -i -e 's#gssapi.h#crap.h#g' makeconfig}
+
 %build
 %{__make} \
 	CC="%{__cc}" \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mailx.git/commitdiff/9d2b7fd0cb44a9efa8fd2452d8a8fedcb5873cc1



More information about the pld-cvs-commit mailing list