From bd9bfd774aaed7f4fba0a3a7befdd1f7896170ef Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sat, 23 Mar 2013 17:59:16 +0100 Subject: [PATCH] Update to 2.4.4a --- .gitignore | 1 + opencv.spec | 14 +++++++++----- sources | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index c37073e..242093e 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/opencv.spec b/opencv.spec index fc11ad6..229d1dd 100644 --- a/opencv.spec +++ b/opencv.spec @@ -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 - 2.4.4-1 +- Update to 2.4.4a +- Fix ttb-devel architecture conditionals + * Sun Mar 10 2013 Rex Dieter 2.4.4-0.2.beta - rebuild (OpenEXR) diff --git a/sources b/sources index 579aeba..a07a69e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -eec1f1afe7b0b4a95d72336c8eaef996 OpenCV-2.4.4-beta.tar.bz2 +876dce80ea2648b7e4d4c5a567b4d37b OpenCV-2.4.4a.tar.bz2