[packages/freetype] - up to 2.6.1; include/freetype2/freetype dir back upstream
arekm
arekm at pld-linux.org
Tue Oct 6 20:43:38 CEST 2015
commit 65ae2728dc7e92152b6d2425b26aeb33190d9d3d
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Tue Oct 6 20:43:33 2015 +0200
- up to 2.6.1; include/freetype2/freetype dir back upstream
freetype.spec | 10 ++++------
ft2demos-includes.patch | 4 ++--
2 files changed, 6 insertions(+), 8 deletions(-)
---
diff --git a/freetype.spec b/freetype.spec
index 779f0c8..822e823 100644
--- a/freetype.spec
+++ b/freetype.spec
@@ -13,17 +13,17 @@ Summary(pt_BR.UTF-8): Biblioteca de renderização de fontes TrueType
Summary(ru.UTF-8): Растеризатор шрифтов TrueType
Summary(uk.UTF-8): Растеризатор шрифтів TrueType
Name: freetype
-Version: 2.6
+Version: 2.6.1
Release: 1
Epoch: 1
License: GPL v2 or FTL
Group: Libraries
Source0: http://download.savannah.gnu.org/releases/freetype/%{name}-%{version}.tar.bz2
-# Source0-md5: 5682890cb0267f6671dd3de6eabd3e69
+# Source0-md5: 35cb8f4d9e5906847901bb39324c2f80
Source1: http://download.savannah.gnu.org/releases/freetype/%{name}-doc-%{version}.tar.bz2
-# Source1-md5: f456b7ead3c351c7c218bb3afd45803c
+# Source1-md5: 9a6f668a2bef1ac3f65c619af22a17bc
Source2: http://download.savannah.gnu.org/releases/freetype/ft2demos-%{version}.tar.bz2
-# Source2-md5: c6c209b37f10621d6ff100620b8292b4
+# Source2-md5: 19f001c9d782aefe4c036b4c8dc11a95
Patch0: %{name}-2.2.1-enable-valid.patch
Patch1: ft2demos-includes.patch
URL: http://www.freetype.org/
@@ -234,8 +234,6 @@ install -d $RPM_BUILD_ROOT%{_bindir}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-ln -s . $RPM_BUILD_ROOT%{_includedir}/freetype2/freetype
-
%if %{with x11}
install -p ft2demos-*/bin/.libs/ft* $RPM_BUILD_ROOT%{_bindir}
%endif
diff --git a/ft2demos-includes.patch b/ft2demos-includes.patch
index b2603d8..cb078d7 100644
--- a/ft2demos-includes.patch
+++ b/ft2demos-includes.patch
@@ -1,5 +1,5 @@
---- freetype-2.6/ft2demos-2.6/Makefile.orig 2015-06-07 09:34:19.000000000 +0200
-+++ freetype-2.6/ft2demos-2.6/Makefile 2015-06-14 08:06:29.912090987 +0200
+--- freetype-2.6.1/ft2demos-2.6.1/Makefile.orig 2015-06-07 09:34:19.000000000 +0200
++++ freetype-2.6.1/ft2demos-2.6.1/Makefile 2015-06-14 08:06:29.912090987 +0200
@@ -127,9 +127,9 @@
$(TOP_DIR)/include \
$(SRC_DIR)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/freetype.git/commitdiff/65ae2728dc7e92152b6d2425b26aeb33190d9d3d
More information about the pld-cvs-commit
mailing list