From bf18a5b82b5afdbbc273a4d6609d1093e3a5f7f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Honza=20Hor=C3=A1k?= Date: Tue, 5 Feb 2013 09:42:23 +0100 Subject: [PATCH] Do not build with 1394 libs in rhel --- opencv.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/opencv.spec b/opencv.spec index 0bb431e..076326c 100644 --- a/opencv.spec +++ b/opencv.spec @@ -5,7 +5,7 @@ Name: opencv Version: 2.4.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Collection of algorithms for computer vision Group: Development/Libraries @@ -31,10 +31,12 @@ BuildRequires: chrpath BuildRequires: gtk2-devel BuildRequires: libtheora-devel BuildRequires: libvorbis-devel +%if 0%{?fedora} >= 1 %ifnarch s390 s390x BuildRequires: libraw1394-devel BuildRequires: libdc1394-devel %endif +%endif BuildRequires: jasper-devel BuildRequires: libpng-devel BuildRequires: libjpeg-devel @@ -234,6 +236,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jan 25 2013 Honza Horak - 2.4.3-7 +- Do not build with 1394 libs in rhel + * Mon Jan 21 2013 Adam Tkac - 2.4.3-6 - rebuild due to "jpeg8-ABI" feature drop @@ -252,7 +257,7 @@ rm -rf $RPM_BUILD_ROOT * Fri Jul 20 2012 Fedora Release Engineering - 2.4.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild -* Mon Jul 09 2012 Honza Horak - 2.4.2-1 +* Mon Jul 09 2012 Honza Horak - 2.4.2-1 - Update to 2.4.2 * Fri Jun 29 2012 Honza Horak - 2.4.1-2