packages: opencv/opencv.spec - pl - more BRs - static gone due to cmake

Sat Jan 22 21:47:02 CET 2011

Author: qboosh                       Date: Sat Jan 22 20:47:02 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- pl
- more BRs
- static gone due to cmake

---- Files affected:
packages/opencv:
   opencv.spec (1.20 -> 1.21) 

---- Diffs:

================================================================
Index: packages/opencv/opencv.spec
diff -u packages/opencv/opencv.spec:1.20 packages/opencv/opencv.spec:1.21

--- packages/opencv/opencv.spec:1.20	Sun Dec 12 01:37:42 2010
+++ packages/opencv/opencv.spec	Sat Jan 22 21:46:56 2011
@@ -1,9 +1,11 @@
 # $Revision$, $Date$
 #
-# TODO: re-enable static libs
+# Conditional build:
+%bcond_with	gstreamer	# GStreamer support
+%bcond_with	xine		# XINE support (GPL)
 #
-%bcond_with	xine
 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:	6
@@ -15,25 +17,43 @@
 Patch0:		%{name}-multilib.patch
 Patch1:		%{name}-cflags.patch
 Patch2:		%{name}-link.patch
-URL:		http://opencv.willowgarage.com
-BuildRequires:	cmake
+URL:		http://opencv.willowgarage.com/
+BuildRequires:	OpenEXR-devel
+BuildRequires:	cmake >= 2.4
+BuildRequires:	doxygen
 BuildRequires:	ffmpeg-devel
+%if %{with gstreamer}
+BuildRequires:	gstreamer-devel >= 0.10
+BuildRequires:	gstreamer-plugins-base-devel >= 0.10
+%endif
 BuildRequires:	jasper-devel
+BuildRequires:	gtk+2-devel
 BuildRequires:	libdc1394-devel
 BuildRequires:	libjpeg-devel
 BuildRequires:	libpng-devel
 BuildRequires:	libraw1394-devel
+BuildRequires:	libstdc++-devel
 BuildRequires:	libtiff-devel
 BuildRequires:	libtool
+BuildRequires:	libv4l-devel
 BuildRequires:	pkgconfig
 BuildRequires:	python-devel
+BuildRequires:	python-numpy-devel
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.577
 BuildRequires:	sed >= 4.0
 BuildRequires:	swig-python
 BuildRequires:	zlib-devel
-%pyrequires_eq	python-libs
 %{?with_xine:BuildRequires:	xine-lib-devel}
+# TODO:
+# - unicap (libunicap, libucil)
+# - gstreamer
+# - pvapi (PvApi.h)
+# - Qt (bcond replacing GTK+?)
+# - tbb (tbb.pc)
+# - cuda (on bcond)
+# - eigen2/eigen3 (Eigen/Core headers)
+# - ipp (libippi)
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		skip_post_check_so	libhighgui.so.%{version}
@@ -42,37 +62,58 @@
 OpenCV (Open Source Computer Vision) is a library of programming
 functions mainly aimed at real time computer vision.
 
-Example applications of the OpenCV library are Human-Computer
-Interaction (HCI); Object Identification, Segmentation and
-Recognition; Face Recognition; Gesture Recognition; Motion Tracking,
-Ego Motion, Motion Understanding; Structure From Motion (SFM); Stereo
-and Multi-Camera Calibration and Depth Computation; Mobile Robotics.
+Example applications of the OpenCV library are:
+- Human-Computer Interaction (HCI)
+- Object Identification, Segmentation and Recognition
+- Face Recognition
+- Gesture Recognition
+- Motion Tracking
+- Ego Motion, Motion Understanding
+- Structure From Motion (SFM)
+- Stereo and Multi-Camera Calibration and Depth Computation
+- Mobile Robotics.
+
+%description -l pl.UTF-8
+OpenCV (Open Source Computer Vision) to biblioteka funkcji
+przeznaczonych głównie do grafiki komputerowej w czasie rzeczywistym.
+
+Przykładowe zastosowania biblioteki OpenCV to
+- interakcje człowiek-komputer (HCI)
+- identyfikacja, segmentacja i rozpoznawanie obiektów
+- rozpoznawanie twarzy
+- rozpoznawanie gestów
+- śledzenie ruchu
+- rozumienie ruchu
+- SFM (Structure From Motion)
+- kalibracja dwu- i wielokamerowa, obliczanie głębi
+- robotyka ruchu.
 
 %package devel
-Summary:	Header files and develpment documentation for opencv
+Summary:	Header files for OpenCV library
+Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki OpenCV
 Group:		Development/Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Obsoletes:	opencv-static
 
 %description devel
-Header files and opencv documentation.
-
-%package static
-Summary:	Static opencv library
-Group:		Development/Libraries
-Requires:	%{name}-devel = %{epoch}:%{version}-%{release}
+Header files for OpenCV library.
 
-%description static
-This package contains the static library used for development.
+%description devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki OpenCV.
 
 %package -n python-opencv
 Summary:	OpenCV Python bindings
-Group:		Development/Languages/Python
-%pyrequires_eq  python
+Summary(pl.UTF-8):	Wiązania Pythona do OpenCV
+Group:		Libraries/Python
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+%pyrequires_eq  python-libs
 
 %description -n python-opencv
 OpenCV Python bindings.
 
+%description -n python-opencv -l pl.UTF-8
+Wiązania Pythona do OpenCV.
+
 %prep
 %setup -q -n OpenCV-%{version}
 
@@ -86,7 +127,7 @@
 %build
 install -d build
 cd build
-%cmake \
+%cmake .. \
 %ifarch i686 pentium4 athlon %{x8664}
 	-DENABLE_SSE2=ON \
 %endif
@@ -98,8 +139,7 @@
 	-DWITH_1394=ON \
 	-DWITH_FFMPEG=ON \
 	-DWITH_GTK=ON \
-	-DWITH_V4L=ON \
-	../
+	-DWITH_V4L=ON
 
 %{__make} \
 	VERBOSE=1
@@ -126,24 +166,21 @@
 
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/lib*so.*.*
+%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
-%{_datadir}/opencv/doc
+%doc %{_datadir}/opencv/doc
 %{_datadir}/opencv/haarcascades
 %{_datadir}/opencv/lbpcascades
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so
+%attr(755,root,root) %{_libdir}/libopencv_*.so
 %{_includedir}/opencv
 %{_includedir}/opencv2
 %{_datadir}/opencv/OpenCVConfig.cmake
-%{_pkgconfigdir}/*.pc
-
-#%files static
-#%defattr(644,root,root,755)
-#%{_libdir}/lib*.a
+%{_pkgconfigdir}/opencv.pc
 
 %files -n python-opencv
 %defattr(644,root,root,755)
@@ -155,6 +192,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.21  2011/01/22 20:46:56  qboosh
+- pl
+- more BRs
+- static gone due to cmake
+
 Revision 1.20  2010/12/12 00:37:42  arekm
 - rel 6
 
@@ -221,4 +263,3 @@
 
 Revision 1.1  2009/03/18 21:26:16  arekm
 - initial
-
================================================================

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

