diff --git a/freetype2.changes b/freetype2.changes index 76fdd37..6c025a1 100644 --- a/freetype2.changes +++ b/freetype2.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Apr 10 07:34:20 UTC 2015 - fstrba@suse.com + +- Enable the bz2 compression in freetype2 +- Remove patch overflow.patch from freetype2.spec where it is not + applied. +- Run spec-cleaner on the spec file. + ------------------------------------------------------------------- Sat Jan 3 22:58:50 UTC 2015 - hrvoje.senjan@gmail.com diff --git a/freetype2.spec b/freetype2.spec index 5f8952b..c2571ef 100644 --- a/freetype2.spec +++ b/freetype2.spec @@ -1,7 +1,7 @@ # # spec file for package freetype2 # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,17 +16,9 @@ # -Name: freetype2 -BuildRequires: gawk -BuildRequires: libpng-devel -BuildRequires: pkg-config -BuildRequires: zlib-devel -# bug437293 -%ifarch ppc64 -Obsoletes: freetype2-64bit -%endif # %define doc_version 2.5.5 +Name: freetype2 Version: 2.5.5 Release: 0 Summary: A TrueType Font Library @@ -37,13 +29,20 @@ Source0: http://download.savannah.gnu.org/releases/freetype/freetype-%{ve Source1: http://download.savannah.gnu.org/releases/freetype/freetype-doc-%{doc_version}.tar.bz2 Source3: baselibs.conf Patch1: freetype2-bitmap-foundry.patch -Patch308961: bugzilla-308961-cmex-workaround.patch Patch200: freetype2-subpixel.patch -# PATCH-FIX-UPSTREAM overflow.patch -- I: Statement is overflowing a buffer -Patch201: overflow.patch # PATCH-FIX-OPENSUSE don-t-mark-libpng-as-required-library.patch -- it is private in .pc Patch202: don-t-mark-libpng-as-required-library.patch +Patch308961: bugzilla-308961-cmex-workaround.patch +BuildRequires: gawk +BuildRequires: libbz2-devel +BuildRequires: libpng-devel +BuildRequires: pkg-config +BuildRequires: zlib-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build +# bug437293 +%ifarch ppc64 +Obsoletes: freetype2-64bit +%endif %description This library features TrueType fonts for open source projects. This @@ -64,14 +63,14 @@ Summary: Development environment for the freetype2 TrueType font library Group: Development/Libraries/C and C++ Requires: libfreetype6 = %{version} Requires: zlib-devel -# bug437293 -%ifarch ppc64 -Obsoletes: freetype2-devel-64bit -%endif # there is no freetype-devel on suse: Provides: freetype-devel # Static library provides: Provides: libfreetype6-devel-static +# bug437293 +%ifarch ppc64 +Obsoletes: freetype2-devel-64bit +%endif %description devel This package contains all necessary include files, libraries and @@ -91,13 +90,12 @@ It also contains a small tutorial for using that library. %patch202 -p1 %build -export CFLAGS="%optflags -std=gnu99 -D_GNU_SOURCE $(getconf LFS_CFLAGS)" -%configure --without-bzip2 \ - --disable-static +export CFLAGS="%{optflags} -std=gnu99 -D_GNU_SOURCE $(getconf LFS_CFLAGS)" +%configure --disable-static make %{?_smp_mflags} %install -%makeinstall +make DESTDIR=%{buildroot} install %{?_smp_mflags} # remove documentation that does not belong in an rpm rm docs/INSTALL* diff --git a/ft2demos.changes b/ft2demos.changes index 01f8f26..143dc05 100644 --- a/ft2demos.changes +++ b/ft2demos.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Apr 10 07:34:20 UTC 2015 - fstrba@suse.com + +- Run spec-cleaner on the spec file. + ------------------------------------------------------------------- Sat Jan 3 22:58:50 UTC 2015 - hrvoje.senjan@gmail.com diff --git a/ft2demos.spec b/ft2demos.spec index 203a38f..bfa5397 100644 --- a/ft2demos.spec +++ b/ft2demos.spec @@ -1,7 +1,7 @@ # # spec file for package ft2demos # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,31 +16,31 @@ # +%define freetype_version 2.5.5 Name: ft2demos Version: 2.5.5 Release: 0 Summary: Freetype2 Utilities and Demo Programs License: GPL-2.0+ Group: Productivity/Publishing/Other -%define freetype_version 2.5.5 Url: http://www.freetype.org Source0: http://savannah.nongnu.org/download/freetype/freetype-%{freetype_version}.tar.bz2 Source1: http://savannah.nongnu.org/download/freetype/ft2demos-%{version}.tar.bz2 -Patch308961: bugzilla-308961-cmex-workaround.patch -Patch200: freetype2-subpixel.patch -# PATCH-FIX-UPSTREAM overflow.patch -- I: Statement is overflowing a buffer -Patch201: overflow.patch -# PATCH-FIX-OPENSUSE don-t-mark-libpng-as-required-library.patch -- it is private in .pc -Patch202: don-t-mark-libpng-as-required-library.patch -BuildRequires: libpng-devel -BuildRequires: xorg-x11-devel -Conflicts: dtc -Supplements: fonts-config Source1000: bnc628213_test.otf Source1004: bnc629447_sigsegv31.ttf Source1013: bnc633938_badbdf.0 Source1015: bug-641580_CVE-2010-3311.cff Source1016: bug-647375_tt2.ttf +Patch200: freetype2-subpixel.patch +# PATCH-FIX-UPSTREAM overflow.patch -- I: Statement is overflowing a buffer +Patch201: overflow.patch +# PATCH-FIX-OPENSUSE don-t-mark-libpng-as-required-library.patch -- it is private in .pc +Patch202: don-t-mark-libpng-as-required-library.patch +Patch308961: bugzilla-308961-cmex-workaround.patch +BuildRequires: libpng-devel +BuildRequires: xorg-x11-devel +Supplements: fonts-config +Conflicts: dtc BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -59,7 +59,7 @@ popd %patch202 -p1 %build -export CFLAGS="%optflags -std=gnu99 -D_GNU_SOURCE $(getconf LFS_CFLAGS)" +export CFLAGS="%{optflags} -std=gnu99 -D_GNU_SOURCE $(getconf LFS_CFLAGS)" %configure --without-bzip2 make %{?_smp_mflags} pushd .. @@ -75,11 +75,11 @@ pushd ../ft2demos-%{version}/bin/.libs popd %check -%{buildroot}%{_bindir}/ftbench -c 1 %{S:1000} -%{buildroot}%{_bindir}/ftbench -c 1 %{S:1004} |& grep -v "couldn't load font resource" && echo "should fail" -%{buildroot}%{_bindir}/ftbench -c 1 %{S:1013} |& grep -v "couldn't load font resource" && echo "should fail" -%{buildroot}%{_bindir}/ftbench -c 1 %{S:1015} |& grep -v "couldn't load font resource" && echo "should fail" -%{buildroot}%{_bindir}/ftbench -c 1 %{S:1016} +%{buildroot}%{_bindir}/ftbench -c 1 %{SOURCE1000} +%{buildroot}%{_bindir}/ftbench -c 1 %{SOURCE1004} |& grep -v "couldn't load font resource" && echo "should fail" +%{buildroot}%{_bindir}/ftbench -c 1 %{SOURCE1013} |& grep -v "couldn't load font resource" && echo "should fail" +%{buildroot}%{_bindir}/ftbench -c 1 %{SOURCE1015} |& grep -v "couldn't load font resource" && echo "should fail" +%{buildroot}%{_bindir}/ftbench -c 1 %{SOURCE1016} %files %defattr(-,root,root)