Accepting request 376941 from KDE:Extra
1 OBS-URL: https://build.opensuse.org/request/show/376941 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=62
This commit is contained in:
parent
c612742431
commit
d4b1601df7
@ -1,3 +1,14 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Mar 21 17:05:19 UTC 2016 - toddrme2178@gmail.com
|
||||||
|
|
||||||
|
- Test for python versions greater than or equal to the current
|
||||||
|
version.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Mar 9 18:15:57 UTC 2016 - toddrme2178@gmail.com
|
||||||
|
|
||||||
|
- Add python 3 support
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Mar 3 21:17:52 UTC 2016 - tittiatcoke@gmail.com
|
Thu Mar 3 21:17:52 UTC 2016 - tittiatcoke@gmail.com
|
||||||
|
|
||||||
|
@ -82,6 +82,8 @@ BuildRequires: libpng16-compat-devel
|
|||||||
BuildRequires: libpng16-devel
|
BuildRequires: libpng16-devel
|
||||||
BuildRequires: python-devel
|
BuildRequires: python-devel
|
||||||
BuildRequires: python-numpy-devel
|
BuildRequires: python-numpy-devel
|
||||||
|
BuildRequires: python3-devel
|
||||||
|
BuildRequires: python3-numpy-devel
|
||||||
%if 0%{?suse_version} != 1315 || 0%{?is_opensuse}
|
%if 0%{?suse_version} != 1315 || 0%{?is_opensuse}
|
||||||
BuildRequires: python-sphinx
|
BuildRequires: python-sphinx
|
||||||
%endif
|
%endif
|
||||||
@ -124,15 +126,23 @@ 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
|
documentation. It should be installed if you want to develop programs that will
|
||||||
use the OpenCV library.
|
use the OpenCV library.
|
||||||
|
|
||||||
%package -n python-%name
|
%package -n python-%{name}
|
||||||
Summary: Python bindings for apps which use OpenCV
|
Summary: Python 2 bindings for apps which use OpenCV
|
||||||
Group: Development/Libraries/Python
|
Group: Development/Libraries/Python
|
||||||
Requires: python-base = %{py_ver}
|
Requires: python-base >= %{py_ver}
|
||||||
%py_requires
|
|
||||||
Conflicts: python-opencv
|
Conflicts: python-opencv
|
||||||
|
|
||||||
%description -n python-%name
|
%description -n python-%{name}
|
||||||
This package contains Python bindings for the OpenCV library.
|
This package contains Python 2 bindings for the OpenCV library.
|
||||||
|
|
||||||
|
%package -n python3-%{name}
|
||||||
|
Summary: Python 3 bindings for apps which use OpenCV
|
||||||
|
Group: Development/Libraries/Python
|
||||||
|
Requires: python3-base >= %{py3_ver}
|
||||||
|
Conflicts: python3-opencv
|
||||||
|
|
||||||
|
%description -n python3-%name
|
||||||
|
This package contains Python 3 bindings for the OpenCV library.
|
||||||
|
|
||||||
%package doc
|
%package doc
|
||||||
Summary: Documentation and examples for OpenCV
|
Summary: Documentation and examples for OpenCV
|
||||||
@ -219,10 +229,14 @@ chmod 644 %{buildroot}%{_docdir}/%{name}-doc/examples/python/*.py
|
|||||||
%{_libdir}/pkgconfig/opencv.pc
|
%{_libdir}/pkgconfig/opencv.pc
|
||||||
%{_datadir}/OpenCV/OpenCVConfig*.cmake
|
%{_datadir}/OpenCV/OpenCVConfig*.cmake
|
||||||
|
|
||||||
%files -n python-%name
|
%files -n python-%{name}
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%{python_sitearch}/cv2.so
|
%{python_sitearch}/cv2.so
|
||||||
|
|
||||||
|
%files -n python3-%{name}
|
||||||
|
%defattr(-,root,root,-)
|
||||||
|
%{python3_sitearch}/cv2.%{py3_soflags}.so
|
||||||
|
|
||||||
%files doc
|
%files doc
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%{_docdir}/%{name}-doc/
|
%{_docdir}/%{name}-doc/
|
||||||
|
@ -1,3 +1,14 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Mar 21 17:05:19 UTC 2016 - toddrme2178@gmail.com
|
||||||
|
|
||||||
|
- Test for python versions greater than or equal to the current
|
||||||
|
version.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Mar 9 18:15:57 UTC 2016 - toddrme2178@gmail.com
|
||||||
|
|
||||||
|
- Add python 3 support
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Mar 3 21:16:19 UTC 2016 - tittiatcoke@gmail.com
|
Thu Mar 3 21:16:19 UTC 2016 - tittiatcoke@gmail.com
|
||||||
|
|
||||||
|
31
opencv.spec
31
opencv.spec
@ -74,6 +74,8 @@ BuildRequires: libpng16-compat-devel
|
|||||||
BuildRequires: libpng16-devel
|
BuildRequires: libpng16-devel
|
||||||
BuildRequires: python-devel
|
BuildRequires: python-devel
|
||||||
BuildRequires: python-numpy-devel
|
BuildRequires: python-numpy-devel
|
||||||
|
BuildRequires: python3-devel
|
||||||
|
BuildRequires: python3-numpy-devel
|
||||||
%if 0%{?suse_version} != 1315 || 0%{?is_opensuse}
|
%if 0%{?suse_version} != 1315 || 0%{?is_opensuse}
|
||||||
BuildRequires: python-sphinx
|
BuildRequires: python-sphinx
|
||||||
%endif
|
%endif
|
||||||
@ -114,14 +116,21 @@ 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
|
documentation. It should be installed if you want to develop programs that will
|
||||||
use the OpenCV library.
|
use the OpenCV library.
|
||||||
|
|
||||||
%package -n python-%name
|
%package -n python-%{name}
|
||||||
Summary: Python bindings for apps which use OpenCV
|
Summary: Python 2 bindings for apps which use OpenCV
|
||||||
Group: Development/Libraries/Python
|
Group: Development/Libraries/Python
|
||||||
Requires: python-base = %{py_ver}
|
Requires: python-base >= %{py_ver}
|
||||||
%py_requires
|
|
||||||
|
|
||||||
%description -n python-%name
|
%description -n python-%{name}
|
||||||
This package contains Python bindings for the OpenCV library.
|
This package contains Python 2 bindings for the OpenCV library.
|
||||||
|
|
||||||
|
%package -n python3-%{name}
|
||||||
|
Summary: Python 3 bindings for apps which use OpenCV
|
||||||
|
Group: Development/Libraries/Python
|
||||||
|
Requires: python3-base >= %{py3_ver}
|
||||||
|
|
||||||
|
%description -n python3-%{name}
|
||||||
|
This package contains Python 3 bindings for the OpenCV library.
|
||||||
|
|
||||||
%package doc
|
%package doc
|
||||||
Summary: Documentation and examples for OpenCV
|
Summary: Documentation and examples for OpenCV
|
||||||
@ -207,10 +216,18 @@ chmod 644 %{buildroot}%{_docdir}/%{name}-doc/examples/python/*.py
|
|||||||
%{_libdir}/pkgconfig/opencv.pc
|
%{_libdir}/pkgconfig/opencv.pc
|
||||||
%{_datadir}/OpenCV/OpenCVConfig*.cmake
|
%{_datadir}/OpenCV/OpenCVConfig*.cmake
|
||||||
|
|
||||||
%files -n python-%name
|
%files -n python-%{name}
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%{python_sitearch}/cv2.so
|
%{python_sitearch}/cv2.so
|
||||||
|
|
||||||
|
%files -n python3-%{name}
|
||||||
|
%defattr(-,root,root,-)
|
||||||
|
%if 0%{?suse_version} > 1310
|
||||||
|
%{python3_sitearch}/cv2.%{py3_soflags}.so
|
||||||
|
%else
|
||||||
|
%{python3_sitearch}/cv2.so
|
||||||
|
%endif
|
||||||
|
|
||||||
%files doc
|
%files doc
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%{_docdir}/%{name}-doc/
|
%{_docdir}/%{name}-doc/
|
||||||
|
Loading…
Reference in New Issue
Block a user