rpms/opencv/devel opencv-1.1pre1-automake.patch, NONE, 1.1 opencv.spec, 1.31, 1.32

[Nicolas Chauvet]

Author: kwizart

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

Modified Files:
	opencv.spec 
Added Files:
	opencv-1.1pre1-automake.patch 
Log Message:
- Fix FTBFS #511705


opencv-1.1pre1-automake.patch:

--- NEW FILE opencv-1.1pre1-automake.patch ---
diff -up opencv-1.1.0/samples/c/Makefile.am.automake opencv-1.1.0/samples/c/Makefile.am
--- opencv-1.1.0/samples/c/Makefile.am.automake	2009-07-16 09:19:35.000000000 +0200
+++ opencv-1.1.0/samples/c/Makefile.am	2009-07-16 09:21:46.000000000 +0200
@@ -7,8 +7,8 @@ left08.jpg left09.jpg left11.jpg left12.
 right01.jpg right02.jpg right03.jpg right04.jpg right05.jpg right06.jpg right07.jpg \
 right08.jpg right09.jpg right11.jpg right12.jpg right13.jpg right14.jpg \
 stereo_calib.txt build_all.sh cvsample.dsp makefile.ms makefile.gnu \
-agaricus-lepiota.data letter-recognition.data bgfg_codebook.cpp bgfg_segm.cpp blobtrack.cpp camshiftdemo.c \
-contours.c convexhull.c camshiftdemo.c contours.c convert_cascade.c convexhull.c \
+agaricus-lepiota.data letter-recognition.data bgfg_codebook.cpp bgfg_segm.cpp blobtrack.cpp \
+camshiftdemo.c contours.c convert_cascade.c convexhull.c \
 delaunay.c demhist.c dft.c distrans.c drawing.c edge.c facedetect.c \
 facedetect.cmd ffilldemo.c find_obj.cpp fitellipse.c houghlines.c kalman.c kmeans.c image.cpp \
 inpaint.cpp laplace.c letter_recog.cpp lkdemo.c minarea.c morphology.c motempl.c \


Index: opencv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/opencv/devel/opencv.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- opencv.spec	24 Apr 2009 11:05:05 -0000	1.31
+++ opencv.spec	16 Jul 2009 07:29:34 -0000	1.32
@@ -3,7 +3,7 @@
 
 Name:           opencv
 Version:        1.1.0
-Release:        0.1.pre1%{?dist}.1
+Release:        0.2.pre1%{?dist}
 Summary:        Collection of algorithms for computer vision
 
 Group:          Development/Libraries
@@ -16,6 +16,7 @@ Patch0:         opencv-1.0.0-gcc44.patch
 Patch1:         opencv-1.1-nooptim.patch
 Patch2:         opencv-1.1.0-pythondir.diff
 Patch3:         opencv-1.1.0-conflicts.patch
+Patch4:         opencv-1.1pre1-automake.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libtool
@@ -68,6 +69,7 @@ This package contains Python bindings fo
 %patch2 -p1 -b .pydir
 #autotools conflicts between AC_CONFIG_MACRO_DIR and AM_FLAGS
 %patch3 -p1 -b .conflicts
+%patch4 -p1 -b .automake
 
 
 #Renew the autotools (and remove rpath).
@@ -146,6 +148,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Jul 16 2009 kwizart < kwizart at gmail.com > - 1.1.0-0.2.pre1
+- Fix FTBFS #511705
+
 * Fri Apr 24 2009 kwizart < kwizart at gmail.com > - 1.1.0-0.1.pre1
 - Update to 1.1pre1
 - Disable CXXFLAGS hardcoded optimization