From e73238df6bbae1b4a0a0e065cf3e80fdf64a82ad64784b7520f20123ebe10ba4 Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Mon, 5 Apr 2010 18:52:50 +0000
Subject: [PATCH] - leave freetype2 behind and only go with shared library
 package

OBS-URL: https://build.opensuse.org/package/show/M17N/freetype2?expand=0&rev=19
---
 baselibs.conf     | 3 +++
 freetype2.changes | 5 +++++
 freetype2.spec    | 9 +++++----
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/baselibs.conf b/baselibs.conf
index b1ed7da..6a0ef62 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -1,4 +1,7 @@
 libfreetype6
+	obsoletes "freetype2-<targettype> <= <version>"
+	provides "freetype2-<targettype> = <version> 
 freetype2-devel
 	requires -libfreetype6-<targettype>
 	requires "zlib-devel-<targettype>"
+	
diff --git a/freetype2.changes b/freetype2.changes
index d4ba99a..6fa2463 100644
--- a/freetype2.changes
+++ b/freetype2.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Apr  5 18:52:29 UTC 2010 - coolo@novell.com
+
+- leave freetype2 behind and only go with shared library package
+
 -------------------------------------------------------------------
 Sun Apr  4 08:14:19 UTC 2010 - aj@suse.de
 
diff --git a/freetype2.spec b/freetype2.spec
index a6271a0..c13a0a2 100644
--- a/freetype2.spec
+++ b/freetype2.spec
@@ -58,6 +58,8 @@ version also contains an autohinter for producing improved output.
 License:        Freetype License (BSD-like). See http://freetype.sourceforge.net/FTL.TXT
 Summary:        A TrueType Font Library
 Group:          System/Libraries
+Obsoletes:      freetype2 <= 2.3.10
+Provides:       freetype2 = 2.3.10
 
 %description -n libfreetype6
 This library features TrueType fonts for open source projects. This
@@ -67,7 +69,7 @@ version also contains an autohinter for producing improved output.
 License:        GPLv2+ ; Freetype License (BSD-like). See http://freetype.sourceforge.net/FTL.TXT
 Summary:        Development environment for the freetype2 TrueType font library
 Group:          Development/Libraries/C and C++
-Requires:       %{name} = %{version}, zlib-devel
+Requires:       libfreetype6 = %{version}, zlib-devel
 # bug437293
 %ifarch ppc64
 Obsoletes:      freetype2-devel-64bit
@@ -133,6 +135,8 @@ make prefix=/usr libdir=%{_libdir} %{?jobs:-j %jobs}
 # these development documents should go into the freetype2-devel package:
 mv docs/reference freetype-%{version}/docs
 make prefix=$RPM_BUILD_ROOT/usr libdir=$RPM_BUILD_ROOT/%{_libdir} install
+# remove documentation that does not belong in an rpm
+rm docs/INSTALL*
 
 %clean
 
@@ -143,9 +147,6 @@ make prefix=$RPM_BUILD_ROOT/usr libdir=$RPM_BUILD_ROOT/%{_libdir} install
 %files -n libfreetype6
 %defattr(-,root,root)
 %{_libdir}/libfreetype.so.*
-
-%files
-%defattr(-,root,root)
 %doc ChangeLog README
 %doc docs/*