Merge branch 'master' into f24

2016-07-02 15:22:06 -05:00 · 2016-07-02 15:22:06 -05:00 · 3e45bc65f6
parent 841811ea19 45f76548cf
commit 3e45bc65f6
3 changed files with 6 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -42,3 +42,4 @@ clog
 /OpenImageIO-1.6.12.tar.gz
 /OpenImageIO-1.6.13.tar.gz
 /OpenImageIO-1.6.14.tar.gz
+/OpenImageIO-1.6.15.tar.gz
--- a/OpenImageIO.spec
+++ b/OpenImageIO.spec
@ -2,7 +2,7 @@
 #global beta beta1

 Name:           OpenImageIO
-Version:        1.6.14
+Version:        1.6.15
 Release:        1%{?dist}
 Summary:        Library for reading and writing images

@ -177,6 +177,9 @@ cp -a src/doc/*.1 %{buildroot}%{_mandir}/man1


 %changelog
+* Fri Jul  1 2016 Richard Shaw <hobbes1069@gmail.com> - 1.6.15-1
+- Update to latest upstream release.
+
 * Wed Jun  1 2016 Richard Shaw <hobbes1069@gmail.com> - 1.6.14-1
 - Update to latest upstream release.

--- a/2
+++ b/2
@ -1 +1 @@
-cd8af592f3c4223b3ac0d67d116beda9  OpenImageIO-1.6.14.tar.gz
+3fe2cef4fb5f7bc78b136d2837e1062f  OpenImageIO-1.6.15.tar.gz