Author: qboosh Date: Sun Nov 27 07:23:53 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- updated 1.0.14.1
- updated php patch
- package lua binding
---- Files affected:
packages/redland-bindings:
redland-bindings-php.patch (1.2 -> 1.3) , redland-bindings.spec (1.46 ->
1.47)
---- Diffs:
================================================================
Index: packages/redland-bindings/redland-bindings-php.patch
diff -u packages/redland-bindings/redland-bindings-php.patch:1.2
packages/redland-bindings/redland-bindings-php.patch:1.3
--- packages/redland-bindings/redland-bindings-php.patch:1.2 Sat Nov 20
12:45:07 2010
+++ packages/redland-bindings/redland-bindings-php.patch Sun Nov 27
08:23:48 2011
@@ -1,14 +1,14 @@
---- 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 @@
+--- redland-bindings-1.0.14.1/php/redland-post.i.orig 2011-11-04
17:07:23.000000000 +0100
++++ redland-bindings-1.0.14.1/php/redland-post.i 2011-11-26
22:19:29.113100893 +0100
+@@ -107,6 +107,7 @@
return;
#if PHP_MAJOR_VERSION >= 5
+ TSRMLS_FETCH();
- zend_throw_exception(redland_exception_ptr,
- librdf_php_log_message,
- librdf_php_log_code TSRMLS_CC);
-@@ -102,7 +103,8 @@
+ if(librdf_php_log_level >= LIBRDF_LOG_WARN)
+ zend_throw_exception(redland_exception_ptr,
+ librdf_php_log_message,
+@@ -129,7 +130,8 @@
librdf_world_open(librdf_php_world);
#if PHP_MAJOR_VERSION >= 5
================================================================
Index: packages/redland-bindings/redland-bindings.spec
diff -u packages/redland-bindings/redland-bindings.spec:1.46
packages/redland-bindings/redland-bindings.spec:1.47
--- packages/redland-bindings/redland-bindings.spec:1.46 Fri Mar 25
19:17:25 2011
+++ packages/redland-bindings/redland-bindings.spec Sun Nov 27 08:23:48 2011
@@ -1,6 +1,7 @@
# $Revision$, $Date$
#
# Conditional build:
+%bcond_without lua # don't build Lua bindings
%bcond_without php # don't build (any) PHP bindings
%bcond_without ruby # don't build Ruby bindings
%bcond_with php4 # build PHP4 bindings (default PHP5)
@@ -9,12 +10,12 @@
Summary: Redland RDF Application Framework Bindings
Summary(pl.UTF-8): Wiązania szkieletu aplikacji Redland RDF
Name: redland-bindings
-Version: 1.0.13.1
+Version: 1.0.14.1
Release: 1
-License: LGPL v2.1+ or GPL v2+ or Apache v2.0
+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: f65796cdcd75c27a8b9e9c0c797ffb50
+# Source0-md5: 293241365303153d7d0635a76e2dd8d3
Patch0: %{name}-py_sitescriptdir.patch
Patch1: %{name}-php.patch
Patch2: %{name}-sh.patch
@@ -23,11 +24,11 @@
BuildRequires: autoconf >= 2.53
BuildRequires: automake >= 1:1.11
BuildRequires: libtool
+%{?with_lua:BuildRequires: lua51-devel >= 5.1}
BuildRequires: perl-devel >= 1:5.8.0
BuildRequires: pkgconfig
BuildRequires: python-devel
-BuildRequires: redland-devel >= 1.0.13
-BuildRequires: redland-devel < 1.0.14
+BuildRequires: redland-devel >= 1.0.14
BuildRequires: rpm-perlprov >= 4.1-13
BuildRequires: rpmbuild(macros) >= 1.344
%if %{with php}
@@ -38,7 +39,7 @@
BuildRequires: php-cli >= 3:5.0.0
BuildRequires: php-devel >= 3:5.0.0
%endif
-BuildRequires: swig-php >= 1.3.29
+BuildRequires: swig-php >= 2.0
%endif
%if %{with ruby}
BuildRequires: ruby-devel
@@ -70,10 +71,23 @@
jako moduły, które mogą być wczytywane w czasie kompilacji lub
działania programu w razie potrzeby.
+%package -n lua-redland
+Summary: Lua bindings for Redland RDF library
+Summary(pl.UTF-8): Interfejs języka Lua do biblioteki Redland RDF
+Group: Development/Languages/Perl
+Requires: redland >= 1.0.14
+
+%description -n lua-redland
+Lua bindings for Redland RDF library.
+
+%description -n lua-redland -l pl.UTF-8
+Interfejs języka Lua do biblioteki Redland RDF.
+
%package -n perl-RDF-Redland
Summary: Perl bindings for Redland RDF library
Summary(pl.UTF-8): Perlowy interfejs do biblioteki Redland RDF
Group: Development/Languages/Perl
+Requires: redland >= 1.0.14
%description -n perl-RDF-Redland
Perl bindings for Redland RDF library.
@@ -87,6 +101,7 @@
Group: Libraries
%{?requires_php_extension}
Requires: php4-common >= 3:4.4.0-3
+Requires: redland >= 1.0.14
%description -n php4-redland
PHP 4.x bindings for Redland RDF library.
@@ -100,6 +115,7 @@
Group: Libraries
%{?requires_php_extension}
Requires: php-common >= 4:5.0.4
+Requires: redland >= 1.0.14
%description -n php-redland
PHP 5.x bindings for Redland RDF library.
@@ -111,6 +127,7 @@
Summary: Python bindings for Redland RDF library
Summary(pl.UTF-8): Pythonowy interfejs do biblioteki Redland RDF
Group: Libraries/Python
+Requires: redland >= 1.0.14
%pyrequires_eq python
%description -n python-redland
@@ -123,6 +140,7 @@
Summary: Ruby bindings for Redland RDF library
Summary(pl.UTF-8): Interfejs języka Ruby do biblioteki Redland RDF
Group: Libraries
+Requires: redland >= 1.0.14
%{?ruby_mod_ver_requires_eq}
%description -n ruby-redland
@@ -148,6 +166,7 @@
%{__automake}
%configure \
--disable-static \
+ %{?with_lua:--with-lua=lua51} \
--with-perl \
--with-perl-makemaker-args='INSTALLDIRS=vendor OPTIMIZE="%{rpmcflags}"'
\
%if %{with php}
@@ -171,12 +190,16 @@
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT \
- pythondir=%{py_sitedir}
+ pythondir=%{py_sitedir} \
+ luadir=%{_libdir}/lua/5.1
%py_comp $RPM_BUILD_ROOT%{py_sitescriptdir}
%py_ocomp $RPM_BUILD_ROOT%{py_sitescriptdir}
%{__rm} $RPM_BUILD_ROOT%{py_sitescriptdir}/*.py
+%if %{with lua}
+chmod +x $RPM_BUILD_ROOT%{_libdir}/lua/5.1/*.so
+%endif
%if %{with php}
install -d $RPM_BUILD_ROOT{%{php_sysconfdir}/conf.d,%{php_extensiondir}}
cat <<'EOF' > $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d/redland.ini
@@ -213,6 +236,12 @@
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog* LICENSE.html NEWS.html README.html RELEASE.html
TODO.html
+%if %{with lua}
+%files -n lua-redland
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/lua/5.1/redland.so
+%endif
+
%files -n perl-RDF-Redland
%defattr(644,root,root,755)
%doc docs/perl.html
@@ -256,6 +285,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.47 2011/11/27 07:23:48 qboosh
+- updated 1.0.14.1
+- updated php patch
+- package lua binding
+
Revision 1.46 2011/03/25 18:17:25 qboosh
- updated to 1.0.13.1 (for redland 1.0.13)
- added sh patch to fix sh syntax in php version check
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/redland-bindings/redland-bindings-php.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/redland-bindings/redland-bindings.spec?r1=1.46&r2=1.47&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
