From ecb81035a5df4a2981225993336f0aab98e05d5b18431fc8d6f78138e0ae71c0 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 6 Apr 2010 05:29:44 +0000 Subject: [PATCH 1/3] - fix obsoletes/provides OBS-URL: https://build.opensuse.org/package/show/M17N/freetype2?expand=0&rev=21 --- baselibs.conf | 4 ++-- freetype2.changes | 5 +++++ freetype2.spec | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/baselibs.conf b/baselibs.conf index 6a0ef62..d8c4cd8 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,6 +1,6 @@ libfreetype6 - obsoletes "freetype2- <= " - provides "freetype2- = + obsoletes "freetype2- < " + provides "freetype2- = " freetype2-devel requires -libfreetype6- requires "zlib-devel-" diff --git a/freetype2.changes b/freetype2.changes index 6fa2463..a3e194f 100644 --- a/freetype2.changes +++ b/freetype2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Apr 6 05:23:04 UTC 2010 - coolo@novell.com + +- fix obsoletes/provides + ------------------------------------------------------------------- Mon Apr 5 18:52:29 UTC 2010 - coolo@novell.com diff --git a/freetype2.spec b/freetype2.spec index db0d7a7..8c984f9 100644 --- a/freetype2.spec +++ b/freetype2.spec @@ -58,7 +58,7 @@ 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 +Obsoletes: freetype2 < 2.3.10 Provides: freetype2 = 2.3.10 %description -n libfreetype6 From c68a99c5f8d0ccde870cc8bece1b1f24c0d570b6ce132529e78b7427f6bfa8ed Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Wed, 7 Apr 2010 11:16:10 +0000 Subject: [PATCH 2/3] Accepting request 36989 from M17N checked in (request 36989) OBS-URL: https://build.opensuse.org/request/show/36989 OBS-URL: https://build.opensuse.org/package/show/M17N/freetype2?expand=0&rev=22 --- baselibs.conf | 4 ++-- freetype2.changes | 5 ----- freetype2.spec | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/baselibs.conf b/baselibs.conf index d8c4cd8..6a0ef62 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,6 +1,6 @@ libfreetype6 - obsoletes "freetype2- < " - provides "freetype2- = " + obsoletes "freetype2- <= " + provides "freetype2- = freetype2-devel requires -libfreetype6- requires "zlib-devel-" diff --git a/freetype2.changes b/freetype2.changes index a3e194f..6fa2463 100644 --- a/freetype2.changes +++ b/freetype2.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Tue Apr 6 05:23:04 UTC 2010 - coolo@novell.com - -- fix obsoletes/provides - ------------------------------------------------------------------- Mon Apr 5 18:52:29 UTC 2010 - coolo@novell.com diff --git a/freetype2.spec b/freetype2.spec index 8c984f9..db0d7a7 100644 --- a/freetype2.spec +++ b/freetype2.spec @@ -58,7 +58,7 @@ 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 +Obsoletes: freetype2 <= 2.3.10 Provides: freetype2 = 2.3.10 %description -n libfreetype6 From 21d9d2e2f476aa4f10794f01819fc09a1b1b291a7b6900b3d4444ae946f44975 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Wed, 7 Apr 2010 11:16:11 +0000 Subject: [PATCH 3/3] Updating link to change in openSUSE:Factory/freetype2 revision 21.0 OBS-URL: https://build.opensuse.org/package/show/M17N/freetype2?expand=0&rev=7a778e70d41ce81c6ce78c5a0108cb49 --- baselibs.conf | 4 ++-- freetype2.changes | 5 +++++ freetype2.spec | 4 ++-- ft2demos.spec | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/baselibs.conf b/baselibs.conf index 6a0ef62..d8c4cd8 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,6 +1,6 @@ libfreetype6 - obsoletes "freetype2- <= " - provides "freetype2- = + obsoletes "freetype2- < " + provides "freetype2- = " freetype2-devel requires -libfreetype6- requires "zlib-devel-" diff --git a/freetype2.changes b/freetype2.changes index 6fa2463..a3e194f 100644 --- a/freetype2.changes +++ b/freetype2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Apr 6 05:23:04 UTC 2010 - coolo@novell.com + +- fix obsoletes/provides + ------------------------------------------------------------------- Mon Apr 5 18:52:29 UTC 2010 - coolo@novell.com diff --git a/freetype2.spec b/freetype2.spec index db0d7a7..c47dfc3 100644 --- a/freetype2.spec +++ b/freetype2.spec @@ -29,7 +29,7 @@ Obsoletes: freetype2-64bit %endif # Version: 2.3.12 -Release: 2 +Release: 3 Url: http://www.freetype.org Summary: A TrueType Font Library # CVS repository: @@ -58,7 +58,7 @@ 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 +Obsoletes: freetype2 < 2.3.10 Provides: freetype2 = 2.3.10 %description -n libfreetype6 diff --git a/ft2demos.spec b/ft2demos.spec index 2a0a726..ad3537b 100644 --- a/ft2demos.spec +++ b/ft2demos.spec @@ -25,7 +25,7 @@ Group: Productivity/Publishing/Other AutoReqProv: on Supplements: fonts-config Version: 2.3.12 -Release: 2 +Release: 3 %define freetype_version %{version} Url: http://www.freetype.org Summary: Freetype2 Utilities and Demo Programs