[OpenImageIO/f16] Fix conflicts.

[Richard Shaw]

commit 3de092e48bb2aded8b8636da08e8296ff5c2a1f6
Author: Richard M. Shaw <hobbes1069 at gmail.com>
Date:   Wed Jun 13 21:13:57 2012 -0500

    Fix conflicts.

 OpenImageIO.spec |   58 ------------------------------------------------------
 1 files changed, 0 insertions(+), 58 deletions(-)
---
diff --git a/OpenImageIO.spec b/OpenImageIO.spec
index da2cef5..5a98a91 100644
--- a/OpenImageIO.spec
+++ b/OpenImageIO.spec
@@ -1,16 +1,8 @@
-<<<<<<< HEAD
-%global githash1 g1e37127
-%global githash2 1fa4a20
-
-Name:           OpenImageIO
-Version:        0.10.8
-=======
 %global githash1 g28ba675
 %global githash2 2939154
 
 Name:           OpenImageIO
 Version:        1.0.5
->>>>>>> master
 Release:        1%{?dist}
 Summary:        Library for reading and writing images
 
@@ -21,17 +13,6 @@ URL:            https://sites.google.com/site/openimageio/home
 Source0:        https://download.github.com/%{name}-oiio-Release-%{version}-0-%{githash1}.tar.gz
 Source1:        FindTBB.cmake
 
-<<<<<<< HEAD
-Patch0:         OpenImageIO-0.10.2-git_backports.patch
-Patch1:         OpenImageIO-0.10.0-atomic_test_fix.patch
-Patch2:         OpenImageIO-0.10.3-use_external_tbb.patch
-Patch3:         OpenImageIO-0.10.2-Z_BEST_COMPRESSION.patch
-Patch4:         OpenImageIO-0.10.4-no_tbb.patch
-
-BuildRequires:  cmake
-BuildRequires:  boost-devel glew-devel OpenEXR-devel ilmbase-devel
-BuildRequires:  qt4-devel
-=======
 Patch0:         OpenImageIO-1.0.0-use_external_tbb.patch
 Patch1:         OpenImageIO-1.0.0-tbb_include.patch
 Patch2:         OpenImageIO-ppc.patch
@@ -39,16 +20,11 @@ Patch2:         OpenImageIO-ppc.patch
 BuildRequires:  cmake
 BuildRequires:  qt4-devel
 BuildRequires:  boost-devel glew-devel OpenEXR-devel ilmbase-devel
->>>>>>> master
 BuildRequires:  python2-devel txt2man
 BuildRequires:  libpng-devel libtiff-devel openjpeg-devel libwebp-devel
 BuildRequires:  zlib-devel jasper-devel
 BuildRequires:  pugixml-devel
-<<<<<<< HEAD
-%ifarch %{ix86} x86_64 ia64
-=======
 %ifarch x86_64
->>>>>>> master
 BuildRequires:  tbb-devel
 %endif
 BuildRequires:  hdf5-devel Field3D-devel
@@ -86,17 +62,9 @@ Development files for package %{name}
 
 %prep
 %setup -q -n %{name}-oiio-%{githash2}
-<<<<<<< HEAD
-%patch0 -p1 -b .backport
-%patch1 -p1 -b .atomic
-%patch2 -p1 -b .tbb
-%patch3 -p1 -b .zlib
-%patch4 -p1 -b .no-tbb
-=======
 %patch0 -p1 -b .exttbb
 %patch1 -p1 -b .tbbinc
 %patch2 -p1 -b .ppc
->>>>>>> master
 
 # Remove bundled pugixml
 rm -f src/include/pugixml.hpp \
@@ -120,13 +88,6 @@ pushd build
        -DPYLIB_INSTALL_DIR:PATH=%{python_sitearch} \
        -DINSTALL_DOCS:BOOL=FALSE \
        -DUSE_EXTERNAL_PUGIXML:BOOL=TRUE \
-<<<<<<< HEAD
-%ifarch %{ix86} x86_64 ia64
-       -DUSE_TBB:BOOL=TRUE \
-%else
-       -DUSE_TBB:BOOL=FALSE \
-%endif
-=======
 %ifarch x86_64
        -DUSE_TBB:BOOL=TRUE \
        -DUSE_EXTERNAL_TBB=TRUE \
@@ -136,7 +97,6 @@ pushd build
 %ifarch ppc ppc64
        -DNOTHREADS:BOOL=TRUE \
 %endif
->>>>>>> master
        ../src
 
 make %{?_smp_mflags}
@@ -156,11 +116,7 @@ cp -a doc/*.1 %{buildroot}%{_mandir}/man1
 
 
 %check
-<<<<<<< HEAD
-# Not all unit tests expected to pass.
-=======
 # Not all tests are expected to pass yet.
->>>>>>> master
 #pushd build && make test
 
 
@@ -178,22 +134,8 @@ cp -a doc/*.1 %{buildroot}%{_mandir}/man1
 
 
 %changelog
-<<<<<<< HEAD
-* Thu Apr 19 2012 Richard Shaw <hobbes1069 at gmail.com> - 0.10.8-1
-- Update to latest upstream release.
-
-* Mon Apr 09 2012 Dan Horák <dan[at]danny.cz> - 0.10.4-6
-- fix build without TBB
-
-* Mon Mar 12 2012 Richard Shaw <hobbes1069 at gmail.com> - 0.10.4-5
-- Rebuild for updated Field3D.
-
-* Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.4-3
-- Rebuilt for c++ ABI breakage
-=======
 * Tue Jun 12 2012 Richard Shaw <hobbes1069 at gmail.com> - 1.0.5-1
 - Update to latest upstream release.
->>>>>>> master
 
 * Mon May 07 2012 Richard Shaw <hobbes1069 at gmail.com> - 1.0.4-2
 - Rebuild for updated libtiff.