[OpenImageIO/f14: 4/4] Merge branch 'master' into f14

[Richard Shaw]

commit 7206d712e29a92278489d547ae375af6ad5deaf1
Merge: 83d4b53 2051691
Author: Richard M. Shaw <hobbes1069 at gmail.com>
Date:   Mon Nov 7 08:32:13 2011 -0600

    Merge branch 'master' into f14
    
    Conflicts:
    	.gitignore

 .gitignore                                  |    1 +
 OpenImageIO-0.10.0-git_backports.patch      |  380 ---------------------------
 OpenImageIO-0.10.0-use_system_tbb.patch     |   31 ---
 OpenImageIO-0.10.2-Z_BEST_COMPRESSION.patch |   11 +
 OpenImageIO-0.10.3-use_system_tbb.patch     |   25 ++
 OpenImageIO.spec                            |   24 ++-
 sources                                     |    2 +-
 7 files changed, 54 insertions(+), 420 deletions(-)
---
diff --cc .gitignore
index c7fc708,0a67a9a..f13f05e
--- a/.gitignore
+++ b/.gitignore
@@@ -1,4 -1,4 +1,5 @@@
  /OpenImageIO-oiio-Release-0.10.0-12-g8055b0f.tar.gz
  /OpenImageIO-oiio-Release-0.10.1-0-g8c102cf.tar.gz
  /OpenImageIO-oiio-Release-0.10.2-0-g7a6cba8.tar.gz
 +clog
+ /OpenImageIO-oiio-Release-0.10.3-0-ge93cd33.tar.gz
diff --cc OpenImageIO.spec
index edea308,de44f4f..9526a68
--- a/OpenImageIO.spec
+++ b/OpenImageIO.spec
@@@ -106,12 -110,13 +110,16 @@@ cp -a doc/*.1 %{buildroot}%{_mandir}/ma
  
  
  %changelog
+ * Sat Nov 05 2011 Richard Shaw <hobbes1069 at gmail.com> - 0.10.3-2
+ - Update to 0.10.3
+ - Rebuild for libpng 1.5.
+ 
  * Thu Aug 27 2011 Tom Callaway <spot at fedoraproject.org> - 0.10.2-1
- - update to 0.10.2
+ - Update to 0.10.2
  
 +* Sat Aug 27 2011 Richard Shaw <hobbes1069 at gmail.com> - 0.10.1-3
 +- rebuild for broken deps
 +
  * Thu Aug 04 2011 Richard Shaw <hobbes1069 at gmail.com> - 0.10.1-2
  - New upstream release.
  - Fix private shared object provides with python library.