rpm/opencv
SHA256
1
0
Fork 0
forked from pool/opencv
Code Pull Requests Activity

Accepting request 127826 from KDE:Distro:Factory

Browse Source 
Update to OpenCV 2.4.2 (forwarded request 127177 from koprok)

OBS-URL: https://build.opensuse.org/request/show/127826
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=34
This commit is contained in:
Stephan Kulow
2012-07-22 13:17:05 +00:00
committed by Git OBS Bridge
parent 400d48dd10
commit ca3e92bd56
6 changed files with 38 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
opencv.spec
View File

@@ -21,7 +21,7 @@
Name: opencv
%define libname lib%{name}
%define soname 2_4
Version: 2.4.1
Version: 2.4.2
Release: 0
Summary: Collection of algorithms for computer vision
License: BSD-3-Clause
@@ -32,8 +32,6 @@ Source0: http://downloads.sourceforge.net/project/%{name}library/%{name}-
Patch1: %{name}-samples.patch
# PATCH-FIX-UPSTREAM opencv-underlinking.patch koprok@nand.bg -- Make libopencv_highgui.so link to libv4l2 since it's using symbols defined there.
Patch2: %{name}-underlinking.patch
# PATCH-FIX-OPENSUSE opencv-datadir.patch koprok@nand.bg -- Install data files in share/opencv instead of share/OpenCV.
Patch3: %{name}-datadir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: OpenEXR-devel
BuildRequires: cmake
@@ -106,7 +104,6 @@ This package contains the documentation and examples for the OpenCV library.
%setup -qn OpenCV-%{version}
%patch1 -p1
%patch2 -p1
%patch3 -p1
# Windows specific and with wrong end of line
rm -f doc/packaging.txt
@@ -140,8 +137,8 @@ make %{?_smp_mflags} VERBOSE=1
cd build
make DESTDIR=%{?buildroot:%{buildroot}} install/fast
mkdir -p %{buildroot}%{_docdir}
mv %{buildroot}%{_datadir}/%{name}/doc %{buildroot}%{_docdir}/%{name}-doc
mv %{buildroot}%{_datadir}/%{name}/samples %{buildroot}%{_docdir}/%{name}-doc/examples
mv %{buildroot}%{_datadir}/OpenCV/doc %{buildroot}%{_docdir}/%{name}-doc
mv %{buildroot}%{_datadir}/OpenCV/samples %{buildroot}%{_docdir}/%{name}-doc/examples
dos2unix %{buildroot}%{_docdir}/%{name}-doc/examples/python*/*.py
dos2unix %{buildroot}%{_docdir}/%{name}-doc/examples/gpu/*.cpp
%fdupes -s %{buildroot}%{_docdir}/%{name}-doc/examples
@@ -160,8 +157,8 @@ rm -rf %{buildroot}
%files -n %{name}
%defattr(0644, root, root, 0755)
%attr(0755, root, root) %{_bindir}/%{name}_*
%{_datadir}/%{name}
%exclude %{_datadir}/%{name}/OpenCVConfig*.cmake
%{_datadir}/OpenCV
%exclude %{_datadir}/OpenCV/OpenCVConfig*.cmake
%files devel
%defattr(0644, root, root, 0755)
@@ -169,7 +166,7 @@ rm -rf %{buildroot}
%{_includedir}/opencv2
%{_libdir}/lib*.so
%{_libdir}/pkgconfig/%{name}.pc
%{_datadir}/%{name}/OpenCVConfig*.cmake
%{_datadir}/OpenCV/OpenCVConfig*.cmake
%files -n python-%{name}
%defattr(0644, root, root, 0755)