rpms
/
OpenImageIO
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix merge conflict.

This commit is contained in:
Richard M. Shaw 2012-09-22 10:12:14 -05:00
parent 3b1d494009 7a11365c63
commit 1afca057bb
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -11,3 +11,4 @@ clog
/OpenImageIO-oiio-Release-1.0.6-0-g47d4346.tar.gz
/OpenImageIO-oiio-Release-1.0.7-0-g0cae52b.tar.gz
/OpenImageIO-oiio-Release-1.0.8-0-g187bb9b.tar.gz
/OpenImageIO-oiio-Release-1.0.9-0-g0b78dec.tar.gz

13
OpenImageIO.spec
View File

@ -1,9 +1,9 @@
%global githash1 g187bb9b
%global githash2 d075f3d
%global githash1 g0b78dec
%global githash2 0d48631
%global githash3 9bf4356
Name: OpenImageIO
Version: 1.0.8
Version: 1.0.9
Release: 1%{?dist}
Summary: Library for reading and writing images
@ -140,8 +140,11 @@ cp -a doc/*.1 %{buildroot}%{_mandir}/man1
%changelog
* Fri Aug 10 2012 Richard Shaw <hobbes1069@gmail.com> - 1.0.8-2
- Rebuild for updated boost 1.50.
* Sat Sep 22 2012 Richard Shaw <hobbes1069@gmail.com> - 1.0.9-1
- Update to latest upstream release.
* Wed Aug 8 2012 David Malcolm <dmalcolm@redhat.com> - 1.0.8-2
- rebuild against boost-1.50
* Wed Aug 01 2012 Richard Shaw <hobbes1069@gmail.com> - 1.0.8-1
- Update to latest upstream release.

2
sources
View File

@ -1 +1 @@
7d8ee962f29cea749d02ab992e2874df OpenImageIO-oiio-Release-1.0.8-0-g187bb9b.tar.gz
4b98a057515cc95fc954743c987f19ba OpenImageIO-oiio-Release-1.0.9-0-g0b78dec.tar.gz