Compare commits

...

5 Commits
master ... f18

Author SHA1 Message Date
Richard M. Shaw 15e17eb566 Fix merge conflicts. 2013-08-28 14:17:16 -05:00
Richard M. Shaw 7d08fd88b9 Merge branch 'f18' of ssh://pkgs.fedoraproject.org/OpenImageIO into f18
Conflicts:
	OpenImageIO.spec
2013-08-28 14:16:37 -05:00
Richard M. Shaw 1d5ff867b5 Update to latest upstream patch release. 2013-08-28 14:15:44 -05:00
Rex Dieter 9a30ce92df rebuild (libwebp) 2013-01-23 14:11:52 -06:00
Richard M. Shaw e6ffb53bd3 Update to latest upstream patch release. 2013-01-17 09:59:31 -06:00
3 changed files with 43 additions and 13 deletions

2
.gitignore vendored
View File

@ -12,3 +12,5 @@ clog
/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
/oiio-Release-1.0.11.tar.gz
/oiio-Release-1.0.12.tar.gz

View File

@ -1,9 +1,5 @@
%global githash1 g0b78dec
%global githash2 0d48631
%global githash3 9bf4356
Name: OpenImageIO
Version: 1.0.9
Version: 1.0.12
Release: 1%{?dist}
Summary: Library for reading and writing images
@ -11,7 +7,7 @@ Group: Development/Libraries
License: BSD
URL: https://sites.google.com/site/openimageio/home
Source0: https://download.github.com/%{name}-oiio-Release-%{version}-0-%{githash1}.tar.gz
Source0: https://github.com/%{name}/oiio/archive/oiio-Release-%{version}.tar.gz
# Images for test suite
#Source1: %{name}-oiio-images-%{githash3}.tar.gz
Source101: FindTBB.cmake
@ -39,7 +35,6 @@ BuildRequires: OpenColorIO-devel
%filter_setup
}
%description
OpenImageIO is a library for reading and writing images, and a bunch of related
classes, utilities, and applications. Main features include:
@ -50,8 +45,24 @@ classes, utilities, and applications. Main features include:
PNM/PPM/PGM/PBM, Field3d.
- An ImageCache class that transparently manages a cache so that it can access
truly vast amounts of image data.
- A really nice image viewer, iv, also based on OpenImageIO classes (and so
will work with any formats for which plugins are available).
%package utils
Summary: Command line utilies for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
%description utils
Command-line tools to minipulate and get information on images using the
%{name} library.
%package iv
Summary: %{name} based image viewer
Requires: %{name}%{?_isa} = %{version}-%{release}
%description iv
A really nice image viewer, iv, based on %{name} classes (and so will work with
any formats for which plugins are available).
%package devel
@ -64,7 +75,7 @@ Development files for package %{name}
%prep
%setup -q -n %{name}-oiio-%{githash2}
%setup -q -n oiio-Release-%{version}
%patch0 -p1 -b .exttbb
%patch1 -p1 -b .tbbinc
%patch2 -p1 -b .ppc
@ -128,10 +139,18 @@ cp -a doc/*.1 %{buildroot}%{_mandir}/man1
%files
%doc CHANGES LICENSE
%{_bindir}/*
%{_libdir}/libOpenImageIO.so.*
%{python_sitearch}/OpenImageIO.so
%{_mandir}/man1/*
%files utils
%exclude %{_bindir}/iv
%{_bindir}/*
%exclude %{_mandir}/man1/iv.1.gz
%{_mandir}/man1/*.1.gz
%files iv
%{_bindir}/iv
%{_mandir}/man1/iv.1.gz
%files devel
%doc src/doc/*.pdf
@ -140,6 +159,15 @@ cp -a doc/*.1 %{buildroot}%{_mandir}/man1
%changelog
* 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.
* Sat Sep 22 2012 Richard Shaw <hobbes1069@gmail.com> - 1.0.9-1
- Update to latest upstream release.

View File

@ -1 +1 @@
4b98a057515cc95fc954743c987f19ba OpenImageIO-oiio-Release-1.0.9-0-g0b78dec.tar.gz
9b73da2372bffadc4261369f6ee07587 oiio-Release-1.0.12.tar.gz