- rel 5; build fixed

Changed files:
    opencv-build.patch -> 1.1
    opencv.spec -> 1.6

diff --git a/opencv-build.patch b/opencv-build.patch
new file mode 100644 (file)
index 0000000..e9c0b96
--- /dev/null
+++ b/opencv-build.patch
@@ -0,0 +1,11 @@
+--- opencv-1.1.0/cxcore/include/cxmisc.h~      2008-07-29 21:05:04.000000000 +0200
++++ opencv-1.1.0/cxcore/include/cxmisc.h       2009-07-14 13:27:44.962942767 +0200
+@@ -130,7 +130,7 @@
+     #include <alloca.h>
+ #elif defined HAVE_ALLOCA
+     #include <stdlib.h>
+-#elif
++#else
+     #error
+ #endif
+ 

diff --git a/opencv.spec b/opencv.spec
index c9e23176146aaaf65e2c26cc6ad2efae998a78a9..3efa7e387c68a3031809ac57e13314b8c45a7b95 100644 (file)
--- a/opencv.spec
+++ b/opencv.spec
@@ -3,7 +3,7 @@
 Summary:       A library of programming functions mainly aimed at real time computer vision
 Name:          opencv
 Version:       1.1
-Release:       0.%{snap}.4
+Release:       0.%{snap}.5
 Epoch:         1
 License:       BSD
 Group:         Libraries
@@ -11,6 +11,7 @@ Source0:      http://dl.sourceforge.net/opencvlibrary/%{name}-%{version}%{snap}.tar.g
 # Source0-md5: b147b7cd3c059831c415c5a2bcecdf95
 Patch0:                %{name}-ffmpeg.patch
 Patch1:                %{name}-am.patch
+Patch2:                %{name}-build.patch
 URL:           http://opencv.willowgarage.com
 BuildRequires: autoconf >= 2.53
 BuildRequires: automake
@@ -69,6 +70,7 @@ OpenCV Python bindings.
 %setup -q -n %{name}-%{version}.0
 %patch0 -p0
 %patch1 -p1
+%patch2 -p1
 
 sed -i -e 's#ACLOCAL_AMFLAGS.*##g' Makefile.am
 sed -i -e 's#pkgpython#pkgpyexec#g' interfaces/swig/python/Makefile.am