[cyrus-sasl] fix the spec file in order to build the cyrus-sasl-sql plugin with support for PostgreSQL and MySQL
plautrba
plautrba at fedoraproject.org
Tue May 21 16:02:16 UTC 2013
commit be8a65632217990a7dda4821949ed24c4d948d1c
Author: Petr Lautrbach <plautrba at redhat.com>
Date: Tue May 21 17:16:14 2013 +0200
fix the spec file in order to build the cyrus-sasl-sql plugin with support for PostgreSQL and MySQL
cyrus-sasl.spec | 34 ++++++----------------------------
1 files changed, 6 insertions(+), 28 deletions(-)
---
diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec
index bfe08c1..6b4e26e 100644
--- a/cyrus-sasl.spec
+++ b/cyrus-sasl.spec
@@ -181,28 +181,6 @@ chmod -x include/*.h
%patch46 -p1 -b .size_t
%build
-# FIXME - we remove these files directly so that we can avoid using the -f
-# flag, which has a nasty habit of overwriting files like COPYING.
-rm -f config/config.guess config/config.sub
-rm -f config/ltconfig config/ltmain.sh config/libtool.m4
-rm -fr autom4te.cache
-libtoolize -c
-aclocal -I config -I cmulocal
-automake -a -c
-autoheader
-autoconf
-
-pushd saslauthd
-rm -f config/config.guess config/config.sub
-rm -f config/ltconfig config/ltmain.sh config/libtool.m4
-rm -fr autom4te.cache
-libtoolize -c
-aclocal -I config -I ../cmulocal -I ../config
-automake -a -c
-autoheader
-autoconf
-popd
-
CFLAGS="$RPM_OPT_FLAGS -fPIC"; export CFLAGS
# Find Kerberos.
@@ -275,7 +253,7 @@ echo "$LDFLAGS"
%if ! %{bootstrap_cyrus_sasl}
--enable-ldapdb \
%endif
- --enable-sql --with-mysql=%{_prefix} --with-pgsql=%{_prefix} \
+ --enable-sql --with-mysql=%{_libdir} --with-pgsql=%{_libdir} \
--without-sqlite \
"$@"
# --enable-auth-sasldb -- EXPERIMENTAL
@@ -285,7 +263,7 @@ make -C sample
# Build a small program to list the available mechanisms, because I need it.
pushd lib
-../libtool --tag=CC --mode=link %{__cc} -o sasl2-shared-mechlist -I../include $CFLAGS %{SOURCE7} $LDFLAGS ./libsasl2.la
+../libtool --mode=link %{__cc} -o sasl2-shared-mechlist -I../include $CFLAGS %{SOURCE7} $LDFLAGS ./libsasl2.la
%install
@@ -295,11 +273,11 @@ make install DESTDIR=$RPM_BUILD_ROOT sasldir=%{_plugindir2}
make install DESTDIR=$RPM_BUILD_ROOT sasldir=%{_plugindir2} -C plugins
install -m755 -d $RPM_BUILD_ROOT%{_bindir}
-./libtool --tag=CC --mode=install \
+./libtool --mode=install \
install -m755 sample/client $RPM_BUILD_ROOT%{_bindir}/sasl2-sample-client
-./libtool --tag=CC --mode=install \
+./libtool --mode=install \
install -m755 sample/server $RPM_BUILD_ROOT%{_bindir}/sasl2-sample-server
-./libtool --tag=CC --mode=install \
+./libtool --mode=install \
install -m755 saslauthd/testsaslauthd $RPM_BUILD_ROOT%{_sbindir}/testsaslauthd
# Install the saslauthd mdoc page in the expected location. Sure, it's not
@@ -323,7 +301,7 @@ install -m755 -d $RPM_BUILD_ROOT/%{_sysconfdir}/sasl2
install -m755 -d $RPM_BUILD_ROOT/%{_plugindir2}
# Provide an easy way to query the list of available mechanisms.
-./libtool --tag=CC --mode=install \
+./libtool --mode=install \
install -m755 lib/sasl2-shared-mechlist $RPM_BUILD_ROOT/%{_sbindir}/
# Remove unpackaged files from the buildroot.
More information about the scm-commits
mailing list