Browse code
Fixed %check with a patch for fontconfig
Change-Id: I125827db63cd6054e84231b84ad79b875c5c0bc1
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/3403
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Rongrong Qiu <rqiu@vmware.com>
changpil authored on 2017/08/04 04:02:13Showing 2 changed files
| 1 | 1 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,17 @@ |
| 0 |
+--- a/test/out.expected 2012-02-20 03:49:18.000000000 +0000 |
|
| 1 |
+@@ -1,8 +1,8 @@ |
|
| 2 |
+-Fixed:pixelsize=16 |
|
| 3 |
+-Fixed:pixelsize=6 |
|
| 4 |
++Misc Fixed:pixelsize=6 |
|
| 5 |
++Sony Fixed:pixelsize=16 |
|
| 6 |
+ = |
|
| 7 |
+-Fixed:pixelsize=16 |
|
| 8 |
+-Fixed:pixelsize=6 |
|
| 9 |
++Misc Fixed:pixelsize=6 |
|
| 10 |
++Sony Fixed:pixelsize=16 |
|
| 11 |
+ = |
|
| 12 |
+-Fixed:pixelsize=16 |
|
| 13 |
+-Fixed:pixelsize=6 |
|
| 14 |
++Misc Fixed:pixelsize=6 |
|
| 15 |
++Sony Fixed:pixelsize=16 |
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: library for configuring and customizing font access. |
| 2 | 2 |
Name: fontconfig |
| 3 | 3 |
Version: 2.12.1 |
| 4 |
-Release: 2%{?dist}
|
|
| 4 |
+Release: 3%{?dist}
|
|
| 5 | 5 |
License: BSD/GPL |
| 6 | 6 |
URL: https://www.freedesktop.org/wiki/Software/fontconfig/ |
| 7 | 7 |
Group: System Environment/Libraries |
| ... | ... |
@@ -10,6 +10,7 @@ Distribution: Photon |
| 10 | 10 |
Source0: https://www.freedesktop.org/software/fontconfig/release/%{name}-%{version}.tar.gz
|
| 11 | 11 |
%define sha1 fontconfig=57a5323ebdb58b3f8062a735e0927b0f5b9a7729 |
| 12 | 12 |
Patch0: 0001-Avoid-conflicts-with-integer-width-macros-from-TS-18.patch |
| 13 |
+Patch1: fontconfig-runtest-expect.patch |
|
| 13 | 14 |
BuildRequires: freetype2-devel |
| 14 | 15 |
BuildRequires: libxml2 |
| 15 | 16 |
BuildRequires: expat-devel |
| ... | ... |
@@ -27,6 +28,7 @@ It contains the libraries and header files to create applications |
| 27 | 27 |
%prep |
| 28 | 28 |
%setup -q |
| 29 | 29 |
%patch0 -p1 |
| 30 |
+%patch1 -p1 |
|
| 30 | 31 |
|
| 31 | 32 |
%build |
| 32 | 33 |
./configure \ |
| ... | ... |
@@ -42,7 +44,7 @@ make DESTDIR=%{buildroot} install
|
| 42 | 42 |
find %{buildroot} -name '*.la' -delete
|
| 43 | 43 |
|
| 44 | 44 |
%check |
| 45 |
-make %{?_smp_mflags} -k check
|
|
| 45 |
+make -k check |
|
| 46 | 46 |
|
| 47 | 47 |
%post |
| 48 | 48 |
/sbin/ldconfig |
| ... | ... |
@@ -68,6 +70,8 @@ make %{?_smp_mflags} -k check
|
| 68 | 68 |
%{_mandir}/man3/*
|
| 69 | 69 |
|
| 70 | 70 |
%changelog |
| 71 |
+* Thu Aug 03 2017 Chang Lee <changlee@vmware.com> 2.12.1-3 |
|
| 72 |
+- Add a patch for run-test. This issue was introduced by freetype 2.7.1 |
|
| 71 | 73 |
* Fri Apr 14 2017 Alexey Makhalov <amakhalov@vmware.com> 2.12.1-2 |
| 72 | 74 |
- Requires expat-devel |
| 73 | 75 |
* Fri Nov 11 2016 Dheeraj Shetty <dheerajs@vmware.com> 2.12.1-1 |