rpms/opencv/FC-4 opencv-0.9.7-intrinsics.patch, 1.4, 1.5 opencv.spec, 1.9, 1.10

[Simon Perreault (nomis80)]

Author: nomis80

Update of /cvs/extras/rpms/opencv/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29668

Modified Files:
	opencv-0.9.7-intrinsics.patch opencv.spec 
Log Message:
* Tue Mar  7 2006 Simon Perreault <nomis80 at nomis80.org> - 0.9.7-11
- Don't do "make check" because it doesn't run any tests anyway.
- Back to main intrinsics patch.


opencv-0.9.7-intrinsics.patch:

Index: opencv-0.9.7-intrinsics.patch
===================================================================
RCS file: /cvs/extras/rpms/opencv/FC-4/opencv-0.9.7-intrinsics.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- opencv-0.9.7-intrinsics.patch	7 Mar 2006 17:44:35 -0000	1.4
+++ opencv-0.9.7-intrinsics.patch	7 Mar 2006 19:06:04 -0000	1.5
@@ -123,48 +123,6 @@
  /* Errors */
  #define HG_OK          0 /* Don't bet on it! */
  #define HG_BADNAME    -1 /* Bad window or file name */
-diff -urp opencv-0.9.7.orig/tests/cv/src/cvtest.h opencv-0.9.7/tests/cv/src/cvtest.h
---- opencv-0.9.7.orig/tests/cv/src/cvtest.h	2006-03-06 22:58:41.000000000 -0500
-+++ opencv-0.9.7/tests/cv/src/cvtest.h	2006-03-07 12:05:24.000000000 -0500
-@@ -42,6 +42,10 @@
- #ifndef _CVTEST_H_
- #define _CVTEST_H_
- 
-+#ifdef HAVE_CONFIG_H
-+#include <cvconfig.h>
-+#endif
-+
- #ifdef WIN32
- #include <windows.h>
- #endif
-diff -urp opencv-0.9.7.orig/tests/cxcore/src/cxcoretest.h opencv-0.9.7/tests/cxcore/src/cxcoretest.h
---- opencv-0.9.7.orig/tests/cxcore/src/cxcoretest.h	2006-03-06 22:58:41.000000000 -0500
-+++ opencv-0.9.7/tests/cxcore/src/cxcoretest.h	2006-03-07 12:05:24.000000000 -0500
-@@ -42,6 +42,10 @@
- #ifndef _CXCORE_TEST_H_
- #define _CXCORE_TEST_H_
- 
-+#ifdef HAVE_CONFIG_H
-+#include <cvconfig.h>
-+#endif
-+
- #if defined WIN32 || defined WIN64
- #include <windows.h>
- #endif
-diff -urp opencv-0.9.7.orig/tests/cxts/_cxts.h opencv-0.9.7/tests/cxts/_cxts.h
---- opencv-0.9.7.orig/tests/cxts/_cxts.h	2006-03-06 22:58:41.000000000 -0500
-+++ opencv-0.9.7/tests/cxts/_cxts.h	2006-03-07 12:05:24.000000000 -0500
-@@ -42,6 +42,10 @@
- #ifndef __CXTS_INTERNAL_H__
- #define __CXTS_INTERNAL_H__
- 
-+#ifdef HAVE_CONFIG_H
-+#include <cvconfig.h>
-+#endif
-+
- #if (defined WIN32 || defined WIN64) && (_MSC_VER >= 1200 || defined _ICL)
- #pragma warning( disable: 4514 )
- #endif
 diff -urp opencv-0.9.7.orig/interfaces/swig/general/cv.i opencv-0.9.7/interfaces/swig/general/cv.i
 --- opencv-0.9.7.orig/interfaces/swig/general/cv.i	2006-03-06 22:58:41.000000000 -0500
 +++ opencv-0.9.7/interfaces/swig/general/cv.i	2006-03-07 12:33:16.000000000 -0500


Index: opencv.spec
===================================================================
RCS file: /cvs/extras/rpms/opencv/FC-4/opencv.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- opencv.spec	7 Mar 2006 18:49:27 -0000	1.9
+++ opencv.spec	7 Mar 2006 19:06:04 -0000	1.10
@@ -5,7 +5,7 @@
 
 Name:           opencv
 Version:        0.9.7
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Collection of algorithms for computer vision
 
 Group:          Development/Libraries
@@ -13,7 +13,7 @@
 URL:            http://www.intel.com/technology/computing/opencv/index.htm
 Source0:        http://prdownloads.sourceforge.net/opencvlibrary/opencv-%{version}.tar.gz
 Source1:        opencv-samples-Makefile
-Patch0:         opencv-0.9.7-intrinsics-simple.patch
+Patch0:         opencv-0.9.7-intrinsics.patch
 Patch1:         opencv-0.9.7-pythondir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -66,10 +66,6 @@
 make %{?_smp_mflags}
 
 
-%check
-make check
-
-
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -126,6 +122,10 @@
 
 
 %changelog
+* Tue Mar  7 2006 Simon Perreault <nomis80 at nomis80.org> - 0.9.7-11
+- Don't do "make check" because it doesn't run any tests anyway.
+- Back to main intrinsics patch.
+
 * Tue Mar  7 2006 Simon Perreault <nomis80 at nomis80.org> - 0.9.7-10
 - Using simple intrinsincs patch.