From 597a340b759964ef7ff05d9d96b181ac1fe1e0a3f5ee6d78d7ab763f1e4919af Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 3 May 2011 06:59:58 +0000 Subject: [PATCH 1/3] Updating link to change in openSUSE:Factory/libthai revision 16.0 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libthai?expand=0&rev=b6cd0ef0c8a09ff1672b0d8fadde57be --- libthai.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libthai.spec b/libthai.spec index 2beecd1..8b56fb1 100644 --- a/libthai.spec +++ b/libthai.spec @@ -19,7 +19,7 @@ Name: libthai Version: 0.1.14 -Release: 9 +Release: 10 License: LGPLv2.1+ Summary: Thai Language Support Routines Url: http://linux.thai.net/plone/TLWG/libthai/ From d29ea0b2f752a04b20f181eca195cccd62837cdbcea81976d6a9ba09c29f1cc0 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Thu, 7 Jul 2011 12:06:53 +0000 Subject: [PATCH 2/3] Accepting request 74624 from home:dimstar:branches:GNOME:Factory Applied SLPP on libthai - fixes bnc#674012 OBS-URL: https://build.opensuse.org/request/show/74624 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libthai?expand=0&rev=16 --- _service | 12 --- _service:set_version:libthai.spec | 86 ------------------- baselibs.conf | 2 +- ...i-0.1.15.tar.bz2 => libthai-0.1.15.tar.bz2 | 0 libthai.changes | 16 ++++ libthai.spec | 59 ++++++++++--- 6 files changed, 62 insertions(+), 113 deletions(-) delete mode 100644 _service delete mode 100644 _service:set_version:libthai.spec rename _service:recompress:download_url:libthai-0.1.15.tar.bz2 => libthai-0.1.15.tar.bz2 (100%) diff --git a/_service b/_service deleted file mode 100644 index ac91598..0000000 --- a/_service +++ /dev/null @@ -1,12 +0,0 @@ - - - http - linux.thai.net - /pub/thailinux/software/libthai/libthai-0.1.15.tar.gz - - - _service:download_url:*.tar.gz - bz2 - - - diff --git a/_service:set_version:libthai.spec b/_service:set_version:libthai.spec deleted file mode 100644 index fbd0243..0000000 --- a/_service:set_version:libthai.spec +++ /dev/null @@ -1,86 +0,0 @@ -# -# spec file for package libthai -# -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# Please submit bugfixes or comments via http://bugs.opensuse.org/ -# - - - -Name: libthai -Version: 0.1.15 -Release: 0 -License: LGPLv2.1+ -Summary: Thai Language Support Routines -Url: http://linux.thai.net/plone/TLWG/libthai/ -Group: System/Libraries -Source: %{name}-%{version}.tar.bz2 -Source99: baselibs.conf -BuildRequires: libdatrie-devel -BuildRequires: pkg-config -BuildRoot: %{_tmppath}/%{name}-%{version}-build - -%description -LibThai is a set of Thai language support routines aimed to ease -developers' tasks to incorporate Thai language support in their -applications. It includes important Thai-specific functions, such as -word breaking, input and output methods, and basic character and string -support. - -%package devel -License: LGPLv2.1+ -Summary: Thai Language Support Routines (development files) -Group: System/Libraries -Requires: %{name} = %{version} -Requires: libdatrie-devel - -%description devel -LibThai is a set of Thai language support routines aimed to ease -developers' tasks to incorporate Thai language support in their -applications. It includes important Thai-specific functions, such as -word breaking, input and output methods, and basic character and string -support. - -This package contains headers and libraries required for developing -software using libthai. - -%prep -%setup -q - -%build -%configure --disable-static --with-pic -make %{?jobs:-j%jobs} - -%install -%makeinstall -rm %{buildroot}%{_libdir}/*.la - -%clean -rm -rf %{buildroot} - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - -%files -%defattr(-,root,root) -%{_libdir}/libthai.so.* -%{_datadir}/libthai - -%files devel -%defattr(-,root,root) -%{_includedir}/thai -%{_libdir}/libthai.so -%{_libdir}/pkgconfig/*.pc - -%changelog diff --git a/baselibs.conf b/baselibs.conf index cb5675f..f965f6f 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1 +1 @@ -libthai +libthai0 diff --git a/_service:recompress:download_url:libthai-0.1.15.tar.bz2 b/libthai-0.1.15.tar.bz2 similarity index 100% rename from _service:recompress:download_url:libthai-0.1.15.tar.bz2 rename to libthai-0.1.15.tar.bz2 diff --git a/libthai.changes b/libthai.changes index 6f709ce..b0775aa 100644 --- a/libthai.changes +++ b/libthai.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Mon Jun 27 12:39:05 CEST 2011 - dimstar@opensuse.org + +- 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. + ------------------------------------------------------------------- Fri Apr 29 22:58:05 UTC 2011 - dimstar@opensuse.org diff --git a/libthai.spec b/libthai.spec index 8b56fb1..e7baef5 100644 --- a/libthai.spec +++ b/libthai.spec @@ -18,9 +18,10 @@ Name: libthai -Version: 0.1.14 -Release: 10 -License: LGPLv2.1+ +Version: 0.1.15 +# FIXME: At next version update, replace Obsoltes <= with < only to fix RPMLint warning in libthai0. +Release: 1 +License: LGPL-2.1+ Summary: Thai Language Support Routines Url: http://linux.thai.net/plone/TLWG/libthai/ Group: System/Libraries @@ -37,12 +38,39 @@ applications. It includes important Thai-specific functions, such as word breaking, input and output methods, and basic character and string support. +%package -n libthai0 +Summary: Thai Language Support Routines +Group: System/Libraries +# SLPP applied since version 0.1.15. +Obsoletes: libthai <= %{version} +Provides: libthai = %{version} +Requires: libthai-data >= %{version} + +%description -n libthai0 +LibThai is a set of Thai language support routines aimed to ease +developers' tasks to incorporate Thai language support in their +applications. It includes important Thai-specific functions, such as +word breaking, input and output methods, and basic character and string +support. + +%package data +Summary: Thai Language Support Routines - Data files +Group: System/Libraries + +%description data +LibThai is a set of Thai language support routines aimed to ease +developers' tasks to incorporate Thai language support in their +applications. It includes important Thai-specific functions, such as +word breaking, input and output methods, and basic character and string +support. + +This package contains the data files for libthai. + %package devel License: LGPLv2.1+ Summary: Thai Language Support Routines (development files) -Group: System/Libraries -Requires: %{name} = %{version} -Requires: libdatrie-devel +Group: Development/Languages/C and C++ +Requires: libthai0 = %{version} %description devel LibThai is a set of Thai language support routines aimed to ease @@ -59,27 +87,30 @@ software using libthai. %build %configure --disable-static --with-pic -make %{?jobs:-j%jobs} +make %{?_smp_mflags} %install -%makeinstall -rm %{buildroot}%{_libdir}/*.la +%make_install +find %{buildroot}%{_libdir} -type f -name "*.la" -delete -print %clean rm -rf %{buildroot} -%post -p /sbin/ldconfig +%post -n libthai0 -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%postun -n libthai0 -p /sbin/ldconfig -%files +%files -n libthai0 %defattr(-,root,root) %{_libdir}/libthai.so.* -%{_datadir}/libthai + +%files data +%defattr(-, root, root) +%{_datadir}/libthai/ %files devel %defattr(-,root,root) -%{_includedir}/thai +%{_includedir}/thai/ %{_libdir}/libthai.so %{_libdir}/pkgconfig/*.pc From 053ba97fab9f718f73a146ec8c7f01f2eae29ca70080afd8ba6ff07dcbf72151 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Thu, 7 Jul 2011 12:12:45 +0000 Subject: [PATCH 3/3] 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}