Update spec file

Change-Id: I2407b94cd8f9d09c8fc73c17381bb99882c486fa

1 files changed, 73 insertions, 30 deletions

diff --git a/packaging/freetype2.spec b/packaging/freetype2.spec
index 1c01dfd..7584474 100644
--- a/packaging/freetype2.spec
+++ b/packaging/freetype2.spec
@@ -1,19 +1,24 @@
 Name:           freetype2
-BuildRequires:  pkg-config
-BuildRequires:  zlib-devel
-Version:        2.4.9
-Release:        0
-Summary:        A TrueType Font Library
-License:        Freetype or GPL-2.0+
+Summary:        A free and portable font rendering engine
+Version:        2.5.5
+Release:        1
 Group:          Graphics/Font Management
+License:        Freetype or GPL-2.0+
 Url:            http://www.freetype.org
-Source0:        http://download.savannah.gnu.org/releases/freetype/freetype-%{version}.tar.bz2
-Source2:        baselibs.conf
-Source1001: 	freetype2.manifest
+Source0:        http://download.savannah.gnu.org/releases-noredirect/freetype/freetype-%{version}.tar.gz
+Source1001:     packaging/freetype2.manifest
+BuildRequires:  pkgconfig(libpng)
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+Provides:       %{name}-bytecode
 
 %description
-This library features TrueType fonts for open source projects. This
-version also contains an autohinter for producing improved output.
+The FreeType engine is a free and portable font rendering
+engine, developed to provide advanced font support for a variety of
+platforms and environments. FreeType is a library which can open and
+manages font files as well as efficiently load, hint and render
+individual glyphs. FreeType is not a font server or a complete
+text-rendering library.
 
 %package -n libfreetype
 Summary:        A TrueType Font Library
@@ -24,34 +29,70 @@ This library features TrueType fonts for open source projects. This
 version also contains an autohinter for producing improved output.
 
 %package devel
-Summary:        Development environment for the freetype2 TrueType font library
+Summary:        FreeType development libraries and header files
 Group:          Development/Libraries
 Requires:       libfreetype = %{version}
 Requires:       zlib-devel
+Requires:       pkgconfig
 Provides:       freetype-devel
 
 %description devel
-This package contains all necessary include files, libraries and
-documentation needed to develop applications that require the freetype2
-TrueType font library.
+The freetype-devel package includes the static libraries and header files
+for the FreeType font rendering engine.
+
+Install freetype-devel if you want to develop programs which will use
+FreeType.
+
 
-It also contains a small tutorial for using that library.
 
 %prep
-%define enable_subpixel_rendering 0
 %setup -q -n freetype-%{version} 
-cp %{SOURCE1001} .
 
 %build
-export CFLAGS="%optflags -std=gnu99 -D_GNU_SOURCE"
-%configure --without-bzip2 \
-           --disable-static
+cp %{SOURCE1001} .
+
+%configure --disable-static
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' builds/unix/libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' builds/unix/libtool
 make %{?_smp_mflags}
 
 %install
-%make_install
+rm -rf %{buildroot}
+
+%makeinstall gnulocaledir=$RPM_BUILD_ROOT%{_datadir}/locale
+mkdir -p %{buildroot}/usr/share/license
+cat docs/FTL.TXT > %{buildroot}/usr/share/license/%{name}
+
+
+# fix multilib issues
+%ifarch x86_64 s390x ia64 ppc64 alpha sparc64
+%define wordsize 64
+%else
+%define wordsize 32
+%endif
+
+mv $RPM_BUILD_ROOT%{_includedir}/freetype2/config/ftconfig.h \
+$RPM_BUILD_ROOT%{_includedir}/freetype2/config/ftconfig-%{wordsize}.h
+cat >$RPM_BUILD_ROOT%{_includedir}/freetype2/config/ftconfig.h <<EOF
+#ifndef __FTCONFIG_H__MULTILIB
+#define __FTCONFIG_H__MULTILIB
+
+#include <bits/wordsize.h>
+
+#if __WORDSIZE == 32
+# include "ftconfig-32.h"
+#elif __WORDSIZE == 64
+# include "ftconfig-64.h"
+#else
+# error "unexpected value for __WORDSIZE macro"
+#endif
+
+#endif
+EOF
+
+# Don't package static a or .la files
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la}
 
-rm docs/INSTALL*
 
 %post -n libfreetype -p /sbin/ldconfig
 
@@ -59,16 +100,18 @@ rm docs/INSTALL*
 
 %files -n libfreetype
 %manifest %{name}.manifest
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_libdir}/libfreetype.so.*
+/usr/share/license/%{name}
 
 %files devel
 %manifest %{name}.manifest
-%defattr(-,root,root)
-%{_includedir}/*
+%defattr(-,root,root,-)
+%dir %{_includedir}/freetype2
+%{_datadir}/aclocal/freetype2.m4
+%{_includedir}/freetype2/*
 %{_libdir}/libfreetype.so
-%{_libdir}/pkgconfig/freetype2.pc
-%{_bindir}/*
-%{_datadir}/aclocal
+%{_bindir}/freetype-config
+%{_libdir}/pkgconfig/*.pc
+%{_datadir}/man/man1/*
 
-%changelog