Update to 2.4.4a

This commit is contained in:
Nicolas Chauvet 2013-03-23 17:59:16 +01:00
parent 0e5efebf1e
commit bd9bfd774a
3 changed files with 11 additions and 6 deletions

1
.gitignore vendored
View File

@ -6,3 +6,4 @@ OpenCV-2.1.0.tar.bz2
/OpenCV-2.4.2.tar.bz2
/OpenCV-2.4.3.tar.bz2
/OpenCV-2.4.4-beta.tar.bz2
/OpenCV-2.4.4a.tar.bz2

View File

@ -1,18 +1,18 @@
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
%global tar_name OpenCV
%global indice -beta
%global indice a
Name: opencv
Version: 2.4.4
Release: 0.2.beta%{?dist}
Release: 1%{?dist}
Summary: Collection of algorithms for computer vision
Group: Development/Libraries
# This is normal three clause BSD.
License: BSD
URL: http://opencv.willowgarage.com/wiki/
Source0: http://prdownloads.sourceforge.net/opencvlibrary/%{tar_name}-%{version}%{?indice}.tar.bz2
Source0: http://downloads.sourceforge.net/opencvlibrary/%{tar_name}-%{version}%{?indice}.tar.bz2
Source1: opencv-samples-Makefile
Patch0: opencv-pkgcmake.patch
Patch1: opencv-pkgcmake2.patch
@ -48,7 +48,7 @@ BuildRequires: openni-primesense
%endif
}
%{?_with_ttb:
%ifarch %{ix86} x86_64 ia64
%ifarch %{ix86} x86_64 ia64 ppc ppc64
BuildRequires: tbb-devel
%endif
}
@ -99,7 +99,7 @@ This package contains Python bindings for the OpenCV library.
%prep
%setup -q -n %{tar_name}-%{version}
%setup -q
%patch0 -p1 -b .pkgcmake
%patch1 -p1 -b .pkgcmake2
%patch2 -p1 -b .pillow
@ -232,6 +232,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Sat Mar 23 2013 Nicolas Chauvet <kwizart@gmail.com> - 2.4.4-1
- Update to 2.4.4a
- Fix ttb-devel architecture conditionals
* Sun Mar 10 2013 Rex Dieter <rdieter@fedoraproject.org> 2.4.4-0.2.beta
- rebuild (OpenEXR)

View File

@ -1 +1 @@
eec1f1afe7b0b4a95d72336c8eaef996 OpenCV-2.4.4-beta.tar.bz2
876dce80ea2648b7e4d4c5a567b4d37b OpenCV-2.4.4a.tar.bz2