[oyranos] Fix for yajl

Nicolas Chauvet kwizart at fedoraproject.org
Thu Jan 12 13:04:45 UTC 2012


commit e3ecfc2a63ee0a59aac5676332a778dd83b277ec
Author: Nicolas Chauvet <kwizart at gmail.com>
Date:   Thu Jan 12 14:04:19 2012 +0100

    Fix for yajl

 oyranos-0.3.2-yajl.patch |   30 ++++++++++++++++++++++++++++++
 oyranos.spec             |    5 +++++
 2 files changed, 35 insertions(+), 0 deletions(-)
---
diff --git a/oyranos-0.3.2-yajl.patch b/oyranos-0.3.2-yajl.patch
new file mode 100644
index 0000000..df20563
--- /dev/null
+++ b/oyranos-0.3.2-yajl.patch
@@ -0,0 +1,30 @@
+diff -up oyranos-0.3.2/configure.yajl oyranos-0.3.2/configure
+--- oyranos-0.3.2/configure.yajl	2011-09-19 07:42:38.000000000 +0200
++++ oyranos-0.3.2/configure	2012-01-12 13:59:12.224412012 +0100
+@@ -30,7 +30,7 @@ DEB="$TARGET"_control
+ PKGC=$TARGET.pc
+ VERS_H="$TARGET"_version.h
+ zeile="$0 $@"
+-MAKEFILE_DIR=". fl_i18n libXNVCtrl yajl"; export MAKEFILE_DIR
++MAKEFILE_DIR=". fl_i18n libXNVCtrl"; export MAKEFILE_DIR
+ 
+ if [ `uname` = "Linux" ]; then
+   v=-v
+@@ -44,7 +44,7 @@ if [ "$ROOT_DIR" != "." ]; then
+   mkdir -p examples/
+   mkdir -p API_generated/
+   mkdir -p generator/
+-  mkdir -p yajl/
++  #mkdir -p yajl/
+   cp $v $ROOT_DIR/examples/makefile examples/
+   mkdir -p oforms/
+   cp $v $ROOT_DIR/oforms/oyranos_xforms.makefile oforms/
+@@ -854,7 +854,7 @@ else
+ fi
+ 
+ pkg-config  --atleast-version=1.0 yajl 2>/dev/null
+-if [ $? != 0 ] && [ 0 -eq $rpm ]; then
++if [ $? != 1 ] && [ 0 -eq $rpm ]; then
+   l=yajl
+   $CXX $CFLAGS -I$includedir $ROOT_DIR/tests/lib_test.cxx $LDFLAGS -L/usr/X11R6/lib$BARCH -L/usr/lib$BARCH -L$libdir -l$l -o tests/libtest 2>/dev/null
+   if [ -f tests/libtest ]; then
diff --git a/oyranos.spec b/oyranos.spec
index e60df81..cb4d870 100644
--- a/oyranos.spec
+++ b/oyranos.spec
@@ -9,6 +9,7 @@ URL:            http://www.oyranos.org
 Source0:        http://downloads.sourceforge.net/oyranos/oyranos-%{version}.tar.bz2
 Patch0:         oyranos-0.3.2-shared_NVCtrl.patch
 Patch1:         oyranos-0.3.1-pc_fix.patch
+Patch2:         oyranos-0.3.2-yajl.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  OpenEXR-devel
@@ -90,6 +91,10 @@ This package contains development files for %{name}.
 %setup -q
 %patch0 -p1 -b .NVCtrl
 %patch1 -p1 -b .pc_fix
+%patch2 -p1 -b .yajl
+
+#Kill interl yajl
+rm -rf yajl
 
 
 %build


More information about the scm-commits mailing list