Merge branch 'master' into epel7

2015-01-22 09:46:12 -06:00 · 2015-01-22 09:46:12 -06:00 · e286433dd5
parent bb5ee462c2 9e58345a6a
commit e286433dd5
3 changed files with 10 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -24,3 +24,4 @@ clog
 /oiio-Release-1.4.12.tar.gz
 /oiio-Release-1.4.14.tar.gz
 /oiio-Release-1.4.15.tar.gz
+/oiio-Release-1.4.16.tar.gz
--- a/OpenImageIO.spec
+++ b/OpenImageIO.spec
@ -1,7 +1,8 @@
 %global subname oiio
+#global beta beta1

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

@ -159,6 +160,12 @@ cp -a src/doc/*.1 %{buildroot}%{_mandir}/man1


 %changelog
+* Thu Jan 22 2015 Richard Shaw <hobbes1069@gmail.com> - 1.4.16-1
+- Update to latest upstream release.
+
+* Wed Nov 26 2014 Rex Dieter <rdieter@fedoraproject.org> 1.4.15-2
+- rebuild (openexr)
+
 * Tue Nov 25 2014 Richard Shaw <hobbes1069@gmail.com> - 1.4.15-1
 - Update to latest upstream release.

--- a/2
+++ b/2
@ -1 +1 @@
-8911cf6103e9fe3638912908bb4faa19  oiio-Release-1.4.15.tar.gz
+513be3fdc0b6771e9356421463d4019f  oiio-Release-1.4.16.tar.gz