Attachment 701657 Details for Bug 914940 – Build with system zlib instead of bundled copy, enable bzip2 support

[patch] Build with system zlib instead of bundled copy, enable bzip2 support

0001-Build-with-system-zlib-enable-bzip2-support.patch (text/plain), 3.77 KB, created by Ville Skyttä on 2013-02-23 16:22:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ville Skyttä

Created: 2013-02-23 16:22:09 UTC

Size: 3.77 KB

patch

obsolete

>From dc9d2acb3c58a35f03504b54ccc8990b14ba0a3c Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
>Date: Sat, 23 Feb 2013 18:20:15 +0200
>Subject: [PATCH] Build with system zlib, enable bzip2 support.
>
>- Fix bogus dates in %changelog.
>---
> freetype.spec | 22 ++++++++++++++--------
> 1 file changed, 14 insertions(+), 8 deletions(-)
>
>diff --git a/freetype.spec b/freetype.spec
>index 1437d8f..50720c1 100644
>--- a/freetype.spec
>+++ b/freetype.spec
>@@ -7,7 +7,7 @@
> Summary: A free and portable font rendering engine
> Name: freetype
> Version: 2.4.11
>-Release: 2%{?dist}
>+Release: 3%{?dist}
> License: (FTL or GPLv2+) and BSD and MIT and Public Domain and zlib with acknowledgement
> Group: System Environment/Libraries
> URL: http://www.freetype.org
>@@ -28,6 +28,8 @@ Patch88:  freetype-multilib.patch
> Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
> 
> BuildRequires: libX11-devel
>+BuildRequires: bzip2-devel
>+BuildRequires: zlib-devel
> 
> Provides: %{name}-bytecode
> %if %{?_with_subpixel_rendering:1}%{!?_with_subpixel_rendering:0}
>@@ -216,6 +218,10 @@ rm -rf $RPM_BUILD_ROOT
> %doc docs/tutorial
> 
> %changelog
>+* Sat Feb 23 2013 Ville SkyttÃ¤ <ville.skytta@iki.fi> - 2.4.11-3
>+- Build with system zlib, enable bzip2 support.
>+- Fix bogus dates in %%changelog.
>+
> * Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.11-2
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
> 
>@@ -305,7 +311,7 @@ rm -rf $RPM_BUILD_ROOT
> - Update to 2.4.2
> - Drop upstreamed patch, bytecode interpreter now on by default
> 
>-* Thu Feb 23 2010 Behdad Esfahbod <behdad@redhat.com> 2.3.12-1
>+* Tue Feb 23 2010 Behdad Esfahbod <behdad@redhat.com> 2.3.12-1
> - Update to 2.3.12
> - Drop mathlib patch
> 
>@@ -332,7 +338,7 @@ rm -rf $RPM_BUILD_ROOT
> * Thu May  7 2009 Matthias Clasen <mclasen@redhat.com> 2.3.9-4
> - Don't own /usr/lib/pkgconfig
> 
>-* Wed Mar 27 2009 Behdad Esfahbod <besfahbo@redhat.com> 2.3.9-3
>+* Fri Mar 27 2009 Behdad Esfahbod <besfahbo@redhat.com> 2.3.9-3
> - Disable subpixel hinting by default.  Was turned on unintentionally.
> 
> * Wed Mar 25 2009 Behdad Esfahbod <besfahbo@redhat.com> 2.3.9-2
>@@ -340,11 +346,11 @@ rm -rf $RPM_BUILD_ROOT
>   with those options.
> - Resolves: #155210
> 
>-* Thu Mar 13 2009 Behdad Esfahbod <besfahbo@redhat.com> 2.3.9-1
>+* Fri Mar 13 2009 Behdad Esfahbod <besfahbo@redhat.com> 2.3.9-1
> - Update to 2.3.9.
> - Resolves #489928
> 
>-* Thu Mar 09 2009 Behdad Esfahbod <besfahbo@redhat.com> 2.3.8-2.1
>+* Mon Mar 09 2009 Behdad Esfahbod <besfahbo@redhat.com> 2.3.8-2.1
> - Preserve timestamp of FTL.TXT when converting to UTF-8.
> 
> * Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.8-2
>@@ -364,7 +370,7 @@ rm -rf $RPM_BUILD_ROOT
> - Add freetype-autohinter-ligature.patch
> - Resolves: #368561
> 
>-* Tue Aug 14 2008 Behdad Esfahbod <besfahbo@redhat.com> 2.3.7-1
>+* Thu Aug 14 2008 Behdad Esfahbod <besfahbo@redhat.com> 2.3.7-1
> - Update to 2.3.7
> 
> * Tue Jun 10 2008 Behdad Esfahbod <besfahbo@redhat.com> 2.3.6-1
>@@ -398,7 +404,7 @@ rm -rf $RPM_BUILD_ROOT
> * Thu Apr 12 2007 Behdad Esfahbod <besfahbo@redhat.com> 2.3.4-2
> - Add alpha to 64-bit archs (#236166)
> 
>-* Tue Apr 05 2007 Behdad Esfahbod <besfahbo@redhat.com> 2.3.4-1
>+* Thu Apr 05 2007 Behdad Esfahbod <besfahbo@redhat.com> 2.3.4-1
> - Update to 2.3.4.
> 
> * Thu Apr 05 2007 Behdad Esfahbod <besfahbo@redhat.com> 2.3.3-2
>@@ -590,7 +596,7 @@ rm -rf $RPM_BUILD_ROOT
> - Add a patch to implement FT_LOAD_TARGET_LIGHT
> - Fix up freetype-1.4-libtool.patch 
> 
>-* Sat Dec 12 2002 Mike A. Harris <mharris@redhat.com> 2.1.3-2
>+* Thu Dec 12 2002 Mike A. Harris <mharris@redhat.com> 2.1.3-2
> - Update to freetype 2.1.3
> - Removed ttmkfdir sources and patches, as they have been moved from the
>   freetype packaging to XFree86 packaging, and now to the ttmkfdir package
>-- 
>1.7.11.7
>

Actions: View | Diff

Attachments on bug 914940: 701657