SPECS: opencv.spec - ffmpeg fixes, xine fixes, python fixes

[arekm]

Author: arekm                        Date: Wed Mar 18 22:25:19 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- ffmpeg fixes, xine fixes, python fixes

---- Files affected:
SPECS:
   opencv.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SPECS/opencv.spec
diff -u SPECS/opencv.spec:1.2 SPECS/opencv.spec:1.3
--- SPECS/opencv.spec:1.2	Wed Mar 18 22:47:11 2009
+++ SPECS/opencv.spec	Wed Mar 18 23:25:14 2009
@@ -4,12 +4,13 @@
 Summary:	A library of programming functions mainly aimed at real time computer vision
 Name:		opencv
 Version:	1.1
-Release:	0.%{snap}.1
+Release:	0.%{snap}.2
 Epoch:		1
 License:	BSD
 Group:		Libraries
 Source0:	http://dl.sourceforge.net/opencvlibrary/%{name}-%{version}%{snap}.tar.gz
 # Source0-md5:	b147b7cd3c059831c415c5a2bcecdf95
+Patch0:		%{name}-ffmpeg.patch
 URL:		http://opencv.willowgarage.com
 BuildRequires:	autoconf >= 2.53
 BuildRequires:	automake
@@ -20,6 +21,7 @@
 BuildRequires:	libpng-devel
 BuildRequires:	libraw1394-devel
 BuildRequires:	libtiff-devel
+BuildRequires:	libtool
 BuildRequires:	python-devel
 BuildRequires:	rpm-pythonprov
 BuildRequires:	swig-python
@@ -65,8 +67,17 @@
 
 %prep
 %setup -q -n %{name}-%{version}.0
+%patch0 -p0
+
+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#-L$(SWIG_PYTHON_LIBS)#$(NOTING_NOT_EMPTY_LINE)#g' interfaces/swig/python/Makefile.am
 
 %build
+%{__libtoolize}
+%{__aclocal} -I autotools/aclocal
+%{__autoconf}
+%{__automake}
 %configure \
 %ifarch i686 pentium4 athlon %{x8664}
 	--enable-sse2 \
@@ -74,7 +85,7 @@
 	--disable-sse2 \
 %endif
 	--with-python \
-	--with%{!?with_xine:-out}-xine \
+	--with%{!?with_xine:out}-xine \
 	--with-ffmpeg \
 	--with-1394libs \
 	--with-v4l \
@@ -126,6 +137,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2009/03/18 22:25:14  arekm
+- ffmpeg fixes, xine fixes, python fixes
+
 Revision 1.2  2009/03/18 21:47:11  arekm
 - add BR: swig-python
 
================================================================

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