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

@@ -1,12 +0,0 @@
-<services>
-  <service name="download_url">
-    <param name="protocol">http</param>
-    <param name="host">linux.thai.net</param>
-    <param name="path">/pub/thailinux/software/libthai/libthai-0.1.15.tar.gz</param>
-  </service>
-  <service name="recompress">
-    <param name="file">_service:download_url:*.tar.gz</param>
-    <param name="compression">bz2</param>
-  </service>
-  <service name="set_version" />
-</services>

_service:set_version:libthai.spec

@@ -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

baselibs.conf

@@ -1 +1 @@
-libthai
+libthai0

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
 

libthai.spec

@@ -18,9 +18,10 @@
 
 
 Name:           libthai
-Version:        0.1.14
+Version:        0.1.15
-Release:        10
+# FIXME: At next version update, replace Obsoltes <= with < only to fix RPMLint warning in libthai0.
-License:        LGPLv2.1+
+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
+Group:          Development/Languages/C and C++
-Requires:       %{name} = %{version}
+Requires:       libthai0 = %{version}
-Requires:       libdatrie-devel
 
 %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
+%make_install
-rm %{buildroot}%{_libdir}/*.la
+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