Accepting request 347152 from KDE:Extra

1

OBS-URL: https://build.opensuse.org/request/show/347152
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=58
This commit is contained in:
Dominique Leuenberger 2015-12-16 16:41:36 +00:00 committed by Git OBS Bridge
parent b76f285203
commit e87f0f1d1f
4 changed files with 30 additions and 9 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Sep 22 08:47:31 UTC 2015 - olaf@aepfle.de
- Use pkgconfig for ffmpeg BuildRequires
-------------------------------------------------------------------
Fri Jul 24 14:48:48 UTC 2015 - mlin@suse.com

View File

@ -60,7 +60,10 @@ BuildRequires: libeigen3-devel
BuildRequires: libeigen2-devel
%endif
%if %{with ffmpeg}
BuildRequires: libffmpeg-devel
BuildRequires: pkgconfig(libavcodec)
BuildRequires: pkgconfig(libavformat)
BuildRequires: pkgconfig(libavutil)
BuildRequires: pkgconfig(libswscale)
%endif
BuildRequires: libjasper-devel
BuildRequires: libjpeg-devel

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Wed Dec 2 09:17:09 UTC 2015 - ohering@suse.de
- Reduce differences between two spec files
-------------------------------------------------------------------
Tue Sep 22 08:47:31 UTC 2015 - olaf@aepfle.de
- Use pkgconfig for ffmpeg BuildRequires
-------------------------------------------------------------------
Fri Jul 24 14:40:06 UTC 2015 - mlin@suse.com

View File

@ -28,9 +28,9 @@ Summary: Collection of algorithms for computer vision
License: BSD-3-Clause
Group: Development/Libraries/C and C++
Url: http://opencv.org/
Source0: https://github.com/Itseez/%{name}/archive/%{version}.tar.gz
Source0: https://github.com/Itseez/opencv/archive/%{version}.tar.gz
# PATCH-FIX-UPSTREAM opencv-samples.patch koprok@nand.bg -- Improve samples installation.
Patch1: %{name}-samples.patch
Patch1: opencv-samples.patch
# PATCH-FIX-OPENSUSE improve-sphinx-search.diff -- properly find sphinx with alphabetic chars in version
Patch3: improve-sphinx-search.diff
# PATCH-FIX-UPSTREAM opencv-pkgconfig.patch -- Make sure to provide link flags in OpenCV pc file (bnc#853036). Issue is exposed when e.g. a project relies on
@ -56,7 +56,10 @@ BuildRequires: libeigen3-devel
BuildRequires: libeigen2-devel
%endif
%if %{with ffmpeg}
BuildRequires: libffmpeg-devel
BuildRequires: pkgconfig(libavcodec)
BuildRequires: pkgconfig(libavformat)
BuildRequires: pkgconfig(libavutil)
BuildRequires: pkgconfig(libswscale)
%endif
BuildRequires: libjasper-devel
BuildRequires: libjpeg-devel
@ -112,13 +115,13 @@ This package contains the OpenCV C/C++ library and header files, as well as
documentation. It should be installed if you want to develop programs that will
use the OpenCV library.
%package -n python-%{name}
%package -n python-%name
Summary: Python bindings for apps which use OpenCV
Group: Development/Libraries/Python
Requires: python-base = %{py_ver}
%py_requires
%description -n python-%{name}
%description -n python-%name
This package contains Python bindings for the OpenCV library.
%package doc
@ -192,7 +195,7 @@ chmod 644 %{buildroot}%{_docdir}/%{name}-doc/examples/python2/*.py
%files
%defattr(-,root,root,-)
%{_bindir}/%{name}_*
%{_bindir}/opencv_*
%{_datadir}/OpenCV
%exclude %{_datadir}/OpenCV/OpenCVConfig*.cmake
@ -206,10 +209,10 @@ chmod 644 %{buildroot}%{_docdir}/%{name}-doc/examples/python2/*.py
%{_includedir}/opencv2/
%{_libdir}/libopencv_ts.a
%{_libdir}/lib*.so
%{_libdir}/pkgconfig/%{name}.pc
%{_libdir}/pkgconfig/opencv.pc
%{_datadir}/OpenCV/OpenCVConfig*.cmake
%files -n python-%{name}
%files -n python-%name
%defattr(-,root,root,-)
%{python_sitearch}/cv.py
%{python_sitearch}/cv2.so