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 f91c20e..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: 1
-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..7688918 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -1 +1,3 @@
-libthai
+libthai0
+ provides "libthai- = "
+ obsoletes "libthai- <= "
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..56ea050 100644
--- a/libthai.changes
+++ b/libthai.changes
@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+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).
+- spec file cleanups.
+
-------------------------------------------------------------------
Fri Apr 29 22:58:05 UTC 2011 - dimstar@opensuse.org
diff --git a/libthai.spec b/libthai.spec
index 8b56fb1..469f57e 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 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
Url: http://linux.thai.net/plone/TLWG/libthai/
Group: System/Libraries
@@ -37,12 +38,44 @@ 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)
+%package -n libthai0
+License: LGPL-2.1+
+Summary: Thai Language Support Routines
Group: System/Libraries
-Requires: %{name} = %{version}
-Requires: libdatrie-devel
+# SLPP applied since version 0.1.15.
+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
+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
+License: LGPL-2.1+
+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: LGPL-2.1+
+Summary: Thai Language Support Routines (development files)
+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 +92,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