Author: qboosh Date: Sat Nov 20 11:45:12 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 1.0.11.1 (not tested, current redland (1.0.12) is unsupported)
- updated patches
---- Files affected:
packages/redland-bindings:
redland-bindings-php.patch (1.1 -> 1.2) ,
redland-bindings-py_sitescriptdir.patch (1.3 -> 1.4) , redland-bindings.spec
(1.42 -> 1.43)
---- Diffs:
================================================================
Index: packages/redland-bindings/redland-bindings-php.patch
diff -u packages/redland-bindings/redland-bindings-php.patch:1.1
packages/redland-bindings/redland-bindings-php.patch:1.2
--- packages/redland-bindings/redland-bindings-php.patch:1.1 Sun Jan 6
23:41:13 2008
+++ packages/redland-bindings/redland-bindings-php.patch Sat Nov 20
12:45:07 2010
@@ -1,17 +1,13 @@
---- redland-bindings-1.0.7.1/php/redland-post.i.orig 2007-12-28
22:44:41.000000000 +0100
-+++ redland-bindings-1.0.7.1/php/redland-post.i 2008-01-06
23:14:49.302665147 +0100
-@@ -81,9 +81,10 @@
+--- redland-bindings-1.0.11.1/php/redland-post.i.orig 2009-12-16
17:58:00.000000000 +0100
++++ redland-bindings-1.0.11.1/php/redland-post.i 2010-11-20
11:37:48.903102452 +0100
+@@ -81,6 +81,7 @@
return;
#if PHP_MAJOR_VERSION >= 5
+ TSRMLS_FETCH();
zend_throw_exception(redland_exception_ptr,
librdf_php_log_message,
-- librdf_php_log_code TSRMLS_DC);
-+ librdf_php_log_code TSRMLS_CC);
- #endif
-
- librdf_php_log_code=0;
+ librdf_php_log_code TSRMLS_CC);
@@ -102,7 +103,8 @@
librdf_world_open(librdf_php_world);
================================================================
Index: packages/redland-bindings/redland-bindings-py_sitescriptdir.patch
diff -u packages/redland-bindings/redland-bindings-py_sitescriptdir.patch:1.3
packages/redland-bindings/redland-bindings-py_sitescriptdir.patch:1.4
--- packages/redland-bindings/redland-bindings-py_sitescriptdir.patch:1.3
Mon Aug 25 21:01:06 2008
+++ packages/redland-bindings/redland-bindings-py_sitescriptdir.patch Sat Nov
20 12:45:07 2010
@@ -1,14 +1,28 @@
---- redland-bindings-0.9.19.1/configure.ac.orig 2004-11-02
21:04:22.000000000 +0100
-+++ redland-bindings-0.9.19.1/configure.ac 2005-01-09 00:14:21.283977360
+0100
-@@ -190,6 +190,8 @@
- PYTHON_LIB="${python_prefix}/lib/python${PYTHON_VERSION}/site-packages"
- AC_SUBST(PYTHON_LIB)
- AC_MSG_RESULT($PYTHON_LIB)
-+ PYTHON_SCRIPT="${python_prefix}/share/python${PYTHON_VERSION}/site-packages"
-+ AC_SUBST(PYTHON_SCRIPT)
+--- redland-bindings-1.0.11.1/configure.ac.orig 2010-09-27
03:57:15.000000000 +0200
++++ redland-bindings-1.0.11.1/configure.ac 2010-11-20 11:34:40.759094909
+0100
+@@ -237,6 +237,7 @@
+ AC_ARG_VAR(PYTHON_LIBEXT, [Python shared library file extension])
+ AC_ARG_VAR(PYTHON_INCLUDES, [Install location of python includes])
+ AC_ARG_VAR(PYTHON_LIB, [Install location of python libraries])
++AC_ARG_VAR(PYTHON_SCRIPT, [Install location of python scripts])
- if test `uname` = Darwin; then
- PYTHON_LDFLAGS="-Wl,-F. -Wl,-F. -bundle"
+ AC_MSG_CHECKING(Enable Python API)
+ if test "X$with_python" != Xno; then
+@@ -297,6 +298,14 @@
+ AC_MSG_RESULT($PYTHON_LIB)
+ fi
+
++ AC_MSG_CHECKING(Python scripts)
++ if test "X$PYTHON_SCRIPT" != X; then
++ AC_MSG_RESULT(using user lib: $PYTHON_SCRIPT)
++ else
++
PYTHON_SCRIPT="${python_prefix}/share/python${PYTHON_VERSION}/site-packages"
++ AC_MSG_RESULT($PYTHON_SCRIPT)
++ fi
++
+ 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 @@
================================================================
Index: packages/redland-bindings/redland-bindings.spec
diff -u packages/redland-bindings/redland-bindings.spec:1.42
packages/redland-bindings/redland-bindings.spec:1.43
--- packages/redland-bindings/redland-bindings.spec:1.42 Mon Aug 10
01:38:35 2009
+++ packages/redland-bindings/redland-bindings.spec Sat Nov 20 12:45:07 2010
@@ -9,12 +9,12 @@
Summary: Redland RDF Application Framework Bindings
Summary(pl.UTF-8): Wiązania szkieletu aplikacji Redland RDF
Name: redland-bindings
-Version: 1.0.8.1
+Version: 1.0.11.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: 52ff9e9f7fb38e3514862d6077e59332
+# Source0-md5: cf8de789254e79f4b42a1b51e2883150
Patch0: %{name}-py_sitescriptdir.patch
Patch1: %{name}-php.patch
URL: http://librdf.org/bindings/
@@ -24,8 +24,8 @@
BuildRequires: perl-devel >= 1:5.8.0
BuildRequires: pkgconfig
BuildRequires: python-devel
-BuildRequires: redland-devel >= 1.0.8
-BuildRequires: redland-devel < 1.0.9
+BuildRequires: redland-devel >= 1.0.11
+BuildRequires: redland-devel < 1.0.12
BuildRequires: rpm-perlprov >= 4.1-13
BuildRequires: rpmbuild(macros) >= 1.344
%if %{with php}
@@ -135,7 +135,7 @@
%patch1 -p1
# force regeneration
-rm -f php/{php_redland.h,redland_wrap.c}
+%{__rm} php/{php_redland.h,redland_wrap.c}
%build
%{__libtoolize}
@@ -251,6 +251,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.43 2010/11/20 11:45:07 qboosh
+- up to 1.0.11.1 (not tested, current redland (1.0.12) is unsupported)
+- updated patches
+
Revision 1.42 2009/08/09 23:38:35 aredridel
- make buildrequires more specific
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/redland-bindings/redland-bindings-php.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/redland-bindings/redland-bindings-py_sitescriptdir.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/redland-bindings/redland-bindings.spec?r1=1.42&r2=1.43&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
