packages: opencv/opencv.spec, opencv/opencv-am.patch (NEW) - killed duplica...

[hawk]

Author: hawk                         Date: Thu Jul  2 14:34:16 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- killed duplicate install

---- Files affected:
packages/opencv:
   opencv.spec (1.3 -> 1.4) , opencv-am.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/opencv/opencv.spec
diff -u packages/opencv/opencv.spec:1.3 packages/opencv/opencv.spec:1.4
--- packages/opencv/opencv.spec:1.3	Wed Mar 18 23:25:14 2009
+++ packages/opencv/opencv.spec	Thu Jul  2 16:34:11 2009
@@ -4,13 +4,14 @@
 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
+Patch1:		%{name}-am.patch
 URL:		http://opencv.willowgarage.com
 BuildRequires:	autoconf >= 2.53
 BuildRequires:	automake
@@ -68,6 +69,7 @@
 %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
@@ -137,6 +139,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2009/07/02 14:34:11  hawk
+- killed duplicate install
+
 Revision 1.3  2009/03/18 22:25:14  arekm
 - ffmpeg fixes, xine fixes, python fixes
 

================================================================
Index: packages/opencv/opencv-am.patch
diff -u /dev/null packages/opencv/opencv-am.patch:1.1
--- /dev/null	Thu Jul  2 16:34:17 2009
+++ packages/opencv/opencv-am.patch	Thu Jul  2 16:34:11 2009
@@ -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 \
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/opencv/opencv.spec?r1=1.3&r2=1.4&f=u