diff --git a/opencv.spec b/opencv.spec index 1f7f36e..591feb7 100644 --- a/opencv.spec +++ b/opencv.spec @@ -1,15 +1,16 @@ %define pkgver %(echo %version | sed "s|[a-z]||") %define javaver %(echo %version | cut -d. -f1-3 | tr -d .) Name: opencv -Version: 2.4.6.1 -Release: 4mamba +Version: 2.4.9 +Release: 1mamba Summary: Collection of algorithms for computer vision Group: Development/Libraries Vendor: openmamba Distribution: openmamba Packager: Davide Madrisan URL: http://opencv.willowgarage.com/wiki/ -Source: http://downloads.sourceforge.net/project/opencvlibrary/opencv-unix/%{version}/opencv-%{version}.tar.gz +Source: http://downloads.sourceforge.net/project/opencvlibrary/opencv-unix/%{version}/opencv-%{version}.zip +#Source: http://downloads.sourceforge.net/project/opencvlibrary/opencv-unix/%{version}/opencv-%{version}.tar.gz Patch0: %{name}-2.1.0-libpng14.patch Patch1: %{name}-2.3.1-arm-build.patch License: BSD @@ -43,7 +44,7 @@ BuildRequires: libtiff-devel BuildRequires: libunicap-devel BuildRequires: libv4l-devel BuildRequires: libvorbis-devel -BuildRequires: libxine1-devel +BuildRequires: libxine-devel BuildRequires: libxml2-devel BuildRequires: libz-devel BuildRequires: python-Imaging @@ -71,14 +72,16 @@ Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} %description -n java-opencv This package contains Python bindings for the OpenCV library. -%package python +%package -n python-cv Summary: Python bindings for apps which use OpenCV Group: Development/Libraries Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} Requires: python-Imaging Requires: python-numpy +Provides: opencv-python +Obsoletes: opencv-python -%description python +%description -n python-cv This package contains Python bindings for the OpenCV library. %prep @@ -136,12 +139,14 @@ rm -fr %{buildroot}%{_datadir}/opencv/doc #%{_libdir}/libcxcore.so.* #%{_libdir}/libhighgui.so.* #%{_libdir}/libml.so.* -#%dir %{_datadir}/opencv +%dir %{_datadir}/OpenCV %dir %{_datadir}/OpenCV/haarcascades %{_datadir}/OpenCV/haarcascades/* %dir %{_datadir}/OpenCV/lbpcascades %{_datadir}/OpenCV/lbpcascades/* -%doc doc/license.txt +#%dir %{_datadir}/OpenCV/doc +#%{_datadir}/OpenCV/doc/* +#%doc doc/license.txt %files devel %defattr(-,root,root) @@ -150,7 +155,10 @@ rm -fr %{buildroot}%{_datadir}/opencv/doc %dir %{_includedir}/opencv2 %{_includedir}/opencv2/* %{_libdir}/libopencv_*.so +%{_libdir}/libopencv_ts.a %{_libdir}/pkgconfig/opencv.pc +%{_datadir}/OpenCV/OpenCVModules-release.cmake +%{_datadir}/OpenCV/OpenCVModules.cmake %{_datadir}/OpenCV/OpenCVConfig.cmake %{_datadir}/OpenCV/OpenCVConfig-version.cmake @@ -160,14 +168,20 @@ rm -fr %{buildroot}%{_datadir}/opencv/doc %{_datadir}/OpenCV/java/libopencv_java%{javaver}.so %{_datadir}/OpenCV/java/opencv-%{javaver}.jar -%files python +%files -n python-cv %defattr(-,root,root) -%{python_sitearch}/cv.py -%{python_sitearch}/cv2.so +%{python_sitelib}/cv.py +%{python_sitelib}/cv2.so %changelog -* Tue Apr 01 2014 Silvan Calarco 2.4.6.1-4mamba -- rebuilt with openexr 2.1.0 +* Tue Jul 15 2014 Automatic Build System 2.4.9-1mamba +- automatic version update by autodist + +* Wed Jan 15 2014 Silvan Calarco 2.4.8-1mamba +- update to 2.4.8 + +* Wed Nov 13 2013 Automatic Build System 2.4.7-1mamba +- automatic version update by autodist * Mon Aug 26 2013 Silvan Calarco 2.4.6.1-3mamba - rebuilt after upgrading libatlas-3.8.4-2mamba which fixes python-numpy