Author: qboosh Date: Fri Mar 25 18:17:30 2011 GMT Module: packages Tag: HEAD ---- Log message: - updated to 1.0.13.1 (for redland 1.0.13) - added sh patch to fix sh syntax in php version check - added ruby patch to update ruby include dir
---- Files affected: packages/redland-bindings: redland-bindings.spec (1.45 -> 1.46) , redland-bindings-ruby.patch (NONE -> 1.1) (NEW), redland-bindings-sh.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/redland-bindings/redland-bindings.spec diff -u packages/redland-bindings/redland-bindings.spec:1.45 packages/redland-bindings/redland-bindings.spec:1.46 --- packages/redland-bindings/redland-bindings.spec:1.45 Sat Nov 20 12:54:10 2010 +++ packages/redland-bindings/redland-bindings.spec Fri Mar 25 19:17:25 2011 @@ -9,14 +9,16 @@ Summary: Redland RDF Application Framework Bindings Summary(pl.UTF-8): Wiązania szkieletu aplikacji Redland RDF Name: redland-bindings -Version: 1.0.11.1 +Version: 1.0.13.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: cf8de789254e79f4b42a1b51e2883150 +# Source0-md5: f65796cdcd75c27a8b9e9c0c797ffb50 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.53 BuildRequires: automake >= 1:1.11 @@ -24,8 +26,8 @@ BuildRequires: perl-devel >= 1:5.8.0 BuildRequires: pkgconfig BuildRequires: python-devel -BuildRequires: redland-devel >= 1.0.11 -BuildRequires: redland-devel < 1.0.12 +BuildRequires: redland-devel >= 1.0.13 +BuildRequires: redland-devel < 1.0.14 BuildRequires: rpm-perlprov >= 4.1-13 BuildRequires: rpmbuild(macros) >= 1.344 %if %{with php} @@ -133,6 +135,8 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 +%patch3 -p1 # force regeneration %{__rm} php/{php_redland.h,redland_wrap.c} @@ -145,14 +149,15 @@ %configure \ --disable-static \ --with-perl \ + --with-perl-makemaker-args='INSTALLDIRS=vendor OPTIMIZE="%{rpmcflags}"' \ %if %{with php} + PHP_CONFIG=%{_bindir}/php%{?with_php4:4}-config \ --with-php=%{_bindir}/php%{?with_php4:4}.cli \ %endif --with-python \ %{?with_ruby:--with-ruby} %{__make} \ - MAKE_PL_OPTS='INSTALLDIRS=vendor OPTIMIZE="%{rpmcflags}"' \ pythondir=%{py_sitedir} %if %{with ruby} @@ -170,7 +175,7 @@ %py_comp $RPM_BUILD_ROOT%{py_sitescriptdir} %py_ocomp $RPM_BUILD_ROOT%{py_sitescriptdir} -rm $RPM_BUILD_ROOT%{py_sitescriptdir}/*.py +%{__rm} $RPM_BUILD_ROOT%{py_sitescriptdir}/*.py %if %{with php} install -d $RPM_BUILD_ROOT{%{php_sysconfdir}/conf.d,%{php_extensiondir}} @@ -251,6 +256,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +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 +- added ruby patch to update ruby include dir + Revision 1.45 2010/11/20 11:54:10 qboosh - updated language list, pl fix ================================================================ Index: packages/redland-bindings/redland-bindings-ruby.patch diff -u /dev/null packages/redland-bindings/redland-bindings-ruby.patch:1.1 --- /dev/null Fri Mar 25 19:17:30 2011 +++ packages/redland-bindings/redland-bindings-ruby.patch Fri Mar 25 19:17:25 2011 @@ -0,0 +1,20 @@ +--- redland-bindings-1.0.13.1/configure.ac.orig 2011-03-25 17:37:15.160909615 +0100 ++++ redland-bindings-1.0.13.1/configure.ac 2011-03-25 17:52:13.604912129 +0100 +@@ -354,6 +354,8 @@ + 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']"` + LIBRUBYARG_SHARED=`$RUBY -rrbconfig -e "puts Config::CONFIG['LIBRUBYARG_SHARED']"` ++ RUBY_HDRDIR=`$RUBY -rrbconfig -e "print Config::CONFIG['rubyhdrdir']"` ++ RUBY_ARCH=`$RUBY -rrbconfig -e "print Config::CONFIG['arch']"` + changequote([, ])dnl + + AC_MSG_CHECKING(Ruby installation dir) +@@ -374,7 +376,7 @@ + AC_MSG_RESULT($RUBY_ARCH_INSTALLDIR from Config::CONFIG $ruby_arch_install_dir_variable) + fi + +- RUBY_INCLUDES="-I$RUBY_ARCHDIR" ++ RUBY_INCLUDES="-I$RUBY_HDRDIR -I$RUBY_HDRDIR/$RUBY_ARCH" + else + # This allows 'make clean' in the ruby directory to work when + # ruby isn't available ================================================================ Index: packages/redland-bindings/redland-bindings-sh.patch diff -u /dev/null packages/redland-bindings/redland-bindings-sh.patch:1.1 --- /dev/null Fri Mar 25 19:17:30 2011 +++ packages/redland-bindings/redland-bindings-sh.patch Fri Mar 25 19:17:25 2011 @@ -0,0 +1,11 @@ +--- redland-bindings-1.0.13.1/configure.ac.orig 2011-03-25 16:55:46.356909615 +0100 ++++ redland-bindings-1.0.13.1/configure.ac 2011-03-25 17:04:20.984909615 +0100 +@@ -153,7 +153,7 @@ + PHP_INCLUDES=`$PHP_CONFIG --includes` + PHP_EXTENSION_DIR=`$PHP_CONFIG --extension-dir` + +- if test $PHP_VERSION '>' 5.0.0; then ++ if echo $PHP_VERSION | grep -q '^[[5-9]]\.'; then + PHP_SWIG="-php5" + else + PHP_SWIG="-php4" ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/redland-bindings/redland-bindings.spec?r1=1.45&r2=1.46&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
