- Update to cairo 0.9.2. Add Obsoletes: for libpixman <= 0.1.6.

- Drop cairo-0.6.0-font-options-to-scaled-font.patch.
This commit is contained in:
Kristian Høgsberg 2005-08-14 20:32:43 +00:00
parent 063b138474
commit 86d892f20f
3 changed files with 10 additions and 11 deletions

View File

@ -1,2 +1 @@
cairo-0.5.2.tar.gz cairo-0.9.2.tar.gz
cairo-0.6.0.tar.gz

View File

@ -1,22 +1,21 @@
%define freetype_version 2.1.3-3 %define freetype_version 2.1.3-3
%define fontconfig_version 2.0 %define fontconfig_version 2.0
%define libpixman_version 0.1.5
Summary: A vector graphics library Summary: A vector graphics library
Name: cairo Name: cairo
Version: 0.6.0 Version: 0.9.2
Release: 2 Release: 1
URL: http://cairographics.org URL: http://cairographics.org
Source0: %{name}-%{version}.tar.gz Source0: %{name}-%{version}.tar.gz
License: LGPL/MPL License: LGPL/MPL
Group: System Environment/Libraries Group: System Environment/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRoot: %{_tmppath}/%{name}-%{version}-root
Patch0: cairo-0.6.0-font-options-to-scaled-font.patch Obsoletes: libpixman <= 0.1.6
Obsoletes: libpixman-devel <= 0.1.6
Requires: /sbin/ldconfig Requires: /sbin/ldconfig
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: libpixman-devel >= %{libpixman_version}
BuildRequires: xorg-x11-devel BuildRequires: xorg-x11-devel
BuildRequires: libpng-devel BuildRequires: libpng-devel
BuildRequires: freetype-devel >= %{freetype_version} BuildRequires: freetype-devel >= %{freetype_version}
@ -35,7 +34,6 @@ Extension or OpenGL).
Summary: Cairo developmental libraries and header files Summary: Cairo developmental libraries and header files
Group: Development/Libraries Group: Development/Libraries
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Requires: libpixman-devel >= %{libpixman_version}
Requires: xorg-x11-devel Requires: xorg-x11-devel
Requires: libpng-devel Requires: libpng-devel
Requires: freetype-devel >= %{freetype_version} Requires: freetype-devel >= %{freetype_version}
@ -49,8 +47,6 @@ source vector graphics library.
%prep %prep
%setup -q %setup -q
%patch0 -p1 -b .font-options-to-scaled-font
%build %build
%configure --enable-warnings --disable-glitz --disable-quartz \ %configure --enable-warnings --disable-glitz --disable-quartz \
--disable-atsui --disable-xcb --disable-win32 \ --disable-atsui --disable-xcb --disable-win32 \
@ -84,6 +80,10 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/gtk-doc/* %{_datadir}/gtk-doc/*
%changelog %changelog
* Sun Aug 14 2005 Kristian Høgsberg <krh@redhat.com> 0.9.2-1
- Update to cairo 0.9.2. Add Obsoletes: for libpixman <= 0.1.6.
- Drop cairo-0.6.0-font-options-to-scaled-font.patch.
* Tue Aug 2 2005 Kristian Høgsberg <krh@redhat.com> - 0.6.0-2 * Tue Aug 2 2005 Kristian Høgsberg <krh@redhat.com> - 0.6.0-2
- Add cairo-0.6.0-font-options-to-scaled-font.patch to make sure font - Add cairo-0.6.0-font-options-to-scaled-font.patch to make sure font
cache eviction works correctly (#164664). cache eviction works correctly (#164664).

View File

@ -1 +1 @@
0a0c8bd3bfddf2b6b9ffa670ee706723 cairo-0.6.0.tar.gz 992095a5db597384a89b41e93737105d cairo-0.9.2.tar.gz