Author: sls Date: Mon Oct 26 14:44:52 2009 GMT Module: packages Tag: HEAD ---- Log message: - added glib2 patch and bcond (it builds and probably works)
---- Files affected: packages/3store: 3store.spec (1.12 -> 1.13) , glib2.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/3store/3store.spec diff -u packages/3store/3store.spec:1.12 packages/3store/3store.spec:1.13 --- packages/3store/3store.spec:1.12 Mon Jul 6 13:53:05 2009 +++ packages/3store/3store.spec Mon Oct 26 15:44:47 2009 @@ -1,4 +1,8 @@ # $Revision$, $Date$ +# +# Conditional build: +%bcond_with glib2 # use glib2 (default glib) +# Summary: 3store RDF engine Summary(pl.UTF-8): Silnik RDF 3store Name: 3store @@ -9,11 +13,13 @@ Source0: http://dl.sourceforge.net/threestore/%{name}-%{version}.tar.gz # Source0-md5: 6fa70d2830c82eb030d8888f4da0c86c Patch0: %{name}-ac.patch +Patch1: glib2.patch URL: http://threestore.sourceforge.net/ BuildRequires: autoconf BuildRequires: automake BuildRequires: flex -BuildRequires: glib-devel +%{!?with_glib2:BuildRequires: glib-devel} +%{?with_glib2:BuildRequires: glib2-devel} BuildRequires: libraptor-devel >= 0.9.10 BuildRequires: libtool BuildRequires: mysql-devel @@ -62,6 +68,7 @@ %prep %setup -q %patch0 -p1 +%{?with_glib2:%patch1 -p1} %build %{__libtoolize} @@ -115,6 +122,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.13 2009/10/26 14:44:47 sls +- added glib2 patch and bcond (it builds and probably works) + Revision 1.12 2009/07/06 11:53:05 baggins - rel 7 ================================================================ Index: packages/3store/glib2.patch diff -u /dev/null packages/3store/glib2.patch:1.1 --- /dev/null Mon Oct 26 15:44:52 2009 +++ packages/3store/glib2.patch Mon Oct 26 15:44:47 2009 @@ -0,0 +1,24 @@ +--- 3store-2.2.22/configure.in.orig 2009-10-26 14:54:36.757604429 +0100 ++++ 3store-2.2.22/configure.in 2009-10-26 15:02:47.223895797 +0100 +@@ -45,10 +45,7 @@ + if test "$MYSQL_CONFIG" = false; then + AC_MSG_ERROR([Can't find mysql_config - are MySQL and the development tools installed?]) + fi +-AC_PATH_PROG([GLIB_CONFIG], [glib-config], [false], [$PATH:/sbin:/usr/sbin:/usr/local/sbin]) +-if test "$GLIB_CONFIG" = false; then +- AC_MSG_ERROR([Can't find glib-config - You need to install libglib (and appropriate -devel package if using packages)]) +-fi ++PKG_CHECK_MODULES(GLIB, glib-2.0) + AC_PATH_PROG([RAPTOR_CONFIG], [raptor-config], [false], [$PATH:/sbin:/usr/sbin:/usr/local/sbin]) + if test "$RAPTOR_CONFIG" = false; then + AC_MSG_ERROR([Can't find raptor-config - You need to install libraptor 0.9.10+ from http://www.redland.opensource.ac.uk/raptor/]) +@@ -72,9 +69,6 @@ + AC_C_INLINE + AC_C_BIGENDIAN + +-GLIB_LIBS=`$GLIB_CONFIG --libs` +-GLIB_CFLAGS=`$GLIB_CONFIG --cflags` +- + MYSQL_LIBS=`$MYSQL_CONFIG --libs` + MYSQL_CFLAGS=`$MYSQL_CONFIG --cflags` + ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/3store/3store.spec?r1=1.12&r2=1.13&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
