# HG changeset patch
# User Michael Schloh von Bennewitz <michael@schloh.com>
# Date 1346602440 -7200
# Node ID 57a8260ef4606167f08f759f8caa35902f97f5f6
# Parent  9da33cc654ba46e3232c1979890abc467f08c2b3
Fully correct this time the defective sqlite(1) library detection.
Additionally, reorder the pkg-config(1) arguments according to the
man page usage description.

diff -r 9da33cc654ba -r 57a8260ef460 subversion/subversion.spec
--- a/subversion/subversion.spec	Sat Sep 01 18:45:32 2012 +0200
+++ b/subversion/subversion.spec	Sun Sep 02 18:14:00 2012 +0200
@@ -96,12 +96,6 @@
         -e 's;\(\$ac_abs_srcdir/configure \$ac_configure_args\);\1 --disable-shared;' \
         configure
 
-    #   patch: accommodate defective sqlite3_close(3) test from configure
-    %{l_shtool} subst \
-        -e 's;\(SVN_SQLITE_INCLUDES *= *\).*;\1`pkg-config --cflags-only-I sqlite3`;' \
-        -e 's;\(SVN_SQLITE_LIBS *= *\).*;\1`pkg-config --libs-only-l sqlite3`;' \
-        Makefile.in
-
     #   patch: adjust path to configuration directory
     %{l_shtool} subst \
         -e 's;/etc/subversion;%{l_prefix}/etc/subversion;g' \
@@ -114,15 +108,15 @@
     CFLAGS="%{l_cflags -O}" \
     CPPFLAGS="%{l_cppflags libxml2 .} -DSQLITE_THREADSAFE=1" \
 %if "%{with_sasl}" == "yes" && "%{with_db}" == "yes"
-    LDFLAGS="%{l_ldflags} `pkg-config db sasl --libs-only-L` %{l_fsl_ldflags}" \
-    LIBS="`pkg-config db sasl --libs-only-l` -lz %{l_fsl_libs}" \
+    LDFLAGS="%{l_ldflags} `pkg-config --libs-only-L db sasl sqlite3` %{l_fsl_ldflags}" \
+    LIBS="`pkg-config --libs-only-l db sasl sqlite3` -lz %{l_fsl_libs}" \
 %else
 %if "%{with_sasl}" == "yes"
-    LDFLAGS="%{l_ldflags} `pkg-config sasl --libs-only-L` %{l_fsl_ldflags}" \
-    LIBS="`pkg-config sasl --libs-only-l` `pkg-config apr-util-1 --libs-only-l` -lz %{l_fsl_libs}" \
+    LDFLAGS="%{l_ldflags} `pkg-config --libs-only-L sasl sqlite3` %{l_fsl_ldflags}" \
+    LIBS="`pkg-config --libs-only-l sasl apr-util-1 sqlite3` -lz %{l_fsl_libs}" \
 %else
     LDFLAGS="%{l_ldflags} %{l_fsl_ldflags}" \
-    LIBS="`pkg-config apr-util-1 --libs-only-l` -lz %{l_fsl_libs}" \
+    LIBS="`pkg-config --libs-only-l apr-util-1 sqlite3` -lz %{l_fsl_libs}" \
 %endif
 %endif
     CONFIG_SHELL="%{l_bash}" \