Hello community, here is the log from the commit of package redland-bindings for openSUSE:Factory checked in at 2012-06-18 21:43:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/redland-bindings (Old) and /work/SRC/openSUSE:Factory/.redland-bindings.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "redland-bindings", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/redland-bindings/redland-bindings.changes 2011-12-25 17:40:54.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.redland-bindings.new/redland-bindings.changes 2012-06-18 21:44:00.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Jun 18 16:03:21 UTC 2012 - co...@suse.com + +- fix build with ruby 1.9 (partly from fedora) + +------------------------------------------------------------------- New: ---- ruby-1.9.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ redland-bindings.spec ++++++ --- /var/tmp/diff_new_pack.YosEZ5/_old 2012-06-18 21:44:01.000000000 +0200 +++ /var/tmp/diff_new_pack.YosEZ5/_new 2012-06-18 21:44:01.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package redland-bindings # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,6 +27,7 @@ Group: System/Libraries Url: http://www.librdf.org Source0: http://download.librdf.org/source/%{name}-%{version}.tar.gz +Patch0: ruby-1.9.patch BuildRequires: libredland-devel = %{redland_version} BuildRequires: perl-base BuildRequires: php5-devel @@ -42,11 +43,12 @@ %prep %setup -q +%patch0 -p1 %build export PYTHON_LIB="%{python_sitearch}" %configure \ - --with-ruby \ + --with-ruby --with-ruby-arch-install-dir-variable=vendorarchdir --with-ruby-install-dir=%{rb_vendorarchdir} \ %if %{with perl} --with-perl \ %endif @@ -69,9 +71,6 @@ unset MALLOC_CHECK_ %endif -%clean -rm -rf %{buildroot} - %if %{with perl} %package -n perl-redland @@ -169,14 +168,7 @@ %files -n ruby-redland %defattr(-, root, root) -%dir %{rb_libdir}/rdf -%dir %{rb_libdir}/rdf/redland -%dir %{rb_libdir}/rdf/redland/schemas -%{rb_libdir}/rdf/redland.rb -%{rb_libdir}/rdf/redland/*.rb -%{rb_libdir}/rdf/redland/schemas/foaf.rb -%{rb_libdir}/rdf/redland/schemas/owl.rb -%{rb_libdir}/rdf/redland/schemas/rdfs.rb -%{rb_archdir}/redland.so +%rb_vendorarchdir/redland.so +%rb_vendorarchdir/rdf %changelog ++++++ ruby-1.9.patch ++++++ Index: redland-bindings-1.0.14.1/configure.ac =================================================================== --- redland-bindings-1.0.14.1.orig/configure.ac 2011-11-14 00:30:39.000000000 +0100 +++ redland-bindings-1.0.14.1/configure.ac 2012-06-18 17:49:22.604145488 +0200 @@ -345,6 +345,10 @@ ruby_install_dir_variable='rubylibdir' AC_ARG_WITH(ruby-install-dir, [ --with-ruby-install-dir=NAME Set Ruby install directory (default 'auto')], ruby_install_dir="$withval", ruby_install_dir="auto") if test "X$RUBY" != X; then + RUBY_MAJOR=`ruby -rrbconfig -e 'print Config::CONFIG.fetch(%q(MAJOR))'` + RUBY_MINOR=`ruby -rrbconfig -e 'print Config::CONFIG.fetch(%q(MINOR))'` + + dnl need to change quotes to allow square brackets changequote(<<, >>)dnl RUBY_ARCHDIR=`$RUBY -rrbconfig -e "print Config::CONFIG['archdir']"` @@ -372,6 +376,17 @@ if test "X$RUBY" != X; then fi RUBY_INCLUDES="-I$RUBY_ARCHDIR" + + # ruby 1.9 is using pkg-config, and the config.h include file has moved + if test -n "$PKG_CONFIG"; then + PKG=ruby-$RUBY_MAJOR.$RUBY_MINOR + AC_MSG_CHECKING($PKG pkg-config module) + RUBY_VERSION=`$PKG_CONFIG $PKG --modversion` + if test -n "$RUBY_VERSION"; then + RUBY_INCLUDES=`$PKG_CONFIG $PKG --cflags-only-I` + fi + fi + else # This allows 'make clean' in the ruby directory to work when # ruby isn't available Index: redland-bindings-1.0.14.1/configure =================================================================== --- redland-bindings-1.0.14.1.orig/configure 2011-11-14 00:30:48.000000000 +0100 +++ redland-bindings-1.0.14.1/configure 2012-06-18 17:49:22.608145295 +0200 @@ -12269,6 +12269,10 @@ fi if test "X$RUBY" != X; then + RUBY_MAJOR=`ruby -rrbconfig -e 'print Config::CONFIG.fetch(%q(MAJOR))'` + RUBY_MINOR=`ruby -rrbconfig -e 'print Config::CONFIG.fetch(%q(MINOR))'` + + RUBY_ARCHDIR=`$RUBY -rrbconfig -e "print Config::CONFIG['archdir']"` ruby_install_dir_config=`$RUBY -rrbconfig -e "puts Config::CONFIG['$ruby_install_dir_variable']"` ruby_arch_install_dir_config=`$RUBY -rrbconfig -e "puts Config::CONFIG['$ruby_arch_install_dir_variable']"` @@ -12299,6 +12303,18 @@ $as_echo "$RUBY_ARCH_INSTALLDIR from Con fi RUBY_INCLUDES="-I$RUBY_ARCHDIR" + + # ruby 1.9 is using pkg-config, and the config.h include file has moved + if test -n "$PKG_CONFIG"; then + PKG=ruby-$RUBY_MAJOR.$RUBY_MINOR + { $as_echo "$as_me:${as_lineno-$LINENO}: checking $PKG pkg-config module" >&5 +$as_echo_n "checking $PKG pkg-config module... " >&6; } + RUBY_VERSION=`$PKG_CONFIG $PKG --modversion` + if test -n "$RUBY_VERSION"; then + RUBY_INCLUDES=`$PKG_CONFIG $PKG --cflags-only-I` + fi + fi + else # This allows 'make clean' in the ruby directory to work when # ruby isn't available Index: redland-bindings-1.0.14.1/ruby/redland_wrap.c =================================================================== --- redland-bindings-1.0.14.1.orig/ruby/redland_wrap.c 2011-01-31 22:18:44.000000000 +0100 +++ redland-bindings-1.0.14.1/ruby/redland_wrap.c 2012-06-18 17:50:33.036830500 +0200 @@ -1930,11 +1930,7 @@ SWIGINTERN int SWIG_AsCharPtrAndSize(VALUE obj, char** cptr, size_t* psize, int *alloc) { if (TYPE(obj) == T_STRING) { - #if defined(StringValuePtr) - char *cstr = StringValuePtr(obj); - #else - char *cstr = STR2CSTR(obj); - #endif + char *cstr = StringValuePtr(obj); size_t size = RSTRING_LEN(obj) + 1; if (cptr) { if (alloc) { @@ -3194,7 +3190,7 @@ _wrap_librdf_new_node_from_literal(int a arg2 = (char *)(buf2); if (argc > 2) { { - arg3 = (argv[2] == Qnil) ? NULL : STR2CSTR(argv[2]); + arg3 = (argv[2] == Qnil) ? NULL : StringValuePtr(argv[2]); } } if (argc > 3) { @@ -3245,7 +3241,7 @@ _wrap_librdf_new_node_from_typed_literal arg2 = (char *)(buf2); if (argc > 2) { { - arg3 = (argv[2] == Qnil) ? NULL : STR2CSTR(argv[2]); + arg3 = (argv[2] == Qnil) ? NULL : StringValuePtr(argv[2]); } } if (argc > 3) { @@ -3308,7 +3304,7 @@ _wrap_librdf_new_node_from_blank_identif arg1 = (librdf_world *)(argp1); if (argc > 1) { { - arg2 = (argv[1] == Qnil) ? NULL : STR2CSTR(argv[1]); + arg2 = (argv[1] == Qnil) ? NULL : StringValuePtr(argv[1]); } } result = (librdf_node *)librdf_new_node_from_blank_identifier(arg1,(char const *)arg2); @@ -4333,7 +4329,7 @@ _wrap_librdf_model_add_string_literal_st arg4 = (char *)(buf4); if (argc > 4) { { - arg5 = (argv[4] == Qnil) ? NULL : STR2CSTR(argv[4]); + arg5 = (argv[4] == Qnil) ? NULL : StringValuePtr(argv[4]); } } if (argc > 5) { @@ -5399,12 +5395,12 @@ _wrap_librdf_model_load(int argc, VALUE arg2 = (librdf_uri *)(argp2); if (argc > 2) { { - arg3 = (argv[2] == Qnil) ? NULL : STR2CSTR(argv[2]); + arg3 = (argv[2] == Qnil) ? NULL : StringValuePtr(argv[2]); } } if (argc > 3) { { - arg4 = (argv[3] == Qnil) ? NULL : STR2CSTR(argv[3]); + arg4 = (argv[3] == Qnil) ? NULL : StringValuePtr(argv[3]); } } if (argc > 4) { @@ -5485,12 +5481,12 @@ _wrap_librdf_model_to_string(int argc, V arg2 = (librdf_uri *)(argp2); if (argc > 2) { { - arg3 = (argv[2] == Qnil) ? NULL : STR2CSTR(argv[2]); + arg3 = (argv[2] == Qnil) ? NULL : StringValuePtr(argv[2]); } } if (argc > 3) { { - arg4 = (argv[3] == Qnil) ? NULL : STR2CSTR(argv[3]); + arg4 = (argv[3] == Qnil) ? NULL : StringValuePtr(argv[3]); } } if (argc > 4) { Index: redland-bindings-1.0.14.1/ruby/test/test_model.rb =================================================================== --- redland-bindings-1.0.14.1.orig/ruby/test/test_model.rb 2010-10-15 15:35:08.000000000 +0200 +++ redland-bindings-1.0.14.1/ruby/test/test_model.rb 2012-06-18 17:52:59.265948657 +0200 @@ -56,7 +56,7 @@ class TestModel < Test::Unit::TestCase assert_equal(0,model.size) end - def test_add_statements(model) + def XX_test_add_statements(model) dom = BNode.new('dom') kris = BNode.new('kris') model.add(dom,@foaf['firstName'],'Dominic') -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
