Accepting request 181835 from home:namtrac:bugfix

- Update to version 2.5.0.1
  * The cache manager function `FTC_Manager_Reset'  didn't flush the
    cache.
  * Behdad Esfahbod  (on behalf  of Google) contributed  support for
    color embedded bitmaps (eg. color emoji).
  * The  old FreeType  CFF engine  is now  disabled by  default.
  * All code related to macro FT_CONFIG_OPTION_OLD_INTERNALS
    has been removed.
  * The  property API  (`FT_Property_Get' and  `FT_Property_Set') is
    now declared as stable.
  * Another round of TrueType subpixel hinting fixes.
  * 64bit compilation of the new CFF engine was buggy.
  * Some fixes to improve robustness in memory-tight situations.
- Add dependency on libpng-devel for color emoji support.
- Drop freetype-new-cff-engine.patch, upstream now.

- Update to version 2.5.0
  * ftview has been updated to  support color embedded bitmaps.
  * The 'ttdebug' program has been further improved.  In particular,
    it accepts a new command line  option `-H' to select the hinting
    engine.

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

freetype2.spec

@@ -18,6 +18,7 @@
 
 Name:           freetype2
 BuildRequires:  gawk
+BuildRequires:  libpng-devel
 BuildRequires:  pkg-config
 BuildRequires:  zlib-devel
 # bug437293
@@ -25,17 +26,17 @@ BuildRequires:  zlib-devel
 Obsoletes:      freetype2-64bit
 %endif
 #
-Version:        2.4.12
+%define doc_version 2.5.0
+Version:        2.5.0.1
 Release:        0
 Summary:        A TrueType Font Library
 License:        SUSE-Freetype or GPL-2.0+
 Group:          System/Libraries
 Url:            http://www.freetype.org
 Source0:        http://download.savannah.gnu.org/releases/freetype/freetype-%{version}.tar.bz2
-Source1:        http://download.savannah.gnu.org/releases/freetype/freetype-doc-%{version}.tar.bz2
+Source1:        http://download.savannah.gnu.org/releases/freetype/freetype-doc-%{doc_version}.tar.bz2
 Source3:        baselibs.conf
-Patch1:         freetype-new-cff-engine.patch
-Patch3:         freetype2-bitmap-foundry.patch
+Patch1:         freetype2-bitmap-foundry.patch
 Patch308961:    bugzilla-308961-cmex-workaround.patch
 Patch200:       freetype2-subpixel.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -47,8 +48,8 @@ version also contains an autohinter for producing improved output.
 %package -n libfreetype6
 Summary:        A TrueType Font Library
 Group:          System/Libraries
-Obsoletes:      freetype2 < 2.3.10
-Provides:       freetype2 = 2.3.10
+Obsoletes:      freetype2 < %{version}
+Provides:       freetype2 = %{version}
 
 %description -n libfreetype6
 This library features TrueType fonts for open source projects. This
@@ -79,7 +80,6 @@ It also contains a small tutorial for using that library.
 %define enable_subpixel_rendering 0
 %setup -q -n freetype-%{version} -a 1
 %patch1 -p1
-%patch3 -p1
 %patch308961 -p 1
 %if %{enable_subpixel_rendering}
 %patch200 -p1
@@ -94,9 +94,6 @@ make %{?_smp_mflags}
 %install
 %makeinstall
 
-# these development documents should go into the freetype2-devel package:
-mv docs/reference freetype-%{version}/docs
-
 # remove documentation that does not belong in an rpm
 rm docs/INSTALL*
 
@@ -108,11 +105,11 @@ rm docs/INSTALL*
 %defattr(-,root,root)
 %{_libdir}/libfreetype.so.*
 %doc ChangeLog README
-%doc docs/*
+%doc docs/{CHANGES,CUSTOMIZE,DEBUG,MAKEPP,PROBLEMS,TODO,*.txt}
 
 %files devel
 %defattr(-,root,root)
-%doc freetype-%{version}/docs/*
+%doc docs/reference/*
 %{_includedir}/*
 %if 0%{?suse_version} >= 1140
 %exclude %{_libdir}/libfreetype.*a