Accepting request 295284 from home:fstrba:branches:M17N

Enable bz2 compression in freetype (bsc#912062) + some cleanup of spec files

OBS-URL: https://build.opensuse.org/request/show/295284
OBS-URL: https://build.opensuse.org/package/show/M17N/freetype2?expand=0&rev=94

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*