fix the spec file in order to build the cyrus-sasl-sql plugin with support for PostgreSQL and MySQL

This commit is contained in:
Petr Lautrbach 2013-05-21 17:16:14 +02:00
parent bee9ee8a16
commit be8a656322

View File

@ -181,28 +181,6 @@ chmod -x include/*.h
%patch46 -p1 -b .size_t %patch46 -p1 -b .size_t
%build %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 CFLAGS="$RPM_OPT_FLAGS -fPIC"; export CFLAGS
# Find Kerberos. # Find Kerberos.
@ -275,7 +253,7 @@ echo "$LDFLAGS"
%if ! %{bootstrap_cyrus_sasl} %if ! %{bootstrap_cyrus_sasl}
--enable-ldapdb \ --enable-ldapdb \
%endif %endif
--enable-sql --with-mysql=%{_prefix} --with-pgsql=%{_prefix} \ --enable-sql --with-mysql=%{_libdir} --with-pgsql=%{_libdir} \
--without-sqlite \ --without-sqlite \
"$@" "$@"
# --enable-auth-sasldb -- EXPERIMENTAL # --enable-auth-sasldb -- EXPERIMENTAL
@ -285,7 +263,7 @@ make -C sample
# Build a small program to list the available mechanisms, because I need it. # Build a small program to list the available mechanisms, because I need it.
pushd lib 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 %install
@ -295,11 +273,11 @@ make install DESTDIR=$RPM_BUILD_ROOT sasldir=%{_plugindir2}
make install DESTDIR=$RPM_BUILD_ROOT sasldir=%{_plugindir2} -C plugins make install DESTDIR=$RPM_BUILD_ROOT sasldir=%{_plugindir2} -C plugins
install -m755 -d $RPM_BUILD_ROOT%{_bindir} 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 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 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 -m755 saslauthd/testsaslauthd $RPM_BUILD_ROOT%{_sbindir}/testsaslauthd
# Install the saslauthd mdoc page in the expected location. Sure, it's not # 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} install -m755 -d $RPM_BUILD_ROOT/%{_plugindir2}
# Provide an easy way to query the list of available mechanisms. # 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}/ install -m755 lib/sasl2-shared-mechlist $RPM_BUILD_ROOT/%{_sbindir}/
# Remove unpackaged files from the buildroot. # Remove unpackaged files from the buildroot.