- killed duplicate install

Changed files:
    opencv-am.patch -> 1.1
    opencv.spec -> 1.4

diff --git a/opencv-am.patch b/opencv-am.patch
new file mode 100644 (file)
index 0000000..5636086
--- /dev/null
+++ b/opencv-am.patch
@@ -0,0 +1,14 @@
+diff -ur opencv-1.1.0.orig/samples/c/Makefile.am opencv-1.1.0/samples/c/Makefile.am
+--- opencv-1.1.0.orig/samples/c/Makefile.am    2009-07-02 16:29:14.088536975 +0200
++++ opencv-1.1.0/samples/c/Makefile.am 2009-07-02 16:30:05.145362986 +0200
+@@ -7,8 +7,8 @@
+ 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 \

diff --git a/opencv.spec b/opencv.spec
index bd14a4063adb0898c90d9e5aea4879f2ea8fac59..a0ed3484bc2d6bdb36669723d91b3de3d24bb330 100644 (file)
--- a/opencv.spec
+++ b/opencv.spec
@@ -3,13 +3,14 @@
 Summary:       A library of programming functions mainly aimed at real time computer vision
 Name:          opencv
 Version:       1.1
 Summary:       A library of programming functions mainly aimed at real time computer vision
 Name:          opencv
 Version:       1.1

-Release:       0.%{snap}.2
+Release:       0.%{snap}.3

 Epoch:         1
 License:       BSD
 Group:         Libraries
 Source0:       http://dl.sourceforge.net/opencvlibrary/%{name}-%{version}%{snap}.tar.gz
 # Source0-md5: b147b7cd3c059831c415c5a2bcecdf95
 Patch0:                %{name}-ffmpeg.patch
 Epoch:         1
 License:       BSD
 Group:         Libraries
 Source0:       http://dl.sourceforge.net/opencvlibrary/%{name}-%{version}%{snap}.tar.gz
 # Source0-md5: b147b7cd3c059831c415c5a2bcecdf95
 Patch0:                %{name}-ffmpeg.patch

+Patch1:                %{name}-am.patch

 URL:           http://opencv.willowgarage.com
 BuildRequires: autoconf >= 2.53
 BuildRequires: automake
 URL:           http://opencv.willowgarage.com
 BuildRequires: autoconf >= 2.53
 BuildRequires: automake


@@ -67,6 +68,7 @@ OpenCV Python bindings.
 %prep
 %setup -q -n %{name}-%{version}.0
 %patch0 -p0
 %prep
 %setup -q -n %{name}-%{version}.0
 %patch0 -p0

+%patch1 -p1

 
 sed -i -e 's#ACLOCAL_AMFLAGS.*##g' Makefile.am
 sed -i -e 's#pkgpython#pkgpyexec#g' interfaces/swig/python/Makefile.am
 
 sed -i -e 's#ACLOCAL_AMFLAGS.*##g' Makefile.am
 sed -i -e 's#pkgpython#pkgpyexec#g' interfaces/swig/python/Makefile.am