packages: opencv/opencv.spec - updated to 2.3.1a - multilib.patch and ffmpe...

[lisu]

Author: lisu                         Date: Wed Sep 21 07:05:14 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 2.3.1a
- multilib.patch and ffmpeg-0.8.patch are obsoleted
- cmake macro was fixed in rpmbuild(macros) 1.600
- sorted BRs
- changes in %%files

---- Files affected:
packages/opencv:
   opencv.spec (1.30 -> 1.31) 

---- Diffs:

================================================================
Index: packages/opencv/opencv.spec
diff -u packages/opencv/opencv.spec:1.30 packages/opencv/opencv.spec:1.31
--- packages/opencv/opencv.spec:1.30	Sun Jul 24 17:54:23 2011
+++ packages/opencv/opencv.spec	Wed Sep 21 09:05:09 2011
@@ -1,5 +1,7 @@
 # $Revision$, $Date$
-# TODO: CUDA support (on bcond)
+#
+# TODO: - CUDA support (on bcond)
+#	- consider name change to OpenCV
 #
 # Conditional build:
 %bcond_without	gstreamer	# GStreamer support
@@ -13,8 +15,8 @@
 Summary:	A library of programming functions mainly aimed at real time computer vision
 Summary(pl.UTF-8):	Biblioteka funkcji do grafiki komputerowej w czasie rzeczywistym
 Name:		opencv
-Version:	2.2.0
-Release:	10
+Version:	2.3.1
+Release:	1
 Epoch:		1
 %if %{with unicap} || %{with xine}
 License:	GPL (enforced by used libraries), BSD (opencv itself)
@@ -22,15 +24,13 @@
 License:	BSD
 %endif
 Group:		Libraries
-Source0:	http://downloads.sourceforge.net/opencvlibrary/OpenCV-%{version}.tar.bz2
-# Source0-md5:	122c9ac793a46854ef2819fedbbd6b1b
-Patch0:		%{name}-multilib.patch
-Patch1:		%{name}-cflags.patch
-Patch2:		%{name}-link.patch
-Patch3:		%{name}-unicap-c++.patch
-Patch4:		%{name}-c.patch
-Patch5:		%{name}-gcc.patch
-Patch6:		%{name}-ffmpeg-0.8.patch
+Source0:	http://downloads.sourceforge.net/opencvlibrary/OpenCV-%{version}a.tar.bz2
+# Source0-md5:	82e4b6bfa349777233eea09b075e931e
+Patch0:		%{name}-cflags.patch
+Patch1:		%{name}-link.patch
+Patch2:		%{name}-unicap-c++.patch
+Patch3:		%{name}-c.patch
+Patch4:		%{name}-gcc.patch
 URL:		http://opencv.willowgarage.com/
 %{?with_pvapi:BuildRequires:	AVT_GigE_SDK-devel}
 BuildRequires:	OpenEXR-devel
@@ -59,12 +59,12 @@
 BuildRequires:	python-devel
 BuildRequires:	python-numpy-devel
 BuildRequires:	rpm-pythonprov
-BuildRequires:	rpmbuild(macros) >= 1.577
+BuildRequires:	rpmbuild(macros) >= 1.600
 BuildRequires:	sed >= 4.0
 BuildRequires:	swig-python
 %{?with_tbb:BuildRequires:	tbb-devel}
-BuildRequires:	zlib-devel
 %{?with_xine:BuildRequires:	xine-lib-devel}
+BuildRequires:	zlib-devel
 %if %{with qt}
 BuildRequires:	OpenGL-devel
 BuildRequires:	QtCore-devel >= 4
@@ -144,8 +144,6 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
-%patch6 -p1
 
 %build
 install -d build
@@ -196,23 +194,24 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/opencv_*
 %attr(755,root,root) %{_libdir}/libopencv_*.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libopencv_*.so.2.2
-%dir %{_datadir}/opencv
-%doc %{_datadir}/opencv/doc
-%{_datadir}/opencv/haarcascades
-%{_datadir}/opencv/lbpcascades
+%attr(755,root,root) %ghost %{_libdir}/libopencv_*.so.2.3
+%dir %{_datadir}/OpenCV
+%doc %{_datadir}/OpenCV/doc
+%{_datadir}/OpenCV/haarcascades
+%{_datadir}/OpenCV/lbpcascades
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libopencv_*.so
 %{_includedir}/opencv
 %{_includedir}/opencv2
-%{_datadir}/opencv/OpenCVConfig.cmake
+%{_datadir}/OpenCV/OpenCVConfig*.cmake
 %{_pkgconfigdir}/opencv.pc
 
 %files -n python-opencv
 %defattr(644,root,root,755)
-%attr(755,root,root) %{py_sitedir}/cv.so
+%attr(755,root,root) %{py_sitedir}/cv2.so
+%{py_sitedir}/cv.py
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -220,6 +219,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.31  2011/09/21 07:05:09  lisu
+- updated to 2.3.1a
+- multilib.patch and ffmpeg-0.8.patch are obsoleted
+- cmake macro was fixed in rpmbuild(macros) 1.600
+- sorted BRs
+- changes in %%files
+
 Revision 1.30  2011/07/24 15:54:23  arekm
 - release 10
 
================================================================

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