[packages/dovecot] Put -rpath option to the dovecot-config file

jajcus jajcus at pld-linux.org
Mon Dec 9 16:12:53 CET 2013


commit 469a45314c2b256072845ab7ebdca05c3cfdce5f
Author: Jacek Konieczny <j.konieczny at eggsoft.pl>
Date:   Mon Dec 9 15:48:52 2013 +0100

    Put -rpath option to the dovecot-config file
    
    This way code built with dovecot-devel (like dovecot-pigeonhole)
    can find the dovecot libraries.

 dovecot-rpath.patch | 12 ++++++++++++
 dovecot.spec        |  2 ++
 2 files changed, 14 insertions(+)
---
diff --git a/dovecot.spec b/dovecot.spec
index 974361f..ff070bb 100644
--- a/dovecot.spec
+++ b/dovecot.spec
@@ -22,6 +22,7 @@ Source2:	%{name}.init
 Source3:	%{name}.sysconfig
 Source4:	%{name}.tmpfiles
 Patch0:		%{name}-config.patch
+Patch1:		%{name}-rpath.patch
 URL:		http://dovecot.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -145,6 +146,7 @@ Współdzielone biblioteki Dovecota.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %{__sed} -i 's,/usr/lib/dovecot,%{_libdir}/dovecot,g' doc/example-config/*.conf doc/example-config/conf.d/*.conf
 
diff --git a/dovecot-rpath.patch b/dovecot-rpath.patch
new file mode 100644
index 0000000..810cea0
--- /dev/null
+++ b/dovecot-rpath.patch
@@ -0,0 +1,12 @@
+diff -dur dovecot-2.2.9.orig/Makefile.am dovecot-2.2.9/Makefile.am
+--- dovecot-2.2.9.orig/Makefile.am	2013-11-24 14:37:39.000000000 +0100
++++ dovecot-2.2.9/Makefile.am	2013-12-09 15:47:40.000000000 +0100
+@@ -64,7 +64,7 @@
+ 	$(mkdir_p) $(DESTDIR)$(pkglibdir); \
+ 	grep -v '^LIBDOVECOT_.*_INCLUDE' dovecot-config | \
+ 	grep -v '^LIBDOVECOT.*_DEPS' | sed \
+-	-e "s|^\(LIBDOVECOT\)=.*$$|\1='-L$(pkglibdir) -ldovecot'|" \
++	-e "s|^\(LIBDOVECOT\)=.*$$|\1='-rpath $(pkglibdir) -L$(pkglibdir) -ldovecot'|" \
+ 	-e "s|^\(LIBDOVECOT_LOGIN\)=.*$$|\1='-ldovecot-login $(SSL_LIBS)'|" \
+ 	-e "s|^\(LIBDOVECOT_SQL\)=.*$$|\1=-ldovecot-sql|" \
+ 	-e "s|^\(LIBDOVECOT_COMPRESS\)=.*$$|\1=-ldovecot-compression|" \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/dovecot.git/commitdiff/469a45314c2b256072845ab7ebdca05c3cfdce5f



More information about the pld-cvs-commit mailing list