- updated to 1.0.17.1

- updated py_sitescriptdir patch
- added ruby patch (fixes build with ruby 1.9.x)

diff --git a/redland-bindings-py_sitescriptdir.patch b/redland-bindings-py_sitescriptdir.patch
index 879aa1bbb88354e03f5053762461ad91dbc663d2..4d0a6c99ce20ad58b107bfbd05b4c45ee1dc8265 100644 (file)
--- a/redland-bindings-py_sitescriptdir.patch
+++ b/redland-bindings-py_sitescriptdir.patch
@@ -23,25 +23,27 @@
    AC_MSG_CHECKING(Python LDFLAGS)
    if test "X$PYTHON_LDFLAGS" != X; then
      AC_MSG_RESULT(using user ldflags: $PYTHON_LDFLAGS)
---- redland-bindings-1.0.8.1/python/Makefile.am.orig   2008-07-04 10:36:16.000000000 +0200
-+++ redland-bindings-1.0.8.1/python/Makefile.am        2008-08-25 20:50:20.566120063 +0200
-@@ -37,6 +37,7 @@
- SWIG_OUTPUTS=$(PYTHON_PACKAGE)_wrap.c
+--- redland-bindings-1.0.17.1/python/Makefile.am.orig  2014-06-22 20:54:16.860247387 +0200
++++ redland-bindings-1.0.17.1/python/Makefile.am       2014-06-22 21:06:07.313565911 +0200
+@@ -47,6 +47,7 @@
+ SWIG_OUTPUTS=$(PYTHON_PACKAGE)_wrap.c Redland.py
  
  pythondir=@PYTHON_LIB@
 +pythonscriptdir=@PYTHON_SCRIPT@
- python_DATA=RDF.py Redland$(PYTHON_LIBEXT)
+ python_DATA=RDF.py $(PYTHON_FULL_DYLIB) Redland.py
  
  EXTRA_DIST=README RDF.py \
-@@ -66,9 +67,9 @@
+@@ -76,10 +77,10 @@
        touch $(PYTHON_PACKAGE)-stamp
  
  install-pythonDATA: $(python_DATA)
 -      $(mkinstalldirs) $(DESTDIR)$(pythondir)
 +      $(mkinstalldirs) $(DESTDIR)$(pythondir) $(DESTDIR)$(pythonscriptdir)
-       $(INSTALL_PROGRAM) $(PYTHON_PACKAGE)$(PYTHON_LIBEXT) $(DESTDIR)$(pythondir)/$(PYTHON_PACKAGE)$(PYTHON_LIBEXT)
+       $(INSTALL_PROGRAM) $(PYTHON_FULL_DYLIB) $(DESTDIR)$(pythondir)/$(PYTHON_FULL_DYLIB)
 -      $(INSTALL_DATA) RDF.py $(DESTDIR)$(pythondir)/RDF.py
+-      $(INSTALL_DATA) Redland.py $(DESTDIR)$(pythondir)/Redland.py
 +      $(INSTALL_DATA) RDF.py $(DESTDIR)$(pythonscriptdir)/RDF.py
++      $(INSTALL_DATA) Redland.py $(DESTDIR)$(pythonscriptdir)/Redland.py
  
  uninstall-pythonDATA: $(python_DATA)
-       rm -f $(DESTDIR)$(pythondir)/$(PYTHON_PACKAGE)$(PYTHON_LIBEXT) $(DESTDIR)$(pythondir)/RDF.py
+       rm -f $(DESTDIR)$(pythondir)/$(PYTHON_FULL_DYLIB) $(DESTDIR)$(pythondir)/RDF.{py,pyc} $(DESTDIR)$(pythondir)/Redland.{py,pyc}

diff --git a/redland-bindings-ruby.patch b/redland-bindings-ruby.patch
new file mode 100644 (file)
index 0000000..3dc82b9
--- /dev/null
+++ b/redland-bindings-ruby.patch
@@ -0,0 +1,12 @@
+--- redland-bindings-1.0.17.1/configure.ac.orig        2014-06-22 21:07:26.186897601 +0200
++++ redland-bindings-1.0.17.1/configure.ac     2014-06-22 21:29:51.910202884 +0200
+@@ -369,6 +369,9 @@
+   ruby_install_dir_config=`$RUBY -rrbconfig -e "puts RbConfig::CONFIG['$ruby_install_dir_variable']"`
+   ruby_header_dir_config=`$RUBY -rrbconfig -e "puts RbConfig::CONFIG['rubyhdrdir']"`
+   ruby_arch_header_dir_config=`$RUBY -rrbconfig -e "puts RbConfig::CONFIG['rubyarchhdrdir']"`
++  if test -z "$ruby_arch_header_dir_config" ; then
++    ruby_arch_header_dir_config=`$RUBY -rrbconfig -e "puts RbConfig::CONFIG['rubyhdrdir']+'/'+RbConfig::CONFIG['arch']"`
++  fi
+   ruby_arch_install_dir_config=`$RUBY -rrbconfig -e "puts RbConfig::CONFIG['$ruby_arch_install_dir_variable']"`
+   librubyarg_shared=`$RUBY -rrbconfig -e "puts RbConfig::CONFIG['LIBRUBYARG_SHARED']"`
+   changequote([, ])dnl

diff --git a/redland-bindings.spec b/redland-bindings.spec
index 0d3f1745ad37cb8ad5021b7268122dec4666a587..49b44c686e4c329451238fd638995104d8365e75 100644 (file)
--- a/redland-bindings.spec
+++ b/redland-bindings.spec
@@ -4,20 +4,21 @@
 %bcond_without php     # don't build (any) PHP bindings
 %bcond_without ruby    # don't build Ruby bindings
 
-%define                php_name        php55
+%define                php_name        php%{?php_suffix}
 %include       /usr/lib/rpm/macros.perl
 Summary:       Redland RDF Application Framework Bindings
 Summary(pl.UTF-8):     Wiązania szkieletu aplikacji Redland RDF
 Name:          redland-bindings
-Version:       1.0.16.1
-Release:       5
+Version:       1.0.17.1
+Release:       1
 License:       LGPL v2.1+ or GPL v2+ or Apache v2.0+
 Group:         Libraries
 Source0:       http://download.librdf.org/source/%{name}-%{version}.tar.gz
-# Source0-md5: 62fc463076cb6fef4e922bdb5f2979b9
+# Source0-md5: b13c3d0e1bf291b071aae73603e70e65
 Patch0:                %{name}-py_sitescriptdir.patch
 Patch1:                %{name}-php.patch
 Patch2:                %{name}-sh.patch
+Patch3:                %{name}-ruby.patch
 URL:           http://librdf.org/bindings/
 BuildRequires: autoconf >= 2.62
 BuildRequires: automake >= 1:1.11
@@ -132,6 +133,7 @@ Interfejs języka Ruby do biblioteki Redland RDF.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 # force regeneration
 %{__rm} php/{php_redland.h,redland_wrap.c}
@@ -235,7 +237,8 @@ fi
 %defattr(644,root,root,755)
 %doc docs/python.html docs/pydoc
 %{py_sitescriptdir}/RDF.py[co]
-%attr(755,root,root) %{py_sitedir}/Redland.so
+%{py_sitescriptdir}/Redland.py[co]
+%attr(755,root,root) %{py_sitedir}/_Redland.so
 
 %if %{with ruby}
 %files -n ruby-redland