rpms/opencv/devel opencv-1.1.0-pythondir.diff, 1.1, 1.2 opencv.spec, 1.30, 1.31

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/pkgs/rpms/opencv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25194

Modified Files:
	opencv-1.1.0-pythondir.diff opencv.spec 
Log Message:
pythondir patch was wrongly imported


opencv-1.1.0-pythondir.diff:

Index: opencv-1.1.0-pythondir.diff
===================================================================
RCS file: /cvs/pkgs/rpms/opencv/devel/opencv-1.1.0-pythondir.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- opencv-1.1.0-pythondir.diff	24 Apr 2009 10:14:52 -0000	1.1
+++ opencv-1.1.0-pythondir.diff	24 Apr 2009 11:05:05 -0000	1.2
@@ -1,14 +1,15 @@
---- opencv-1.0.0.orig/interfaces/swig/python/Makefile.am	2006-08-10 15:29:20.000000000 +0200
-+++ opencv-1.0.0/interfaces/swig/python/Makefile.am	2007-03-22 04:04:45.000000000 +0100
-@@ -92,9 +92,9 @@
- 
+diff -up opencv-1.1.0/interfaces/swig/python/Makefile.am.pydir opencv-1.1.0/interfaces/swig/python/Makefile.am
+--- opencv-1.1.0/interfaces/swig/python/Makefile.am.pydir	2009-04-24 10:48:47.000000000 +0200
++++ opencv-1.1.0/interfaces/swig/python/Makefile.am	2009-04-24 10:49:49.000000000 +0200
+@@ -107,9 +107,9 @@ endif
  if BUILD_PYTHON_WRAPPERS
  
--pkgpython_LTLIBRARIES = _cv.la _highgui.la
-+pkgpyexec_LTLIBRARIES = _cv.la _highgui.la
+ #pkgpython_LTLIBRARIES = _cv.la _highgui.la
+-pkgpython_LTLIBRARIES = _cv.la _ml.la _highgui.la
++pkgpyexec_LTLIBRARIES = _cv.la _ml.la _highgui.la
  
 -pkgpython_PYTHON = \
 +pkgpyexec_PYTHON = \
    __init__.py    \
    cv.py          \
-   adaptors.py    \
+   ml.py          \


Index: opencv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/opencv/devel/opencv.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- opencv.spec	24 Apr 2009 10:42:52 -0000	1.30
+++ opencv.spec	24 Apr 2009 11:05:05 -0000	1.31
@@ -3,7 +3,7 @@
 
 Name:           opencv
 Version:        1.1.0
-Release:        0.1.pre1%{?dist}
+Release:        0.1.pre1%{?dist}.1
 Summary:        Collection of algorithms for computer vision
 
 Group:          Development/Libraries