Merge branch 'f18' of ssh://pkgs.fedoraproject.org/OpenImageIO into f18

Conflicts:
	OpenImageIO.spec
This commit is contained in:
Richard M. Shaw 2013-08-28 14:16:37 -05:00
commit 7d08fd88b9
1 changed files with 9 additions and 0 deletions

View File

@ -1,6 +1,11 @@
Name: OpenImageIO
<<<<<<< HEAD
Version: 1.0.12
Release: 1%{?dist}
=======
Version: 1.0.11
Release: 2%{?dist}
>>>>>>> 9a30ce92df4cfbcc8aa2a22d54e197e49f13b31e
Summary: Library for reading and writing images
Group: Development/Libraries
@ -159,9 +164,13 @@ cp -a doc/*.1 %{buildroot}%{_mandir}/man1
%changelog
<<<<<<< HEAD
* Wed Aug 28 2013 Richard Shaw <hobbes1069@gmail.com> - 1.0.12-1
- Update to latest upstream patch release.
* Wed Jan 23 2013 Rex Dieter <rdieter@fedoraproject.org> 1.0.11-2
- rebuild (libwebp)
* Thu Jan 17 2013 Richard Shaw <hobbes1069@gmail.com> - 1.0.11-1
- Update to latest upstream patch release.