[oyranos] Update to 0.3.2

[Nicolas Chauvet]

commit 91c8445af99819e067d7560374eebb408ae15237
Author: Nicolas Chauvet <kwizart at gmail.com>
Date:   Sun Nov 20 01:25:21 2011 +0100

    Update to 0.3.2

 .gitignore                                         |    1 +
 ...Ctrl.patch => oyranos-0.3.2-shared_NVCtrl.patch |   20 ++++++++++----------
 oyranos.spec                                       |   17 +++++++++--------
 sources                                            |    2 +-
 4 files changed, 21 insertions(+), 19 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4d0de77..9dbcd3c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ oyranos-repack-0.1.9.tar.bz2
 /oyranos-0.1.12.tar.gz
 /oyranos-0.2.0.tar.gz
 /oyranos-0.3.1.tar.gz
+/oyranos-0.3.2.tar.bz2
diff --git a/oyranos-0.3.1-shared_NVCtrl.patch b/oyranos-0.3.2-shared_NVCtrl.patch
similarity index 51%
rename from oyranos-0.3.1-shared_NVCtrl.patch
rename to oyranos-0.3.2-shared_NVCtrl.patch
index 7c4b47d..e1c15b2 100644
--- a/oyranos-0.3.1-shared_NVCtrl.patch
+++ b/oyranos-0.3.2-shared_NVCtrl.patch
@@ -1,20 +1,20 @@
-diff -up oyranos-0.3.1/makefile.in.NVCtrl oyranos-0.3.1/makefile.in
---- oyranos-0.3.1/makefile.in.NVCtrl	2011-07-26 16:33:31.989774008 +0200
-+++ oyranos-0.3.1/makefile.in	2011-07-26 16:34:23.565774007 +0200
-@@ -756,13 +756,13 @@ $(LIB_XNVCTRL).a:
- 	test -L $(LIB_XNVCTRL).a || $(LNK) $(LIB_XNVCTRL)/$(LIB_XNVCTRL).a .
+diff -up oyranos-0.3.2/makefile.in.NVCtrl oyranos-0.3.2/makefile.in
+--- oyranos-0.3.2/makefile.in.NVCtrl	2011-09-19 07:43:05.000000000 +0200
++++ oyranos-0.3.2/makefile.in	2011-11-20 00:58:12.949537616 +0100
+@@ -837,13 +837,13 @@ $(LIB_XNVCTRL).a:
+ 
  
  # the twinview library
--$(TARGET)-monitor-nvidia:	$(SRCDIR)/$(TARGET)_monitor_nvidia.c $(LIB_XNVCTRL_NAME) $(MONI_X11_OBJECTS)
-+$(TARGET)-monitor-nvidia:	$(SRCDIR)/$(TARGET)_monitor_nvidia.c $(MONI_X11_OBJECTS)
+-$(TARGET)-monitor-nvidia:	$(SRCDIR)/$(TARGET)_monitor_nvidia.c $(LIB_XNVCTRL_NAME) $(MONI_X11_OBJECTS) $(LIBSONAMEFULL)
++$(TARGET)-monitor-nvidia:	$(SRCDIR)/$(TARGET)_monitor_nvidia.c $(MONI_X11_OBJECTS) $(LIBSONAMEFULL)
  	echo Linking $@ $(LIB_XNVCTRL_)1 $(XNVCtrl)2 $(LIB_XNVCTRL)3 $(LIB_XNVCTRL_NAME)4 ...
  	-$(CC) -I./ $(CFLAGS) $(INCL) $(SRCDIR)/$(TARGET)_monitor_nvidia.c \
 -	-I$(SRCDIR)/libXNVCtrl \
 +	-I/usr/include/NVCtrl \
  	-o $(TARGET)-monitor-nvidia $(MONI_X11_OBJECTS) -L./ \
- 	$(LDLIBS) $(X11_LIBS) $(m) \
+ 	$(LDLIBS) \
 -	-L./$(LIB_XNVCTRL) -lXNVCtrl $(MODULE_LDLIBS) \
 +	-lXNVCtrl $(MODULE_LDLIBS) \
- 	$(LINK_LIB_PATH)
+ 	$(LINK_LIB_PATH) $(X11_LIBS) $(m)
  
- $(TARGET)_config_fltk.o:	$(SRCDIR)/$(TARGET)_config_fltk.cxx
+ oyjl/oyjl_tree_parse.o:	$(SRCDIR)/oyjl/oyjl_tree_parse.c
diff --git a/oyranos.spec b/oyranos.spec
index 93f9502..e99dd93 100644
--- a/oyranos.spec
+++ b/oyranos.spec
@@ -1,13 +1,13 @@
 Name:           oyranos
-Version:        0.3.1
-Release:        2%{?dist}
+Version:        0.3.2
+Release:        1%{?dist}
 Summary:        The Oyranos Color Management System (CMS) 
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://www.oyranos.org
-Source0:        http://downloads.sourceforge.net/oyranos/oyranos-%{version}.tar.gz
-Patch0:         oyranos-0.3.1-shared_NVCtrl.patch
+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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -27,10 +27,7 @@ BuildRequires:  lcms-devel >= 1.14
 BuildRequires:  libstdc++-devel
 BuildRequires:  libxslt-devel
 BuildRequires:  libpng-devel
-#LibRaw only provides a static lib that doesn't work on x86_64.
-#/usr/bin/ld: /usr/lib64/libraw.a(libraw_cxx.o): relocation R_X86_64_32 against
-#`.rodata.str1.1' can not be used when making a shared object; recompile with -
-#BuildRequires:  LibRaw-devel
+BuildRequires:  LibRaw-devel
 BuildRequires:  libtiff-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  libXcm-devel >= 0.4.0
@@ -42,6 +39,7 @@ BuildRequires:  libXxf86vm-devel
 BuildRequires:  libXrandr-devel
 BuildRequires:  sane-backends-devel
 BuildRequires:  color-filesystem
+BuildRequires:  yajl-devel >= 1.0
 Requires:  color-filesystem
 Requires:  %{name}-libs = %{version}-%{release}
 
@@ -171,6 +169,9 @@ fi || :
 
 
 %changelog
+* Sun Nov 20 2011 Nicolas Chauvet <kwizart at gmail.com> - 0.3.2-1
+- Update to 0.3.2
+
 * Fri Oct 14 2011 Rex Dieter <rdieter at fedoraproject.org> - 0.3.1-2
 - rebuild (exiv2)
 
diff --git a/sources b/sources
index 5c7efca..288f729 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5c88985801f6b3c097cef50a93970e38  oyranos-0.3.1.tar.gz
+c80d142741c284b06cbea29b9d859933  oyranos-0.3.2.tar.bz2