From 053ba97fab9f718f73a146ec8c7f01f2eae29ca70080afd8ba6ff07dcbf72151 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Thu, 7 Jul 2011 12:12:45 +0000 Subject: [PATCH] Accepting request 75650 from home:vuntz:branches:GNOME:Factory tweak OBS-URL: https://build.opensuse.org/request/show/75650 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libthai?expand=0&rev=17 --- baselibs.conf | 2 ++ libthai.changes | 22 ++++++++++++++-------- libthai.spec | 11 ++++++++--- 3 files changed, 24 insertions(+), 11 deletions(-) diff --git a/baselibs.conf b/baselibs.conf index f965f6f..7688918 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1 +1,3 @@ libthai0 + provides "libthai- = " + obsoletes "libthai- <= " diff --git a/libthai.changes b/libthai.changes index b0775aa..56ea050 100644 --- a/libthai.changes +++ b/libthai.changes @@ -1,17 +1,23 @@ ------------------------------------------------------------------- Mon Jun 27 12:39:05 CEST 2011 - dimstar@opensuse.org +- Apply SLPP (bnc#647012): + + Split out libthai0 subpackage + + Move thbrk.tri in new libthai-data subpackage + + Add libthai-data Requires to libthai0. This Requires use >= + %{version}, instead of =, since the data is not + parallel-installable with other versions. We can just hope the + data format will stay compatible (and the higher version will + be more complete). +- Change License tag to LGPL-2.1+, as per spdx.org. +- Do not require libdatrie-devel from the -devel package: it will + be added automatically the pkgconfig()-way. +- Adjust baselibs.conf to follow the SLPP name change. +- Change Group of the -devel package to be Development/Languages/C + and C++ instead of System/Libraries. - Stop using source services. Factory is moving away from it and a different approach to verify the authenticity of the tarballs is being implemented (by using the Source URL). -- Apply SLPP (bnc#647012): - + Split out libthai0, package Requires libthai-data >= %{version} - + Move thbrk.tri to libthai-data -- Change License tag to LGPL-2.1+, as per spdx.org. -- Do not require libdatrie-devel from the -devel package: It is - added automatically the pkgconfig()-way. -- Adjust baselibs.conf to follow the slpp name change. -- Change RPM Group of the -devel package to be in Development. - spec file cleanups. ------------------------------------------------------------------- diff --git a/libthai.spec b/libthai.spec index e7baef5..469f57e 100644 --- a/libthai.spec +++ b/libthai.spec @@ -19,7 +19,7 @@ Name: libthai Version: 0.1.15 -# FIXME: At next version update, replace Obsoltes <= with < only to fix RPMLint warning in libthai0. +# FIXME: At next version update, replace Obsoletes <= with < only to fix RPMLint warning in libthai0 (here and in baselibs.conf) Release: 1 License: LGPL-2.1+ Summary: Thai Language Support Routines @@ -39,11 +39,15 @@ word breaking, input and output methods, and basic character and string support. %package -n libthai0 +License: LGPL-2.1+ Summary: Thai Language Support Routines Group: System/Libraries # SLPP applied since version 0.1.15. -Obsoletes: libthai <= %{version} Provides: libthai = %{version} +Obsoletes: libthai <= %{version} +# libthai needs the data to run, but the data is not parallel-installable, +# hence the >= instead of =. We just hope the data format will stay the same in +# the future. Requires: libthai-data >= %{version} %description -n libthai0 @@ -54,6 +58,7 @@ word breaking, input and output methods, and basic character and string support. %package data +License: LGPL-2.1+ Summary: Thai Language Support Routines - Data files Group: System/Libraries @@ -67,7 +72,7 @@ support. This package contains the data files for libthai. %package devel -License: LGPLv2.1+ +License: LGPL-2.1+ Summary: Thai Language Support Routines (development files) Group: Development/Languages/C and C++ Requires: libthai0 = %{version}