[redland-bindings/f13/master] downgrade patches
Thomas Vander Stichele
thomasvs at fedoraproject.org
Fri Mar 4 19:26:32 UTC 2011
commit 9237347d7768979f6ddbfd241dd69a9034284745
Author: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date: Fri Mar 4 20:26:22 2011 +0100
downgrade patches
0a36f02c4b354ebd7fc1906c45e3463e328f613d.patch | 32 --
113a26b0fb22519ae7610e78570ab8b17b483139.patch | 33 --
autoreconf.patch | 454 ++++++++++++++++++++++++
ba9f04f703fc62e4b8a67b79c37824e1b9b256ba.patch | 217 -----------
python.sitearch.patch | 26 ++
redland-bindings.spec | 28 +-
ruby.sitearch.patch | 405 +++++++++++++++++++++
sources | 2 +-
8 files changed, 903 insertions(+), 294 deletions(-)
---
diff --git a/autoreconf.patch b/autoreconf.patch
new file mode 100644
index 0000000..9644c50
--- /dev/null
+++ b/autoreconf.patch
@@ -0,0 +1,454 @@
+Index: redland-bindings/redland-bindings-1.0.7.1/configure
+===================================================================
+--- redland-bindings.orig/redland-bindings-1.0.7.1/configure
++++ redland-bindings/redland-bindings-1.0.7.1/configure
+@@ -4419,7 +4419,7 @@ linux* | k*bsd*-gnu)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+-netbsd* | netbsdelf*-gnu)
++netbsd*)
+ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+ else
+@@ -4605,6 +4605,7 @@ s390*-*linux*|sparc*-*linux*)
+ esac
+ ;;
+ *64-bit*)
++ libsuff=64
+ case $host in
+ x86_64-*kfreebsd*-gnu)
+ LD="${LD-ld} -m elf_x86_64_fbsd"
+@@ -6552,11 +6553,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:6555: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:6556: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:6559: \$? = $ac_status" >&5
++ echo "$as_me:6560: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -6842,11 +6843,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:6845: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:6846: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:6849: \$? = $ac_status" >&5
++ echo "$as_me:6850: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -6946,11 +6947,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:6949: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:6950: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:6953: \$? = $ac_status" >&5
++ echo "$as_me:6954: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -7210,13 +7211,12 @@ EOF
+ $echo "local: *; };" >> $output_objdir/$libname.ver~
+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ fi
+- link_all_deplibs=no
+ else
+ ld_shlibs=no
+ fi
+ ;;
+
+- netbsd* | netbsdelf*-gnu)
++ netbsd*)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ wlarc=
+@@ -7760,7 +7760,7 @@ if test -z "$aix_libpath"; then aix_libp
+ link_all_deplibs=yes
+ ;;
+
+- netbsd* | netbsdelf*-gnu)
++ netbsd*)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
+ else
+@@ -8455,11 +8455,13 @@ linux* | k*bsd*-gnu)
+ # Some rework will be needed to allow for fast_install
+ # before this can be enabled.
+ hardcode_into_libs=yes
++ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+ fi
+
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -8471,18 +8473,6 @@ linux* | k*bsd*-gnu)
+ dynamic_linker='GNU/Linux ld.so'
+ ;;
+
+-netbsdelf*-gnu)
+- version_type=linux
+- need_lib_prefix=no
+- need_version=no
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=no
+- hardcode_into_libs=yes
+- dynamic_linker='NetBSD ld.elf_so'
+- ;;
+-
+ netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
+@@ -9308,7 +9298,7 @@ else
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
+-#line 9311 "configure"
++#line 9301 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -9408,7 +9398,7 @@ else
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
+-#line 9411 "configure"
++#line 9401 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -11018,7 +11008,7 @@ if test -z "$aix_libpath"; then aix_libp
+ ;;
+ esac
+ ;;
+- netbsd* | netbsdelf*-gnu)
++ netbsd*)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+ wlarc=
+@@ -11719,7 +11709,7 @@ echo $ECHO_N "checking for $compiler opt
+ ;;
+ esac
+ ;;
+- netbsd* | netbsdelf*-gnu)
++ netbsd*)
+ ;;
+ osf3* | osf4* | osf5*)
+ case $cc_basename in
+@@ -11828,11 +11818,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:11831: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:11821: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:11835: \$? = $ac_status" >&5
++ echo "$as_me:11825: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -11932,11 +11922,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:11935: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:11925: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:11939: \$? = $ac_status" >&5
++ echo "$as_me:11929: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -12004,9 +11994,6 @@ echo $ECHO_N "checking whether the $comp
+ cygwin* | mingw*)
+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+ ;;
+- linux* | k*bsd*-gnu)
+- link_all_deplibs_CXX=no
+- ;;
+ *)
+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ ;;
+@@ -12436,11 +12423,13 @@ linux* | k*bsd*-gnu)
+ # Some rework will be needed to allow for fast_install
+ # before this can be enabled.
+ hardcode_into_libs=yes
++ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+ fi
+
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -12452,18 +12441,6 @@ linux* | k*bsd*-gnu)
+ dynamic_linker='GNU/Linux ld.so'
+ ;;
+
+-netbsdelf*-gnu)
+- version_type=linux
+- need_lib_prefix=no
+- need_version=no
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=no
+- hardcode_into_libs=yes
+- dynamic_linker='NetBSD ld.elf_so'
+- ;;
+-
+ netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
+@@ -13509,11 +13486,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:13512: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:13489: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:13516: \$? = $ac_status" >&5
++ echo "$as_me:13493: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -13613,11 +13590,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:13616: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:13593: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:13620: \$? = $ac_status" >&5
++ echo "$as_me:13597: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -13877,13 +13854,12 @@ EOF
+ $echo "local: *; };" >> $output_objdir/$libname.ver~
+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ fi
+- link_all_deplibs_F77=no
+ else
+ ld_shlibs_F77=no
+ fi
+ ;;
+
+- netbsd* | netbsdelf*-gnu)
++ netbsd*)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ wlarc=
+@@ -14407,7 +14383,7 @@ if test -z "$aix_libpath"; then aix_libp
+ link_all_deplibs_F77=yes
+ ;;
+
+- netbsd* | netbsdelf*-gnu)
++ netbsd*)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
+ else
+@@ -15050,11 +15026,13 @@ linux* | k*bsd*-gnu)
+ # Some rework will be needed to allow for fast_install
+ # before this can be enabled.
+ hardcode_into_libs=yes
++ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+ fi
+
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -15066,18 +15044,6 @@ linux* | k*bsd*-gnu)
+ dynamic_linker='GNU/Linux ld.so'
+ ;;
+
+-netbsdelf*-gnu)
+- version_type=linux
+- need_lib_prefix=no
+- need_version=no
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=no
+- hardcode_into_libs=yes
+- dynamic_linker='NetBSD ld.elf_so'
+- ;;
+-
+ netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
+@@ -15813,11 +15779,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:15816: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15782: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:15820: \$? = $ac_status" >&5
++ echo "$as_me:15786: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -16103,11 +16069,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:16106: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16072: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:16110: \$? = $ac_status" >&5
++ echo "$as_me:16076: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -16207,11 +16173,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:16210: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16176: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:16214: \$? = $ac_status" >&5
++ echo "$as_me:16180: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -16471,13 +16437,12 @@ EOF
+ $echo "local: *; };" >> $output_objdir/$libname.ver~
+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ fi
+- link_all_deplibs_GCJ=no
+ else
+ ld_shlibs_GCJ=no
+ fi
+ ;;
+
+- netbsd* | netbsdelf*-gnu)
++ netbsd*)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ wlarc=
+@@ -17021,7 +16986,7 @@ if test -z "$aix_libpath"; then aix_libp
+ link_all_deplibs_GCJ=yes
+ ;;
+
+- netbsd* | netbsdelf*-gnu)
++ netbsd*)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
+ else
+@@ -17664,11 +17629,13 @@ linux* | k*bsd*-gnu)
+ # Some rework will be needed to allow for fast_install
+ # before this can be enabled.
+ hardcode_into_libs=yes
++ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+ fi
+
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -17680,18 +17647,6 @@ linux* | k*bsd*-gnu)
+ dynamic_linker='GNU/Linux ld.so'
+ ;;
+
+-netbsdelf*-gnu)
+- version_type=linux
+- need_lib_prefix=no
+- need_version=no
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=no
+- hardcode_into_libs=yes
+- dynamic_linker='NetBSD ld.elf_so'
+- ;;
+-
+ netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
+@@ -21011,21 +20966,22 @@ echo "$as_me: $ac_file is unchanged" >&6
+ fi
+ rm -f "$tmp/out12"
+ # Compute $ac_file's index in $config_headers.
++_am_arg=$ac_file
+ _am_stamp_count=1
+ for _am_header in $config_headers :; do
+ case $_am_header in
+- $ac_file | $ac_file:* )
++ $_am_arg | $_am_arg:* )
+ break ;;
+ * )
+ _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+ esac
+ done
+-echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
+-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+- X$ac_file : 'X\(//\)[^/]' \| \
+- X$ac_file : 'X\(//\)$' \| \
+- X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
+-echo X$ac_file |
++echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
++$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++ X"$_am_arg" : 'X\(//\)[^/]' \| \
++ X"$_am_arg" : 'X\(//\)$' \| \
++ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
++echo X"$_am_arg" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+@@ -21062,7 +21018,7 @@ echo "$as_me: executing $ac_file command
+ # each Makefile.in and add a new line on top of each file to say so.
+ # Grep'ing the whole file is not good either: AIX grep has a line
+ # limit of 2048, but all sed's we know have understand at least 4000.
+- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
++ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+ dirpart=`$as_dirname -- "$mf" ||
+ $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$mf" : 'X\(//\)[^/]' \| \
diff --git a/python.sitearch.patch b/python.sitearch.patch
new file mode 100644
index 0000000..af5342e
--- /dev/null
+++ b/python.sitearch.patch
@@ -0,0 +1,26 @@
+Index: redland-bindings-1.0.7.1/configure
+===================================================================
+--- redland-bindings-1.0.7.1/configure.orig
++++ redland-bindings-1.0.7.1/configure
+@@ -19383,7 +19383,7 @@ echo "${ECHO_T}$PYTHON_INCLUDES" >&6; }
+
+ { echo "$as_me:$LINENO: checking Python libs" >&5
+ echo $ECHO_N "checking Python libs... $ECHO_C" >&6; }
+- PYTHON_LIB="${python_prefix}/lib/python${PYTHON_VERSION}/site-packages"
++ PYTHON_LIB=`$PYTHON -c 'from distutils.sysconfig import get_python_lib; print get_python_lib(1)'`
+
+ { echo "$as_me:$LINENO: result: $PYTHON_LIB" >&5
+ echo "${ECHO_T}$PYTHON_LIB" >&6; }
+Index: redland-bindings-1.0.7.1/configure.ac
+===================================================================
+--- redland-bindings-1.0.7.1/configure.ac.orig
++++ redland-bindings-1.0.7.1/configure.ac
+@@ -231,7 +231,7 @@ if test "X$PYTHON" != X; then
+ AC_MSG_RESULT($PYTHON_INCLUDES)
+
+ AC_MSG_CHECKING(Python libs)
+- PYTHON_LIB="${python_prefix}/lib/python${PYTHON_VERSION}/site-packages"
++ PYTHON_LIB=`$PYTHON -c 'from distutils.sysconfig import get_python_lib; print get_python_lib(1)'`
+ AC_SUBST(PYTHON_LIB)
+ AC_MSG_RESULT($PYTHON_LIB)
+
diff --git a/redland-bindings.spec b/redland-bindings.spec
index 11a03a8..af3415f 100644
--- a/redland-bindings.spec
+++ b/redland-bindings.spec
@@ -1,27 +1,28 @@
Name: redland-bindings
-Version: 1.0.11.1
-Release: 6%{?dist}
+Version: 1.0.7.1
+Release: 1%{?dist}
Summary: Redland RDF Application Framework API Bindings
Group: System Environment/Libraries
License: LGPLv2+ or GPLv2+ or ASL 2.0
URL: http://librdf.org/
Source: http://download.librdf.org/source/%{name}-%{version}.tar.gz
-# http://bugs.librdf.org/mantis/view.php?id=412
-Patch1: ba9f04f703fc62e4b8a67b79c37824e1b9b256ba.patch
-# http://bugs.librdf.org/mantis/view.php?id=398
-Patch2: 0a36f02c4b354ebd7fc1906c45e3463e328f613d.patch
-Patch3: 113a26b0fb22519ae7610e78570ab8b17b483139.patch
+Patch1: autoreconf.patch
+Patch2: python.sitearch.patch
+Patch3: ruby.sitearch.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%define redland_version 1.0.11
+%define redland_version 1.0.7
%{expand:%%define rhelrel %(test -e /etc/redhat-release -a ! -e /etc/fedora-release && perl -p -e 's@\D+([0-9\.]+)\D+@$1@' /etc/redhat-release || echo 0)}
%{expand:%%define rhel %(expr %{rhelrel} \> 0)}
+%{expand:%%define atmostrhel5 %(if [ %{rhelrel} -le 5 ]; then echo 1; else echo 0; fi)}
+
-# CentOS has MakeMaker in base perl package
-%if %{rhel}
+# CentOS 5 has MakeMaker in base perl package
+%if %{atmostrhel5}
%else
BuildRequires: perl-ExtUtils-MakeMaker
%endif
@@ -124,7 +125,7 @@ an interface to Ruby.
%prep
%setup -q
-%patch1 -p1
+%patch1 -p2
%patch2 -p1
%patch3 -p1
@@ -224,6 +225,11 @@ rm -rf $RPM_BUILD_ROOT
%{ruby_sitearch}/rdf
%changelog
+* Fri Mar 04 2011 Thomas Vander Stichele <thomas at apestaart dot org>
+- 1.0.7.1-1
+- build a lower version for EPEL 6
+- revert to old versions of patches
+
* Thu Mar 03 2011 Thomas Vander Stichele <thomas at apestaart dot org>
- 1.0.11.1-6
- Renamed base package to common, as suggested by Orcan.
diff --git a/ruby.sitearch.patch b/ruby.sitearch.patch
new file mode 100644
index 0000000..c722b4b
--- /dev/null
+++ b/ruby.sitearch.patch
@@ -0,0 +1,405 @@
+Index: redland-bindings-1.0.7.1/configure.ac
+===================================================================
+--- redland-bindings-1.0.7.1/configure.ac.orig
++++ redland-bindings-1.0.7.1/configure.ac
+@@ -265,12 +265,17 @@ if test "X$RUBY" != X; then
+
+ dnl need to change quotes to allow square brackets
+ changequote(<<, >>)dnl
++
+ ruby_prefix=`$RUBY -rrbconfig -e "print Config::CONFIG['archdir']"`
+- RUBY_LIB=`$RUBY -rrbconfig -e "puts Config::CONFIG['ruby_install_name']"`
+ LIBRUBYARG_SHARED=`$RUBY -rrbconfig -e "puts Config::CONFIG['LIBRUBYARG_SHARED']"`
+- RUBY_DIR=`$RUBY -rrbconfig -e "puts Config::CONFIG['archdir']"`
+- RUBY_LIBDIR=`$RUBY -rrbconfig -e "puts Config::CONFIG['rubylibdir']"`
++ dnl this will install in the sitearchdir; compare to Python above
++ dnl if some distros really need
++ dnl to install in the vendor dir, this should be made configureable with
++ dnl a configure argument
++ RUBY_ARCHDIR=`$RUBY -rrbconfig -e "puts Config::CONFIG['sitearchdir']"`
+ changequote([, ])dnl
++ AC_MSG_CHECKING(Ruby archdir)
++ AC_MSG_RESULT($RUBY_ARCHDIR)
+
+ RUBY_INCLUDES="-I$ruby_prefix"
+ else
+@@ -279,15 +284,11 @@ else
+ RUBY=:
+ RUBY_INCLUDES=
+ LIBRUBYARG_SHARED=
+- RUBY_LIB=
+- RUBY_DIR=
+- RUBY_LIBDIR=
++ RUBY_ARCHDIR=
+ fi
+ AC_SUBST(RUBY_INCLUDES)
+ AC_SUBST(LIBRUBYARG_SHARED)
+-AC_SUBST(RUBY_LIB)
+-AC_SUBST(RUBY_DIR)
+-AC_SUBST(RUBY_LIBDIR)
++AC_SUBST(RUBY_ARCHDIR)
+
+
+ AC_ARG_WITH(php, [ --with-php(=PHP) Enable the PHP interface], with_php="$withval", with_php="no")
+Index: redland-bindings-1.0.7.1/ruby/Makefile.am
+===================================================================
+--- redland-bindings-1.0.7.1/ruby/Makefile.am.orig
++++ redland-bindings-1.0.7.1/ruby/Makefile.am
+@@ -32,11 +32,9 @@ SWIG_CRUFT=
+ RDOC_DIR=rdoc
+ RDOC_STAMP=rdoc-stamp
+
+-rubylib=@RUBY_LIB@
+ librubyarg_shared=@LIBRUBYARG_SHARED@
+
+-rubydir=/usr/lib/$(rubylib)
+-rubyarchdir=@RUBY_DIR@
++rubyarchdir=@RUBY_ARCHDIR@
+
+ rubyarch_DATA=redland.so
+
+Index: redland-bindings-1.0.7.1/ruby/Makefile.in
+===================================================================
+--- redland-bindings-1.0.7.1/ruby/Makefile.in.orig
++++ redland-bindings-1.0.7.1/ruby/Makefile.in
+@@ -162,10 +162,8 @@ REDLAND_RUN = @REDLAND_RUN@
+ REDLAND_SWIG = @REDLAND_SWIG@
+ REDLAND_VERSION = @REDLAND_VERSION@
+ RUBY = @RUBY@
+-RUBY_DIR = @RUBY_DIR@
++RUBY_ARCHDIR = @RUBY_ARCHDIR@
+ RUBY_INCLUDES = @RUBY_INCLUDES@
+-RUBY_LIB = @RUBY_LIB@
+-RUBY_LIBDIR = @RUBY_LIBDIR@
+ RUBY_VERSION = @RUBY_VERSION@
+ SD = @SD@
+ SED = @SED@
+@@ -234,10 +232,8 @@ SWIG_OUTPUTS = $(RUBY_PACKAGE)_wrap.c
+ SWIG_CRUFT =
+ RDOC_DIR = rdoc
+ RDOC_STAMP = rdoc-stamp
+-rubylib = @RUBY_LIB@
+ librubyarg_shared = @LIBRUBYARG_SHARED@
+-rubydir = /usr/lib/$(rubylib)
+-rubyarchdir = @RUBY_DIR@
++rubyarchdir = @RUBY_ARCHDIR@
+ rubyarch_DATA = redland.so
+ EXTRA_DIST = example.rb test.rb \
+ redland-pre.i redland-types.i $(SWIG_OUTPUTS)
+Index: redland-bindings-1.0.7.1/ruby/lib/rdf/Makefile.am
+===================================================================
+--- redland-bindings-1.0.7.1/ruby/lib/rdf/Makefile.am.orig
++++ redland-bindings-1.0.7.1/ruby/lib/rdf/Makefile.am
+@@ -17,7 +17,7 @@
+ # full license terms.
+ #
+
+-rubydir=@RUBY_LIBDIR@/rdf
++rubydir=@RUBY_ARCHDIR@/rdf
+
+ ruby_DATA=redland.rb
+
+Index: redland-bindings-1.0.7.1/ruby/lib/rdf/Makefile.in
+===================================================================
+--- redland-bindings-1.0.7.1/ruby/lib/rdf/Makefile.in.orig
++++ redland-bindings-1.0.7.1/ruby/lib/rdf/Makefile.in
+@@ -162,10 +162,8 @@ REDLAND_RUN = @REDLAND_RUN@
+ REDLAND_SWIG = @REDLAND_SWIG@
+ REDLAND_VERSION = @REDLAND_VERSION@
+ RUBY = @RUBY@
+-RUBY_DIR = @RUBY_DIR@
++RUBY_ARCHDIR = @RUBY_ARCHDIR@
+ RUBY_INCLUDES = @RUBY_INCLUDES@
+-RUBY_LIB = @RUBY_LIB@
+-RUBY_LIBDIR = @RUBY_LIBDIR@
+ RUBY_VERSION = @RUBY_VERSION@
+ SD = @SD@
+ SED = @SED@
+@@ -226,7 +224,7 @@ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-rubydir = @RUBY_LIBDIR@/rdf
++rubydir = @RUBY_ARCHDIR@/rdf
+ ruby_DATA = redland.rb
+ EXTRA_DIST = redland.rb
+ SUBDIRS = redland
+Index: redland-bindings-1.0.7.1/ruby/lib/rdf/redland/Makefile.am
+===================================================================
+--- redland-bindings-1.0.7.1/ruby/lib/rdf/redland/Makefile.am.orig
++++ redland-bindings-1.0.7.1/ruby/lib/rdf/redland/Makefile.am
+@@ -17,7 +17,7 @@
+ # full license terms.
+ #
+
+-rubydir=@RUBY_LIBDIR@/rdf/redland
++rubydir=@RUBY_ARCHDIR@/rdf/redland
+
+ ruby_DATA=$(EXTRA_DIST)
+
+Index: redland-bindings-1.0.7.1/ruby/lib/rdf/redland/Makefile.in
+===================================================================
+--- redland-bindings-1.0.7.1/ruby/lib/rdf/redland/Makefile.in.orig
++++ redland-bindings-1.0.7.1/ruby/lib/rdf/redland/Makefile.in
+@@ -162,10 +162,8 @@ REDLAND_RUN = @REDLAND_RUN@
+ REDLAND_SWIG = @REDLAND_SWIG@
+ REDLAND_VERSION = @REDLAND_VERSION@
+ RUBY = @RUBY@
+-RUBY_DIR = @RUBY_DIR@
++RUBY_ARCHDIR = @RUBY_ARCHDIR@
+ RUBY_INCLUDES = @RUBY_INCLUDES@
+-RUBY_LIB = @RUBY_LIB@
+-RUBY_LIBDIR = @RUBY_LIBDIR@
+ RUBY_VERSION = @RUBY_VERSION@
+ SD = @SD@
+ SED = @SED@
+@@ -226,7 +224,7 @@ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-rubydir = @RUBY_LIBDIR@/rdf/redland
++rubydir = @RUBY_ARCHDIR@/rdf/redland
+ ruby_DATA = $(EXTRA_DIST)
+ EXTRA_DIST = constants.rb convert_owl.rb convertfoaf.rb dc.rb model.rb \
+ node.rb parser.rb query.rb resource.rb serializer.rb statement.rb \
+Index: redland-bindings-1.0.7.1/configure
+===================================================================
+--- redland-bindings-1.0.7.1/configure.orig
++++ redland-bindings-1.0.7.1/configure
+@@ -890,9 +890,7 @@ PYTHON_LIB
+ PYTHON_LDFLAGS
+ RUBY_INCLUDES
+ LIBRUBYARG_SHARED
+-RUBY_LIB
+-RUBY_DIR
+-RUBY_LIBDIR
++RUBY_ARCHDIR
+ PHP_VERSION
+ RUBY_VERSION
+ REDLAND_CONFIG
+@@ -4540,7 +4538,7 @@ ia64-*-hpux*)
+ ;;
+ *-*-irix6*)
+ # Find out which ABI we are using.
+- echo '#line 4543 "configure"' > conftest.$ac_ext
++ echo '#line 4541 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+@@ -6553,11 +6551,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:6556: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:6554: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:6560: \$? = $ac_status" >&5
++ echo "$as_me:6558: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -6843,11 +6841,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:6846: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:6844: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:6850: \$? = $ac_status" >&5
++ echo "$as_me:6848: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -6947,11 +6945,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:6950: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:6948: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:6954: \$? = $ac_status" >&5
++ echo "$as_me:6952: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -9298,7 +9296,7 @@ else
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
+-#line 9301 "configure"
++#line 9299 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -9398,7 +9396,7 @@ else
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
+-#line 9401 "configure"
++#line 9399 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -11818,11 +11816,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:11821: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:11819: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:11825: \$? = $ac_status" >&5
++ echo "$as_me:11823: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -11922,11 +11920,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:11925: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:11923: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:11929: \$? = $ac_status" >&5
++ echo "$as_me:11927: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -13486,11 +13484,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:13489: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:13487: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:13493: \$? = $ac_status" >&5
++ echo "$as_me:13491: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -13590,11 +13588,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:13593: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:13591: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:13597: \$? = $ac_status" >&5
++ echo "$as_me:13595: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -15779,11 +15777,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:15782: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15780: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:15786: \$? = $ac_status" >&5
++ echo "$as_me:15784: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -16069,11 +16067,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:16072: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16070: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:16076: \$? = $ac_status" >&5
++ echo "$as_me:16074: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -16173,11 +16171,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:16176: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16174: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:16180: \$? = $ac_status" >&5
++ echo "$as_me:16178: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -19419,11 +19417,14 @@ fi
+
+ if test "X$RUBY" != X; then
+
+- ruby_prefix=`$RUBY -rrbconfig -e "print Config::CONFIG['archdir']"`
+- RUBY_LIB=`$RUBY -rrbconfig -e "puts Config::CONFIG['ruby_install_name']"`
++
++ ruby_prefix=`$RUBY -rrbconfig -e "print Config::CONFIG['archdir']"`
+ LIBRUBYARG_SHARED=`$RUBY -rrbconfig -e "puts Config::CONFIG['LIBRUBYARG_SHARED']"`
+- RUBY_DIR=`$RUBY -rrbconfig -e "puts Config::CONFIG['archdir']"`
+- RUBY_LIBDIR=`$RUBY -rrbconfig -e "puts Config::CONFIG['rubylibdir']"`
++ RUBY_ARCHDIR=`$RUBY -rrbconfig -e "puts Config::CONFIG['sitearchdir']"`
++ { echo "$as_me:$LINENO: checking Ruby archdir" >&5
++echo $ECHO_N "checking Ruby archdir... $ECHO_C" >&6; }
++ { echo "$as_me:$LINENO: result: $RUBY_ARCHDIR" >&5
++echo "${ECHO_T}$RUBY_ARCHDIR" >&6; }
+
+ RUBY_INCLUDES="-I$ruby_prefix"
+ else
+@@ -19432,9 +19433,7 @@ else
+ RUBY=:
+ RUBY_INCLUDES=
+ LIBRUBYARG_SHARED=
+- RUBY_LIB=
+- RUBY_DIR=
+- RUBY_LIBDIR=
++ RUBY_ARCHDIR=
+ fi
+
+
+@@ -19442,8 +19441,6 @@ fi
+
+
+
+-
+-
+ # Check whether --with-php was given.
+ if test "${with_php+set}" = set; then
+ withval=$with_php; with_php="$withval"
+@@ -20542,9 +20539,7 @@ PYTHON_LIB!$PYTHON_LIB$ac_delim
+ PYTHON_LDFLAGS!$PYTHON_LDFLAGS$ac_delim
+ RUBY_INCLUDES!$RUBY_INCLUDES$ac_delim
+ LIBRUBYARG_SHARED!$LIBRUBYARG_SHARED$ac_delim
+-RUBY_LIB!$RUBY_LIB$ac_delim
+-RUBY_DIR!$RUBY_DIR$ac_delim
+-RUBY_LIBDIR!$RUBY_LIBDIR$ac_delim
++RUBY_ARCHDIR!$RUBY_ARCHDIR$ac_delim
+ PHP_VERSION!$PHP_VERSION$ac_delim
+ RUBY_VERSION!$RUBY_VERSION$ac_delim
+ REDLAND_CONFIG!$REDLAND_CONFIG$ac_delim
+@@ -20565,7 +20560,7 @@ LIBOBJS!$LIBOBJS$ac_delim
+ LTLIBOBJS!$LTLIBOBJS$ac_delim
+ _ACEOF
+
+- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 44; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 42; then
+ break
+ elif $ac_last_try; then
+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/sources b/sources
index 9a281c9..5737f59 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cf8de789254e79f4b42a1b51e2883150 redland-bindings-1.0.11.1.tar.gz
+ad38f4b5d4f55a87359ebff047a00184 redland-bindings-1.0.7.1.tar.gz
More information about the scm-commits
mailing list