packages: opencv/opencv.spec - update to 2.2.0 - libpng14.patch and mmap.pa...

[lisu]

Author: lisu                         Date: Tue Dec  7 12:32:03 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- update to 2.2.0
- libpng14.patch and mmap.patch are obsoleted
- update multilib.patch to fit new source structure
- add link.patch which force linking with -lv4l2
- drop cmake options provided by cmake macro
- BRs: rpmbuild(macros) >= 1.577 (for cmake macro), sed >= 4.0 (for undos macro)
- no ghost soname symlink this time

---- Files affected:
packages/opencv:
   opencv.spec (1.13 -> 1.14) 

---- Diffs:

================================================================
Index: packages/opencv/opencv.spec
diff -u packages/opencv/opencv.spec:1.13 packages/opencv/opencv.spec:1.14
--- packages/opencv/opencv.spec:1.13	Thu Nov 25 12:00:05 2010
+++ packages/opencv/opencv.spec	Tue Dec  7 13:31:58 2010
@@ -5,17 +5,16 @@
 %bcond_with	xine
 Summary:	A library of programming functions mainly aimed at real time computer vision
 Name:		opencv
-Version:	2.1.0
-Release:	2
+Version:	2.2.0
+Release:	1
 Epoch:		1
 License:	BSD
 Group:		Libraries
 Source0:	http://downloads.sourceforge.net/opencvlibrary/OpenCV-%{version}.tar.bz2
-# Source0-md5:	1d71584fb4e04214c0085108f95e24c8
-Patch0:		%{name}-2.0.0-libpng14.patch
-Patch1:		%{name}-2.1.0-mmap.patch
-Patch2:		%{name}-2.1.0-multilib.patch
-Patch3:		%{name}-cflags.patch
+# Source0-md5:	122c9ac793a46854ef2819fedbbd6b1b
+Patch0:		%{name}-multilib.patch
+Patch1:		%{name}-cflags.patch
+Patch2:		%{name}-link.patch
 URL:		http://opencv.willowgarage.com
 BuildRequires:	cmake
 BuildRequires:	ffmpeg-devel
@@ -29,6 +28,8 @@
 BuildRequires:	pkgconfig
 BuildRequires:	python-devel
 BuildRequires:	rpm-pythonprov
+BuildRequires:	rpmbuild(macros) >= 1.577
+BuildRequires:	sed >= 4.0
 BuildRequires:	swig-python
 BuildRequires:	zlib-devel
 %pyrequires_eq	python-libs
@@ -75,21 +76,16 @@
 %prep
 %setup -q -n OpenCV-%{version}
 
-%undos src/ml/CMakeLists.txt
-%undos CMakeLists.txt
-%undos src/cv/CMakeLists.txt
-%undos src/cxcore/CMakeLists.txt
+%undos modules/gpu/CMakeLists.txt
 
-%patch0 -p0
-%patch1 -p0
+%patch0 -p1
+%patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %build
 install -d build
 cd build
 %cmake \
-	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
 %ifarch i686 pentium4 athlon %{x8664}
 	-DENABLE_SSE2=ON \
 %endif
@@ -102,9 +98,6 @@
 	-DWITH_FFMPEG=ON \
 	-DWITH_GTK=ON \
 	-DWITH_V4L=ON \
-%if "%{_lib}" == "lib64"
-	-DLIB_SUFFIX=64 \
-%endif
 	../
 
 %{__make} \
@@ -129,7 +122,6 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_libdir}/lib*so.*.*
-%attr(755,root,root) %ghost %{_libdir}/lib*.so.2.1
 %dir %{_datadir}/opencv
 %{_datadir}/opencv/doc
 %{_datadir}/opencv/haarcascades
@@ -156,6 +148,15 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2010/12/07 12:31:58  lisu
+- update to 2.2.0
+- libpng14.patch and mmap.patch are obsoleted
+- update multilib.patch to fit new source structure
+- add link.patch which force linking with -lv4l2
+- drop cmake options provided by cmake macro
+- BRs: rpmbuild(macros) >= 1.577 (for cmake macro), sed >= 4.0 (for undos macro)
+- no ghost soname symlink this time
+
 Revision 1.13  2010/11/25 11:00:05  hawk
 - added skip_post_check_so to allow build
 
================================================================

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