rpms/freetype/F-12 freetype.spec, 1.76, 1.77 freetype-2.2.1-memcpy-fix.patch, 1.1, NONE freetype-2.3.9-aliasing.patch, 1.1, NONE
Behdad Esfahbod
behdad at fedoraproject.org
Thu Dec 3 22:31:24 UTC 2009
Author: behdad
Update of /cvs/pkgs/rpms/freetype/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13786
Modified Files:
freetype.spec
Removed Files:
freetype-2.2.1-memcpy-fix.patch freetype-2.3.9-aliasing.patch
Log Message:
Second try
Index: freetype.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freetype/F-12/freetype.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- freetype.spec 3 Dec 2009 22:21:59 -0000 1.76
+++ freetype.spec 3 Dec 2009 22:31:24 -0000 1.77
@@ -9,7 +9,7 @@
Summary: A free and portable font rendering engine
Name: freetype
Version: 2.3.11
-Release: 1%{?dist}
+Release: 2%{?dist}
License: FTL or GPLv2+
Group: System Environment/Libraries
URL: http://www.freetype.org
@@ -28,12 +28,6 @@ Patch46: freetype-2.2.1-enable-valid.pa
# Fix multilib conflicts
Patch88: freetype-multilib.patch
-# Fix crash https://bugs.freedesktop.org/show_bug.cgi?id=6841
-Patch89: freetype-2.2.1-memcpy-fix.patch
-
-# Fix aliasing issue
-Patch90: freetype-2.3.9-aliasing.patch
-
Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
BuildRequires: libX11-devel
@@ -99,8 +93,6 @@ popd
%patch46 -p1 -b .enable-valid
%patch88 -p1 -b .multilib
-%patch89 -p1 -b .memcpy
-%patch90 -p1 -b .aliasing
%build
@@ -230,6 +222,9 @@ rm -rf $RPM_BUILD_ROOT
%doc docs/tutorial
%changelog
+* Thu Dec 3 2009 Behdad Esfahbod <behdad at redhat.com> 2.3.11-2
+- Second try. Drop upstreamed patches.
+
* Thu Dec 3 2009 Behdad Esfahbod <behdad at redhat.com> 2.3.11-1
- 2.3.11
--- freetype-2.2.1-memcpy-fix.patch DELETED ---
--- freetype-2.3.9-aliasing.patch DELETED ---
More information about the fedora-extras-commits
mailing list