detach a demos package
fix the patch name
This commit is contained in:
dongyuzhen
parent
9b9c31755a
commit
1beb5682ca
@ -1,3 +1,17 @@
|
||||
From 2e6bf149908d61c2b2121dad36f2caef260a2053 Mon Sep 17 00:00:00 2001
|
||||
From: Marek Kasik <mkasik@redhat.com>
|
||||
Date: May 28 2019 12:56:55 +0000
|
||||
Subject: Keep FT_Outline_New_Internal() and FT_Outline_Done_Internal()
|
||||
for ABI compatibility but make them just throw
|
||||
Unimplemented_Feature error.
|
||||
|
||||
Remove them once soname has been bumped!
|
||||
|
||||
Resolves: #1689117
|
||||
|
||||
Conflict:NA
|
||||
Reference:https://src.fedoraproject.org/rpms/freetype/c/2e6bf149908d61c2b2121dad36f2caef260a2053
|
||||
|
||||
--- freetype-2.10.0/include/freetype/ftoutln.h
|
||||
+++ freetype-2.10.0/include/freetype/ftoutln.h
|
||||
@@ -165,6 +165,15 @@ FT_BEGIN_HEADER
|
||||
@ -1,3 +1,11 @@
|
||||
From ac07a003d7f75321346188eb9618d418d2b2decb Mon Sep 17 00:00:00 2001
|
||||
From: Michael Kuhn <suraia@fedoraproject.org>
|
||||
Date: Oct 17 2019 19:06:50 +0000
|
||||
Subject: Revert FT_DebugHook_Func ABI/API changes
|
||||
|
||||
Conflict:NA
|
||||
Reference:https://src.fedoraproject.org/rpms/freetype/c/ac07a003d7f75321346188eb9618d418d2b2decb
|
||||
|
||||
diff --git a/include/freetype/ftmodapi.h b/include/freetype/ftmodapi.h
|
||||
index 8d039c4f3..88488bfe8 100644
|
||||
--- a/include/freetype/ftmodapi.h
|
||||
@ -1,3 +1,13 @@
|
||||
From cbf2c99f7813750cb82deb367a37e50dbb709395 Mon Sep 17 00:00:00 2001
|
||||
From: besfahbo <besfahbo@fedoraproject.org>
|
||||
Date: Jul 08 2006 01:07:01 +0000
|
||||
Subject: - Enable modules gxvalid and otvalid
|
||||
|
||||
Enable modules gxvalid and otvalid
|
||||
|
||||
Conflict:NA
|
||||
Reference:https://src.fedoraproject.org/rpms/freetype/c/cbf2c99f7813750cb82deb367a37e50dbb709395
|
||||
|
||||
--- freetype-2.2.1/modules.cfg.orig 2006-07-07 21:01:09.000000000 -0400
|
||||
+++ freetype-2.2.1/modules.cfg 2006-07-07 21:01:54.000000000 -0400
|
||||
@@ -110,7 +110,7 @@
|
||||
@ -1,3 +1,11 @@
|
||||
From c1c64f8cf9264592bca747c9463814a805150346 Mon Sep 17 00:00:00 2001
|
||||
From: besfahbo <besfahbo@fedoraproject.org>
|
||||
Date: Jan 18 2007 19:42:34 +0000
|
||||
Subject: - Add without_subpixel_rendering.
|
||||
|
||||
Conflict:NA
|
||||
Reference:https://src.fedoraproject.org/rpms/freetype/c/c1c64f8cf9264592bca747c9463814a805150346
|
||||
|
||||
--- freetype-2.3.0/include/freetype/config/ftoption.h.spf 2007-01-18 14:27:34.000000000 -0500
|
||||
+++ freetype-2.3.0/include/freetype/config/ftoption.h 2007-01-18 14:27:48.000000000 -0500
|
||||
@@ -92,7 +92,7 @@
|
||||
@ -1,3 +1,11 @@
|
||||
From 928ba6125d73435fddd73f9bf155e0f2a813bab7 Mon Sep 17 00:00:00 2001
|
||||
From: Marek Kasik <mkasik@redhat.com>
|
||||
Date: Aug 22 2016 13:08:48 +0000
|
||||
Subject: Don't show path of non-existing libtool file
|
||||
|
||||
Conflict:NA
|
||||
Reference:https://src.fedoraproject.org/rpms/freetype/c/928ba6125d73435fddd73f9bf155e0f2a813bab7
|
||||
|
||||
--- freetype-2.8/builds/unix/freetype-config.in.orig 2017-03-30 12:20:23.000000001 +0200
|
||||
+++ freetype-2.8/builds/unix/freetype-config.in 2017-05-16 13:25:39.223041128 +0200
|
||||
@@ -205,7 +205,7 @@ if test "$echo_libs" = "yes" ; then
|
||||
@ -1,3 +1,15 @@
|
||||
From 1007098e54f9449281f83516f0272afa5d20ec29 Mon Sep 17 00:00:00 2001
|
||||
From: Marek Kasik <mkasik@redhat.com>
|
||||
Date: Oct 09 2017 11:57:11 +0000
|
||||
Subject: Fix multilib conflict
|
||||
|
||||
Require pkgconf so we can make freetype-config multilib compatible again
|
||||
|
||||
Resolves: #1497443
|
||||
|
||||
Conflict:NA
|
||||
Reference:https://src.fedoraproject.org/rpms/freetype/c/1007098e54f9449281f83516f0272afa5d20ec29?branch=rawhide
|
||||
|
||||
--- freetype-2.9/builds/unix/freetype-config.in
|
||||
+++ freetype-2.9/builds/unix/freetype-config.in
|
||||
@@ -13,45 +13,25 @@ LC_ALL=C
|
||||
@ -4,7 +4,7 @@
|
||||
|
||||
Name: freetype
|
||||
Version: 2.11.0
|
||||
Release: 1
|
||||
Release: 2
|
||||
Summary: FreeType is a freely available software library to render fonts
|
||||
License: (FTL or GPLv2+) and BSD and MIT and Public Domain and zlib with acknowledgement
|
||||
URL: http://www.freetype.org
|
||||
@ -13,13 +13,13 @@ Source1: http://download.savannah.gnu.org/releases/freetype/freetype-doc-
|
||||
Source2: http://download.savannah.gnu.org/releases/freetype/ft2demos-%{version}.tar.xz
|
||||
Source3: ftconfig.h
|
||||
|
||||
Patch1: freetype-2.5.2-more-demos.patch
|
||||
Patch6000: freetype-2.3.0-enable-spr.patch
|
||||
Patch6001: freetype-2.2.1-enable-valid.patch
|
||||
Patch6002: freetype-2.6.5-libtool.patch
|
||||
Patch6003: freetype-2.8-multilib.patch
|
||||
Patch6004: freetype-2.10.0-internal-outline.patch
|
||||
Patch6005: freetype-2.10.1-debughook.patch
|
||||
Patch1: backport-freetype-2.5.2-more-demos.patch
|
||||
Patch6000: backport-freetype-2.3.0-enable-spr.patch
|
||||
Patch6001: backport-freetype-2.2.1-enable-valid.patch
|
||||
Patch6002: backport-freetype-2.6.5-libtool.patch
|
||||
Patch6003: backport-freetype-2.8-multilib.patch
|
||||
Patch6004: backport-freetype-2.10.0-internal-outline.patch
|
||||
Patch6005: backport-freetype-2.10.1-debughook.patch
|
||||
|
||||
BuildRequires: gcc libX11-devel libpng-devel zlib-devel bzip2-devel
|
||||
|
||||
@ -28,12 +28,17 @@ Provides: %{name}-bytecode
|
||||
Provides: %{name}-subpixel
|
||||
%endif
|
||||
|
||||
Obsoletes: freetype-freeworld < 2.9.1-2
|
||||
|
||||
%description
|
||||
FreeType is written in C, designed to be small,efficient, highly customizable, and portable while capable of producing high-quality
|
||||
output (glyph images) of most vector and bitmap font formats
|
||||
|
||||
%package demos
|
||||
Summary: A collection of freetype demos
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
||||
%description demos
|
||||
The FreeType engine is a free and portable font rendering engine,developed to provide advanced font support for a variety of platforms and environments.The demos package includes a set of useful small utilities showing various capabilities of the FreeType library.
|
||||
|
||||
%package devel
|
||||
Summary: FreeType development libraries and header files
|
||||
Requires: %{name} = %{version}-%{release} pkgconf
|
||||
@ -113,6 +118,8 @@ install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_includedir}/freetype2/freetype/co
|
||||
%{!?_licensedir:%global license %%doc}
|
||||
%license LICENSE.TXT docs/FTL.TXT docs/GPLv2.TXT
|
||||
%{_libdir}/libfreetype.so.*
|
||||
|
||||
%files demos
|
||||
%{_bindir}/ft*
|
||||
|
||||
%files devel
|
||||
@ -133,6 +140,10 @@ install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_includedir}/freetype2/freetype/co
|
||||
%{_mandir}/man1/*
|
||||
|
||||
%changelog
|
||||
* Thu Dec 09 2021 dongyuzhen <dongyuzhen@huawei.com> - 2.11.0-2
|
||||
- detach a demos package
|
||||
- fix the patch name
|
||||
|
||||
* Wed Dec 08 2021 dongyuzhen <dongyuzhen@huawei.com> - 2.11.0-1
|
||||
- update to 2.11.0
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user