From 915df58cc61de140504a4f0028d5eaaf85e2c1cf Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 21 May 2008 21:46:57 +0000 Subject: [PATCH 01/60] fix license tag --- libthai.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libthai.spec b/libthai.spec index e080005..197fcb3 100644 --- a/libthai.spec +++ b/libthai.spec @@ -4,8 +4,9 @@ Summary: Thai language support routines Name: libthai Version: 0.1.9 -Release: 4%{?dist} -License: LGPL +Release: 5%{?dist} +# No version is specified, so all versions are possible. +License: LGPLv2+ Group: System Environment/Libraries Source: ftp://linux.thai.net/pub/thailinux/software/libthai/libthai-%{version}.tar.gz Source1: ftp://linux.thai.net/pub/thailinux/software/libthai/libdatrie-%{datrie_version}.tar.gz @@ -112,6 +113,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/* %changelog +* Wed May 21 2008 Tom "spot" Callaway - 0.1.9-5 +- fix license tag + * Mon Mar 17 2008 Matthias Clasen - 0.1.9-4 - Attempt to fix multilib conflict From 979f8f84b319a70432a81721cd0dbe0956a665af Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 25 Feb 2009 19:20:00 +0000 Subject: [PATCH 02/60] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- libthai.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libthai.spec b/libthai.spec index 197fcb3..db34103 100644 --- a/libthai.spec +++ b/libthai.spec @@ -4,7 +4,7 @@ Summary: Thai language support routines Name: libthai Version: 0.1.9 -Release: 5%{?dist} +Release: 6%{?dist} # No version is specified, so all versions are possible. License: LGPLv2+ Group: System Environment/Libraries @@ -113,6 +113,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/* %changelog +* Wed Feb 25 2009 Fedora Release Engineering - 0.1.9-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Wed May 21 2008 Tom "spot" Callaway - 0.1.9-5 - fix license tag From c7d9decfb801bbf31eefa5b8cdfa4a22064a2d8f Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 28 Feb 2009 01:06:14 +0000 Subject: [PATCH 03/60] fix the build --- libthai.spec | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/libthai.spec b/libthai.spec index db34103..d25a820 100644 --- a/libthai.spec +++ b/libthai.spec @@ -4,7 +4,7 @@ Summary: Thai language support routines Name: libthai Version: 0.1.9 -Release: 6%{?dist} +Release: 7%{?dist} # No version is specified, so all versions are possible. License: LGPLv2+ Group: System Environment/Libraries @@ -20,6 +20,7 @@ BuildRequires: pkgconfig BuildRequires: doxygen # we edit the Makefile.am's BuildRequires: automake +BuildRequires: autoconf BuildRequires: libtool %description @@ -63,8 +64,7 @@ libthai. { pushd %{datrie} - aclocal - automake + autoreconf -i -f %configure make popd @@ -73,8 +73,9 @@ libthai. export DATRIE_CFLAGS="-I$PWD/%{datrie}" export DATRIE_LIBS="$PWD/%{datrie}/datrie/libdatrie.la" export PATH="$PWD/%{datrie}/tools:$PATH" -aclocal -automake + +autoreconf -i -f + %configure --disable-static make @@ -113,6 +114,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/* %changelog +* Fri Feb 27 2009 Matthias Clasen - 0.1.9-7 +- Fix the build + * Wed Feb 25 2009 Fedora Release Engineering - 0.1.9-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From 211a00bfb9a14fdedee55e4c18f1447e7a57425c Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 27 Jun 2009 22:24:09 +0000 Subject: [PATCH 04/60] 0.1.12 --- .cvsignore | 4 +- ...-0.1.12-libdatrie-0.2.2-static-build.patch | 44 +++++++++++++++++++ ...i-0.1.9-libdatrie-0.1.1-build-static.patch | 40 ----------------- libthai.spec | 12 +++-- sources | 4 +- 5 files changed, 56 insertions(+), 48 deletions(-) create mode 100644 libthai-0.1.12-libdatrie-0.2.2-static-build.patch delete mode 100644 libthai-0.1.9-libdatrie-0.1.1-build-static.patch diff --git a/.cvsignore b/.cvsignore index fe14612..c3ada73 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -libthai-0.1.9.tar.gz -libdatrie-0.1.1.tar.gz +libthai-0.1.12.tar.gz +libdatrie-0.2.2.tar.gz diff --git a/libthai-0.1.12-libdatrie-0.2.2-static-build.patch b/libthai-0.1.12-libdatrie-0.2.2-static-build.patch new file mode 100644 index 0000000..4c04fb2 --- /dev/null +++ b/libthai-0.1.12-libdatrie-0.2.2-static-build.patch @@ -0,0 +1,44 @@ +diff -up libthai-0.1.12/libdatrie-0.2.2/datrie/Makefile.am.static-build libthai-0.1.12/libdatrie-0.2.2/datrie/Makefile.am +--- libthai-0.1.12/libdatrie-0.2.2/datrie/Makefile.am.static-build 2009-04-13 05:18:20.000000000 -0400 ++++ libthai-0.1.12/libdatrie-0.2.2/datrie/Makefile.am 2009-06-27 17:58:06.813631702 -0400 +@@ -10,7 +10,7 @@ EXTRA_DIST = libdatrie.map libdatrie.def + + INCLUDES = -I$(top_srcdir) + +-lib_LTLIBRARIES = libdatrie.la ++noinst_LTLIBRARIES = libdatrie.la + + libdatrie_la_SOURCES = \ + typedefs.h \ +diff -up libthai-0.1.12/libthai.pc.in.static-build libthai-0.1.12/libthai.pc.in +--- libthai-0.1.12/libthai.pc.in.static-build 2009-03-31 00:25:23.000000000 -0400 ++++ libthai-0.1.12/libthai.pc.in 2009-06-27 17:58:06.814631492 -0400 +@@ -6,6 +6,5 @@ includedir=@includedir@ + Name: libthai + Description: Thai support library + Version: @VERSION@ +-Requires.private: datrie-0.2 + Libs: -L${libdir} -lthai + Cflags: -I${includedir} +diff -up libthai-0.1.12/src/Makefile.am.static-build libthai-0.1.12/src/Makefile.am +--- libthai-0.1.12/src/Makefile.am.static-build 2009-06-07 03:20:15.000000000 -0400 ++++ libthai-0.1.12/src/Makefile.am 2009-06-27 17:59:20.060630864 -0400 +@@ -19,7 +19,8 @@ libthai_sublibs = \ + $(top_builddir)/src/thwchar/libthwchar.la \ + $(top_builddir)/src/thwctype/libthwctype.la \ + $(top_builddir)/src/thwstr/libthwstr.la \ +- $(top_builddir)/src/thwbrk/libthwbrk.la ++ $(top_builddir)/src/thwbrk/libthwbrk.la \ ++ $(DATRIE_LIBS) + + if LD_HAS_VERSION_SCRIPT + EXPORTS_FLAGS = -Wl,-version-script -Wl,$(srcdir)/libthai.map +diff -up libthai-0.1.12/src/thbrk/Makefile.am.static-build libthai-0.1.12/src/thbrk/Makefile.am +--- libthai-0.1.12/src/thbrk/Makefile.am.static-build 2009-01-19 08:32:50.000000000 -0500 ++++ libthai-0.1.12/src/thbrk/Makefile.am 2009-06-27 17:58:06.812632123 -0400 +@@ -16,5 +16,4 @@ libthbrk_la_SOURCES = \ + brk-maximal.c \ + brk-maximal.h + +-libthbrk_la_LIBADD = $(DATRIE_LIBS) + diff --git a/libthai-0.1.9-libdatrie-0.1.1-build-static.patch b/libthai-0.1.9-libdatrie-0.1.1-build-static.patch deleted file mode 100644 index f2cd02b..0000000 --- a/libthai-0.1.9-libdatrie-0.1.1-build-static.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- libthai-0.1.7/src/Makefile.am.static-build 2006-05-04 06:14:27.000000000 -0400 -+++ libthai-0.1.7/src/Makefile.am 2007-01-18 00:22:06.000000000 -0500 -@@ -24,7 +24,8 @@ - $(top_builddir)/src/thwchar/libthwchar.la \ - $(top_builddir)/src/thwctype/libthwctype.la \ - $(top_builddir)/src/thwstr/libthwstr.la \ -- $(top_builddir)/src/thwbrk/libthwbrk.la -+ $(top_builddir)/src/thwbrk/libthwbrk.la \ -+ $(DATRIE_LIBS) - libthai_la_LDFLAGS = -no-undefined \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ - -export-symbols $(srcdir)/libthai.def ---- libthai-0.1.7/src/thbrk/Makefile.am.static-build 2006-10-14 02:38:56.000000000 -0400 -+++ libthai-0.1.7/src/thbrk/Makefile.am 2007-01-18 00:22:06.000000000 -0500 -@@ -13,5 +13,4 @@ - brk-maximal.c \ - brk-maximal.h - --libthbrk_la_LIBADD = $(DATRIE_LIBS) - ---- libthai-0.1.7/libdatrie-0.1.1/datrie/Makefile.am.static-build 2006-09-02 10:12:54.000000000 -0400 -+++ libthai-0.1.7/libdatrie-0.1.1/datrie/Makefile.am 2007-01-18 00:22:06.000000000 -0500 -@@ -8,7 +8,7 @@ - - INCLUDES = -I$(top_srcdir) - --lib_LTLIBRARIES = libdatrie.la -+noinst_LTLIBRARIES = libdatrie.la - - libdatrie_la_SOURCES = \ - typedefs.h \ ---- libthai-0.1.7/libthai.pc.in.static-build 2007-01-18 01:38:29.000000000 -0500 -+++ libthai-0.1.7/libthai.pc.in 2007-01-18 01:38:38.000000000 -0500 -@@ -6,6 +6,5 @@ - Name: libthai - Description: Thai support library - Version: @VERSION@ --Requires: datrie - Libs: -L${libdir} -lthai - Cflags: -I${includedir} diff --git a/libthai.spec b/libthai.spec index d25a820..5e4d1e0 100644 --- a/libthai.spec +++ b/libthai.spec @@ -1,16 +1,16 @@ -%define datrie_version 0.1.1 +%define datrie_version 0.2.2 %define datrie libdatrie-%{datrie_version} Summary: Thai language support routines Name: libthai -Version: 0.1.9 -Release: 7%{?dist} +Version: 0.1.12 +Release: 1%{?dist} # No version is specified, so all versions are possible. License: LGPLv2+ Group: System Environment/Libraries Source: ftp://linux.thai.net/pub/thailinux/software/libthai/libthai-%{version}.tar.gz Source1: ftp://linux.thai.net/pub/thailinux/software/libthai/libdatrie-%{datrie_version}.tar.gz -Patch: libthai-0.1.9-libdatrie-0.1.1-build-static.patch +Patch: libthai-0.1.12-libdatrie-0.2.2-static-build.patch Patch1: libthai-0.1.9-doxygen-segfault.patch Patch2: libthai-0.1.9-multilib.patch URL: http://linux.thai.net @@ -64,6 +64,7 @@ libthai. { pushd %{datrie} + mkdir m4 autoreconf -i -f %configure make @@ -114,6 +115,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/* %changelog +* Sat Jun 27 2009 Matthias Clasen - 0.1.12-1 +- Update to 0.1.12 + * Fri Feb 27 2009 Matthias Clasen - 0.1.9-7 - Fix the build diff --git a/sources b/sources index ec20289..e18dc8c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -6beadd556169aa58c9210c713d139229 libdatrie-0.1.1.tar.gz -7002d111b293f202d20b28aa2b4ed68f libthai-0.1.9.tar.gz +e206313d5a60ce98bc3be83d60373554 libthai-0.1.12.tar.gz +d1c93faf0c0d63e620c525c561940fdd libdatrie-0.2.2.tar.gz From 6b74cf794153beb198c792c97ffddb150504f20e Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sat, 25 Jul 2009 08:45:07 +0000 Subject: [PATCH 05/60] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- libthai.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libthai.spec b/libthai.spec index 5e4d1e0..da32c5d 100644 --- a/libthai.spec +++ b/libthai.spec @@ -4,7 +4,7 @@ Summary: Thai language support routines Name: libthai Version: 0.1.12 -Release: 1%{?dist} +Release: 2%{?dist} # No version is specified, so all versions are possible. License: LGPLv2+ Group: System Environment/Libraries @@ -115,6 +115,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/* %changelog +* Sat Jul 25 2009 Fedora Release Engineering - 0.1.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Sat Jun 27 2009 Matthias Clasen - 0.1.12-1 - Update to 0.1.12 From 69e262cfb4d9e8697bfa8844fa9d6beee845070d Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:51:20 +0000 Subject: [PATCH 06/60] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 96bf6b3..1f805a5 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: libthai -# $Id: Makefile,v 1.1 2007/01/18 00:48:49 besfahbo Exp $ +# $Id: Makefile,v 1.2 2007/10/15 19:04:33 notting Exp $ NAME := libthai SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From e0e4098be0504328cca651f3a12671e39a2086da Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Wed, 3 Mar 2010 22:45:44 +0000 Subject: [PATCH 07/60] - Update to 0.1.14 --- libthai.spec | 18 ++++++++++-------- sources | 4 ++-- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/libthai.spec b/libthai.spec index da32c5d..f28704e 100644 --- a/libthai.spec +++ b/libthai.spec @@ -1,11 +1,9 @@ -%define datrie_version 0.2.2 -%define datrie libdatrie-%{datrie_version} +%define datrie_version 0.2.3 Summary: Thai language support routines Name: libthai -Version: 0.1.12 +Version: 0.1.14 Release: 2%{?dist} -# No version is specified, so all versions are possible. License: LGPLv2+ Group: System Environment/Libraries Source: ftp://linux.thai.net/pub/thailinux/software/libthai/libthai-%{version}.tar.gz @@ -44,6 +42,7 @@ libthai. %prep %setup -q -n %{name}-%{version} -a 1 +mv libdatrie-%{datrie_version} libdatrie %patch -p1 -b .static-build %patch1 -p1 -b .doxygen-segfault %patch2 -p1 -b .multilib @@ -63,7 +62,7 @@ libthai. # the patch modifies a few Makefile.am's. { - pushd %{datrie} + pushd libdatrie mkdir m4 autoreconf -i -f %configure @@ -71,9 +70,9 @@ libthai. popd } -export DATRIE_CFLAGS="-I$PWD/%{datrie}" -export DATRIE_LIBS="$PWD/%{datrie}/datrie/libdatrie.la" -export PATH="$PWD/%{datrie}/tools:$PATH" +export DATRIE_CFLAGS="-I$PWD/libdatrie" +export DATRIE_LIBS="$PWD/libdatrie/datrie/libdatrie.la" +export PATH="$PWD/libdatrie/tools:$PATH" autoreconf -i -f @@ -115,6 +114,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/* %changelog +* Wed Mar 3 2010 Behdad Esfahbod - 0.1.14-2 +- Update to 0.1.14 + * Sat Jul 25 2009 Fedora Release Engineering - 0.1.12-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index e18dc8c..7a53184 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -e206313d5a60ce98bc3be83d60373554 libthai-0.1.12.tar.gz -d1c93faf0c0d63e620c525c561940fdd libdatrie-0.2.2.tar.gz +c6814f4fe68aa8d41d1b7183ad78d319 libdatrie-0.2.3.tar.gz +34f64b37ed8f8f49f4a18ae972e6f41e libthai-0.1.14.tar.gz From 8f1c468c5a1b7431fa7b918cbb5132b37b03158a Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Wed, 3 Mar 2010 23:00:11 +0000 Subject: [PATCH 08/60] - Update to 0.1.14 --- ...atic-build.patch => libthai-libdatrie-static-build.patch | 4 ++-- libthai.spec | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) rename libthai-0.1.12-libdatrie-0.2.2-static-build.patch => libthai-libdatrie-static-build.patch (89%) diff --git a/libthai-0.1.12-libdatrie-0.2.2-static-build.patch b/libthai-libdatrie-static-build.patch similarity index 89% rename from libthai-0.1.12-libdatrie-0.2.2-static-build.patch rename to libthai-libdatrie-static-build.patch index 4c04fb2..c372c40 100644 --- a/libthai-0.1.12-libdatrie-0.2.2-static-build.patch +++ b/libthai-libdatrie-static-build.patch @@ -1,6 +1,6 @@ diff -up libthai-0.1.12/libdatrie-0.2.2/datrie/Makefile.am.static-build libthai-0.1.12/libdatrie-0.2.2/datrie/Makefile.am ---- libthai-0.1.12/libdatrie-0.2.2/datrie/Makefile.am.static-build 2009-04-13 05:18:20.000000000 -0400 -+++ libthai-0.1.12/libdatrie-0.2.2/datrie/Makefile.am 2009-06-27 17:58:06.813631702 -0400 +--- libthai-0.1.12/libdatrie/datrie/Makefile.am.static-build 2009-04-13 05:18:20.000000000 -0400 ++++ libthai-0.1.12/libdatrie/datrie/Makefile.am 2009-06-27 17:58:06.813631702 -0400 @@ -10,7 +10,7 @@ EXTRA_DIST = libdatrie.map libdatrie.def INCLUDES = -I$(top_srcdir) diff --git a/libthai.spec b/libthai.spec index f28704e..38d729d 100644 --- a/libthai.spec +++ b/libthai.spec @@ -3,12 +3,12 @@ Summary: Thai language support routines Name: libthai Version: 0.1.14 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ Group: System Environment/Libraries Source: ftp://linux.thai.net/pub/thailinux/software/libthai/libthai-%{version}.tar.gz Source1: ftp://linux.thai.net/pub/thailinux/software/libthai/libdatrie-%{datrie_version}.tar.gz -Patch: libthai-0.1.12-libdatrie-0.2.2-static-build.patch +Patch: libthai-libdatrie-static-build.patch Patch1: libthai-0.1.9-doxygen-segfault.patch Patch2: libthai-0.1.9-multilib.patch URL: http://linux.thai.net @@ -114,7 +114,7 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/* %changelog -* Wed Mar 3 2010 Behdad Esfahbod - 0.1.14-2 +* Wed Mar 3 2010 Behdad Esfahbod - 0.1.14-3 - Update to 0.1.14 * Sat Jul 25 2009 Fedora Release Engineering - 0.1.12-2 From a018320e6d56d3384de4b3205ea9d0768ba84094 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 17:45:38 +0000 Subject: [PATCH 09/60] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 1f805a5..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: libthai -# $Id: Makefile,v 1.2 2007/10/15 19:04:33 notting Exp $ -NAME := libthai -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From d61dce5a92eddaaaf13f65283b01a2af71eed656 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 06:02:50 -0600 Subject: [PATCH 10/60] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- libthai.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libthai.spec b/libthai.spec index 38d729d..1dc0e72 100644 --- a/libthai.spec +++ b/libthai.spec @@ -3,7 +3,7 @@ Summary: Thai language support routines Name: libthai Version: 0.1.14 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv2+ Group: System Environment/Libraries Source: ftp://linux.thai.net/pub/thailinux/software/libthai/libthai-%{version}.tar.gz @@ -114,6 +114,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/* %changelog +* Tue Feb 08 2011 Fedora Release Engineering - 0.1.14-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Wed Mar 3 2010 Behdad Esfahbod - 0.1.14-3 - Update to 0.1.14 From a7e5cfe298d8142ae60dafbc1b7ed9d26f6bcddc Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 13 Jan 2012 02:31:37 -0600 Subject: [PATCH 11/60] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- libthai.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libthai.spec b/libthai.spec index 1dc0e72..152e798 100644 --- a/libthai.spec +++ b/libthai.spec @@ -3,7 +3,7 @@ Summary: Thai language support routines Name: libthai Version: 0.1.14 -Release: 4%{?dist} +Release: 5%{?dist} License: LGPLv2+ Group: System Environment/Libraries Source: ftp://linux.thai.net/pub/thailinux/software/libthai/libthai-%{version}.tar.gz @@ -114,6 +114,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/* %changelog +* Fri Jan 13 2012 Fedora Release Engineering - 0.1.14-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Tue Feb 08 2011 Fedora Release Engineering - 0.1.14-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From c6200723726a754273801a9376482cb282bdeaa5 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 19 Jul 2012 16:22:19 -0500 Subject: [PATCH 12/60] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- libthai.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libthai.spec b/libthai.spec index 152e798..c65ef32 100644 --- a/libthai.spec +++ b/libthai.spec @@ -3,7 +3,7 @@ Summary: Thai language support routines Name: libthai Version: 0.1.14 -Release: 5%{?dist} +Release: 6%{?dist} License: LGPLv2+ Group: System Environment/Libraries Source: ftp://linux.thai.net/pub/thailinux/software/libthai/libthai-%{version}.tar.gz @@ -114,6 +114,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/* %changelog +* Thu Jul 19 2012 Fedora Release Engineering - 0.1.14-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Fri Jan 13 2012 Fedora Release Engineering - 0.1.14-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 10bb8ec8f1fa1a64c490bf9ccb69375f92a6fc2a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 23:20:30 -0600 Subject: [PATCH 13/60] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- libthai.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libthai.spec b/libthai.spec index c65ef32..5ff4bff 100644 --- a/libthai.spec +++ b/libthai.spec @@ -3,7 +3,7 @@ Summary: Thai language support routines Name: libthai Version: 0.1.14 -Release: 6%{?dist} +Release: 7%{?dist} License: LGPLv2+ Group: System Environment/Libraries Source: ftp://linux.thai.net/pub/thailinux/software/libthai/libthai-%{version}.tar.gz @@ -114,6 +114,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/* %changelog +* Thu Feb 14 2013 Fedora Release Engineering - 0.1.14-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Thu Jul 19 2012 Fedora Release Engineering - 0.1.14-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 8656a016f0e78c368059b25776d3ddddd0208b5a Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Wed, 12 Jun 2013 12:20:14 +0900 Subject: [PATCH 14/60] Update to 0.1.19 --- .gitignore | 2 ++ libthai-0.1.9-doxygen-segfault.patch | 27 --------------------- libthai-0.1.9-multilib.patch | 35 ++++++++++++++-------------- libthai.spec | 30 +++++++++++++----------- sources | 4 ++-- 5 files changed, 39 insertions(+), 59 deletions(-) delete mode 100644 libthai-0.1.9-doxygen-segfault.patch diff --git a/.gitignore b/.gitignore index c3ada73..56e89c6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ libthai-0.1.12.tar.gz libdatrie-0.2.2.tar.gz +/libdatrie-0.2.6.tar.xz +/libthai-0.1.19.tar.xz diff --git a/libthai-0.1.9-doxygen-segfault.patch b/libthai-0.1.9-doxygen-segfault.patch deleted file mode 100644 index 038663c..0000000 --- a/libthai-0.1.9-doxygen-segfault.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -up libthai-0.1.9/doc/Doxyfile.in.doxygen-segfault libthai-0.1.9/doc/Doxyfile.in ---- libthai-0.1.9/doc/Doxyfile.in.doxygen-segfault 2007-11-13 16:37:16.000000000 -0500 -+++ libthai-0.1.9/doc/Doxyfile.in 2007-11-13 16:37:31.000000000 -0500 -@@ -29,7 +29,6 @@ STRIP_FROM_PATH = @top_srcdir@/in - STRIP_FROM_INC_PATH = @top_srcdir@/include - SHORT_NAMES = NO - JAVADOC_AUTOBRIEF = NO --QT_AUTOBRIEF = NO - MULTILINE_CPP_IS_BRIEF = NO - DETAILS_AT_TOP = YES - INHERIT_DOCS = YES -@@ -50,7 +49,6 @@ EXTRACT_PRIVATE = NO - EXTRACT_STATIC = NO - EXTRACT_LOCAL_CLASSES = YES - EXTRACT_LOCAL_METHODS = NO --EXTRACT_ANON_NSPACES = NO - HIDE_UNDOC_MEMBERS = YES - HIDE_UNDOC_CLASSES = YES - HIDE_FRIEND_COMPOUNDS = NO -@@ -168,7 +166,6 @@ HTML_FOOTER = - HTML_STYLESHEET = - HTML_ALIGN_MEMBERS = YES - GENERATE_HTMLHELP = NO --HTML_DYNAMIC_SECTIONS = NO - CHM_FILE = - HHC_LOCATION = - GENERATE_CHI = NO diff --git a/libthai-0.1.9-multilib.patch b/libthai-0.1.9-multilib.patch index 57cd61a..31dea3f 100644 --- a/libthai-0.1.9-multilib.patch +++ b/libthai-0.1.9-multilib.patch @@ -1,7 +1,21 @@ -diff -up libthai-0.1.9/doc/no_date_footer.html.multilib libthai-0.1.9/doc/no_date_footer.html ---- libthai-0.1.9/doc/no_date_footer.html.multilib 2008-03-17 13:32:26.000000000 -0400 -+++ libthai-0.1.9/doc/no_date_footer.html 2008-03-17 13:33:54.000000000 -0400 -@@ -0,0 +1,8 @@ +Index: libthai-0.1.19/doc/Doxyfile.in +=================================================================== +--- libthai-0.1.19.orig/doc/Doxyfile.in ++++ libthai-0.1.19/doc/Doxyfile.in +@@ -940,7 +940,7 @@ HTML_HEADER = + # each generated HTML page. If it is left blank doxygen will generate a + # standard footer. + +-HTML_FOOTER = ++HTML_FOOTER = no_date_footer.html + + # The HTML_STYLESHEET tag can be used to specify a user-defined cascading + # style sheet that is used by each HTML page. It can be used to +Index: libthai-0.1.19/doc/no_date_footer.html +=================================================================== +--- /dev/null ++++ libthai-0.1.19/doc/no_date_footer.html +@@ -0,0 +1,7 @@ +
+Generated for $projectname by doxygen @@ -9,16 +23,3 @@ diff -up libthai-0.1.9/doc/no_date_footer.html.multilib libthai-0.1.9/doc/no_dat + + + -+ -diff -up libthai-0.1.9/doc/Doxyfile.in.multilib libthai-0.1.9/doc/Doxyfile.in ---- libthai-0.1.9/doc/Doxyfile.in.multilib 2008-03-17 13:34:06.000000000 -0400 -+++ libthai-0.1.9/doc/Doxyfile.in 2008-03-17 13:34:16.000000000 -0400 -@@ -162,7 +162,7 @@ GENERATE_HTML = YES - HTML_OUTPUT = html - HTML_FILE_EXTENSION = .html - HTML_HEADER = --HTML_FOOTER = -+HTML_FOOTER = no_date_footer.html - HTML_STYLESHEET = - HTML_ALIGN_MEMBERS = YES - GENERATE_HTMLHELP = NO diff --git a/libthai.spec b/libthai.spec index 5ff4bff..3aeea3f 100644 --- a/libthai.spec +++ b/libthai.spec @@ -1,16 +1,15 @@ -%define datrie_version 0.2.3 +%define datrie_version 0.2.6 Summary: Thai language support routines Name: libthai -Version: 0.1.14 -Release: 7%{?dist} +Version: 0.1.19 +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries -Source: ftp://linux.thai.net/pub/thailinux/software/libthai/libthai-%{version}.tar.gz -Source1: ftp://linux.thai.net/pub/thailinux/software/libthai/libdatrie-%{datrie_version}.tar.gz +Source: ftp://linux.thai.net/pub/thailinux/software/libthai/libthai-%{version}.tar.xz +Source1: ftp://linux.thai.net/pub/thailinux/software/libthai/libdatrie-%{datrie_version}.tar.xz Patch: libthai-libdatrie-static-build.patch -Patch1: libthai-0.1.9-doxygen-segfault.patch -Patch2: libthai-0.1.9-multilib.patch +Patch1: libthai-0.1.9-multilib.patch URL: http://linux.thai.net BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) @@ -44,8 +43,7 @@ libthai. %setup -q -n %{name}-%{version} -a 1 mv libdatrie-%{datrie_version} libdatrie %patch -p1 -b .static-build -%patch1 -p1 -b .doxygen-segfault -%patch2 -p1 -b .multilib +%patch1 -p1 -b .multilib %build @@ -101,7 +99,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-, root, root) -%doc README AUTHORS COPYING ChangeLog TODO +%doc README AUTHORS COPYING ChangeLog %{_libdir}/lib*.so.* %{_datadir}/libthai @@ -111,9 +109,15 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/thai %{_libdir}/lib*.so %{_libdir}/pkgconfig/* -%{_mandir}/man3/* %changelog +* Wed Jun 12 2013 Daiki Ueno - 0.1.19-1 +- Update to 0.1.19 +- Fix bogus dates in %%changelog +- Remove libthai-0.1.9-doxygen-segfault.patch, which is no longer + necessary with the latest Doxygen +- Don't install man pages, as per upstream's default + * Thu Feb 14 2013 Fedora Release Engineering - 0.1.14-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild @@ -160,10 +164,10 @@ rm -rf $RPM_BUILD_ROOT * Thu Aug 23 2007 Adam Jackson - 0.1.7-6 - Rebuild for build ID -* Tue Jan 22 2007 Behdad Esfahbod 0.1.7-5 +* Mon Jan 22 2007 Behdad Esfahbod 0.1.7-5 - Export _th_*_tbl symbols too. They are accessed by some of the macros. -* Tue Jan 17 2007 Behdad Esfahbod 0.1.7-4 +* Wed Jan 17 2007 Behdad Esfahbod 0.1.7-4 - Patch libthai.pc.in to not require datrie. * Tue Jan 16 2007 Matthias Clasen 0.1.7-3 diff --git a/sources b/sources index 7a53184..53240d3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -c6814f4fe68aa8d41d1b7183ad78d319 libdatrie-0.2.3.tar.gz -34f64b37ed8f8f49f4a18ae972e6f41e libthai-0.1.14.tar.gz +e253eb2433045f6e224c7fa44f9796e1 libdatrie-0.2.6.tar.xz +c4a6c3842257889f8f15ae192b66e797 libthai-0.1.19.tar.xz From 7a6b2b6503101fd37a17d3521578e05bae9ca4cf Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 02:12:01 -0500 Subject: [PATCH 15/60] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- libthai.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libthai.spec b/libthai.spec index 3aeea3f..60427b7 100644 --- a/libthai.spec +++ b/libthai.spec @@ -3,7 +3,7 @@ Summary: Thai language support routines Name: libthai Version: 0.1.19 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: System Environment/Libraries Source: ftp://linux.thai.net/pub/thailinux/software/libthai/libthai-%{version}.tar.xz @@ -111,6 +111,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/* %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 0.1.19-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Wed Jun 12 2013 Daiki Ueno - 0.1.19-1 - Update to 0.1.19 - Fix bogus dates in %%changelog From b3779da11ea249162f17b18e6bc79609aaa73f9f Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Wed, 23 Apr 2014 12:08:23 +0900 Subject: [PATCH 16/60] Update to 0.1.20-1 --- .gitignore | 2 ++ libthai-libdatrie-static-build.patch | 34 ++++++++++++++++------------ libthai.spec | 11 +++++---- sources | 4 ++-- 4 files changed, 30 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index 56e89c6..0f99c38 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ libthai-0.1.12.tar.gz libdatrie-0.2.2.tar.gz /libdatrie-0.2.6.tar.xz /libthai-0.1.19.tar.xz +/libdatrie-0.2.8.tar.xz +/libthai-0.1.20.tar.xz diff --git a/libthai-libdatrie-static-build.patch b/libthai-libdatrie-static-build.patch index c372c40..34a888c 100644 --- a/libthai-libdatrie-static-build.patch +++ b/libthai-libdatrie-static-build.patch @@ -1,18 +1,20 @@ -diff -up libthai-0.1.12/libdatrie-0.2.2/datrie/Makefile.am.static-build libthai-0.1.12/libdatrie-0.2.2/datrie/Makefile.am ---- libthai-0.1.12/libdatrie/datrie/Makefile.am.static-build 2009-04-13 05:18:20.000000000 -0400 -+++ libthai-0.1.12/libdatrie/datrie/Makefile.am 2009-06-27 17:58:06.813631702 -0400 +Index: libthai-0.1.20/libdatrie/datrie/Makefile.am +=================================================================== +--- libthai-0.1.20.orig/libdatrie/datrie/Makefile.am ++++ libthai-0.1.20/libdatrie/datrie/Makefile.am @@ -10,7 +10,7 @@ EXTRA_DIST = libdatrie.map libdatrie.def - INCLUDES = -I$(top_srcdir) + AM_CPPFLAGS = -I$(top_srcdir) -lib_LTLIBRARIES = libdatrie.la +noinst_LTLIBRARIES = libdatrie.la libdatrie_la_SOURCES = \ typedefs.h \ -diff -up libthai-0.1.12/libthai.pc.in.static-build libthai-0.1.12/libthai.pc.in ---- libthai-0.1.12/libthai.pc.in.static-build 2009-03-31 00:25:23.000000000 -0400 -+++ libthai-0.1.12/libthai.pc.in 2009-06-27 17:58:06.814631492 -0400 +Index: libthai-0.1.20/libthai.pc.in +=================================================================== +--- libthai-0.1.20.orig/libthai.pc.in ++++ libthai-0.1.20/libthai.pc.in @@ -6,6 +6,5 @@ includedir=@includedir@ Name: libthai Description: Thai support library @@ -20,10 +22,11 @@ diff -up libthai-0.1.12/libthai.pc.in.static-build libthai-0.1.12/libthai.pc.in -Requires.private: datrie-0.2 Libs: -L${libdir} -lthai Cflags: -I${includedir} -diff -up libthai-0.1.12/src/Makefile.am.static-build libthai-0.1.12/src/Makefile.am ---- libthai-0.1.12/src/Makefile.am.static-build 2009-06-07 03:20:15.000000000 -0400 -+++ libthai-0.1.12/src/Makefile.am 2009-06-27 17:59:20.060630864 -0400 -@@ -19,7 +19,8 @@ libthai_sublibs = \ +Index: libthai-0.1.20/src/Makefile.am +=================================================================== +--- libthai-0.1.20.orig/src/Makefile.am ++++ libthai-0.1.20/src/Makefile.am +@@ -18,7 +18,8 @@ libthai_sublibs = \ $(top_builddir)/src/thwchar/libthwchar.la \ $(top_builddir)/src/thwctype/libthwctype.la \ $(top_builddir)/src/thwstr/libthwstr.la \ @@ -33,10 +36,11 @@ diff -up libthai-0.1.12/src/Makefile.am.static-build libthai-0.1.12/src/Makefile if LD_HAS_VERSION_SCRIPT EXPORTS_FLAGS = -Wl,-version-script -Wl,$(srcdir)/libthai.map -diff -up libthai-0.1.12/src/thbrk/Makefile.am.static-build libthai-0.1.12/src/thbrk/Makefile.am ---- libthai-0.1.12/src/thbrk/Makefile.am.static-build 2009-01-19 08:32:50.000000000 -0500 -+++ libthai-0.1.12/src/thbrk/Makefile.am 2009-06-27 17:58:06.812632123 -0400 -@@ -16,5 +16,4 @@ libthbrk_la_SOURCES = \ +Index: libthai-0.1.20/src/thbrk/Makefile.am +=================================================================== +--- libthai-0.1.20.orig/src/thbrk/Makefile.am ++++ libthai-0.1.20/src/thbrk/Makefile.am +@@ -15,5 +15,4 @@ libthbrk_la_SOURCES = \ brk-maximal.c \ brk-maximal.h diff --git a/libthai.spec b/libthai.spec index 60427b7..8c4f32a 100644 --- a/libthai.spec +++ b/libthai.spec @@ -1,9 +1,9 @@ -%define datrie_version 0.2.6 +%define datrie_version 0.2.8 Summary: Thai language support routines Name: libthai -Version: 0.1.19 -Release: 2%{?dist} +Version: 0.1.20 +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries Source: ftp://linux.thai.net/pub/thailinux/software/libthai/libthai-%{version}.tar.xz @@ -61,7 +61,6 @@ mv libdatrie-%{datrie_version} libdatrie { pushd libdatrie - mkdir m4 autoreconf -i -f %configure make @@ -111,6 +110,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/* %changelog +* Wed Apr 23 2014 Daiki Ueno - 0.1.20-1 +- Update to 0.1.20 +- Update bundled libdatrie to 0.2.8 + * Sat Aug 03 2013 Fedora Release Engineering - 0.1.19-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index 53240d3..6536327 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -e253eb2433045f6e224c7fa44f9796e1 libdatrie-0.2.6.tar.xz -c4a6c3842257889f8f15ae192b66e797 libthai-0.1.19.tar.xz +fc25a7bf5ec7405e30ae1512a8e2226c libdatrie-0.2.8.tar.xz +2b58148d73361316121d5384efeda9e6 libthai-0.1.20.tar.xz From f0d717b684c0564446acb32191a564ef08f6ea03 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 00:40:32 -0500 Subject: [PATCH 17/60] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- libthai.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libthai.spec b/libthai.spec index 8c4f32a..8207e85 100644 --- a/libthai.spec +++ b/libthai.spec @@ -3,7 +3,7 @@ Summary: Thai language support routines Name: libthai Version: 0.1.20 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: System Environment/Libraries Source: ftp://linux.thai.net/pub/thailinux/software/libthai/libthai-%{version}.tar.xz @@ -110,6 +110,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/* %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 0.1.20-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Wed Apr 23 2014 Daiki Ueno - 0.1.20-1 - Update to 0.1.20 - Update bundled libdatrie to 0.2.8 From 5d202f47a7720cb2d270fa63b3ba0ffde60119d0 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Mon, 7 Jul 2014 11:30:18 +0900 Subject: [PATCH 18/60] Update to 0.1.20-3 --- libthai-libdatrie-static-build.patch | 48 ---------------------------- libthai.spec | 48 +++++----------------------- sources | 1 - 3 files changed, 8 insertions(+), 89 deletions(-) delete mode 100644 libthai-libdatrie-static-build.patch diff --git a/libthai-libdatrie-static-build.patch b/libthai-libdatrie-static-build.patch deleted file mode 100644 index 34a888c..0000000 --- a/libthai-libdatrie-static-build.patch +++ /dev/null @@ -1,48 +0,0 @@ -Index: libthai-0.1.20/libdatrie/datrie/Makefile.am -=================================================================== ---- libthai-0.1.20.orig/libdatrie/datrie/Makefile.am -+++ libthai-0.1.20/libdatrie/datrie/Makefile.am -@@ -10,7 +10,7 @@ EXTRA_DIST = libdatrie.map libdatrie.def - - AM_CPPFLAGS = -I$(top_srcdir) - --lib_LTLIBRARIES = libdatrie.la -+noinst_LTLIBRARIES = libdatrie.la - - libdatrie_la_SOURCES = \ - typedefs.h \ -Index: libthai-0.1.20/libthai.pc.in -=================================================================== ---- libthai-0.1.20.orig/libthai.pc.in -+++ libthai-0.1.20/libthai.pc.in -@@ -6,6 +6,5 @@ includedir=@includedir@ - Name: libthai - Description: Thai support library - Version: @VERSION@ --Requires.private: datrie-0.2 - Libs: -L${libdir} -lthai - Cflags: -I${includedir} -Index: libthai-0.1.20/src/Makefile.am -=================================================================== ---- libthai-0.1.20.orig/src/Makefile.am -+++ libthai-0.1.20/src/Makefile.am -@@ -18,7 +18,8 @@ libthai_sublibs = \ - $(top_builddir)/src/thwchar/libthwchar.la \ - $(top_builddir)/src/thwctype/libthwctype.la \ - $(top_builddir)/src/thwstr/libthwstr.la \ -- $(top_builddir)/src/thwbrk/libthwbrk.la -+ $(top_builddir)/src/thwbrk/libthwbrk.la \ -+ $(DATRIE_LIBS) - - if LD_HAS_VERSION_SCRIPT - EXPORTS_FLAGS = -Wl,-version-script -Wl,$(srcdir)/libthai.map -Index: libthai-0.1.20/src/thbrk/Makefile.am -=================================================================== ---- libthai-0.1.20.orig/src/thbrk/Makefile.am -+++ libthai-0.1.20/src/thbrk/Makefile.am -@@ -15,5 +15,4 @@ libthbrk_la_SOURCES = \ - brk-maximal.c \ - brk-maximal.h - --libthbrk_la_LIBADD = $(DATRIE_LIBS) - diff --git a/libthai.spec b/libthai.spec index 8207e85..194eb8a 100644 --- a/libthai.spec +++ b/libthai.spec @@ -3,22 +3,16 @@ Summary: Thai language support routines Name: libthai Version: 0.1.20 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ Group: System Environment/Libraries Source: ftp://linux.thai.net/pub/thailinux/software/libthai/libthai-%{version}.tar.xz -Source1: ftp://linux.thai.net/pub/thailinux/software/libthai/libdatrie-%{datrie_version}.tar.xz -Patch: libthai-libdatrie-static-build.patch -Patch1: libthai-0.1.9-multilib.patch +Patch: libthai-0.1.9-multilib.patch URL: http://linux.thai.net BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) -BuildRequires: pkgconfig +BuildRequires: pkgconfig(datrie-0.2) BuildRequires: doxygen -# we edit the Makefile.am's -BuildRequires: automake -BuildRequires: autoconf -BuildRequires: libtool %description LibThai is a set of Thai language support routines aimed to ease @@ -40,39 +34,10 @@ Install libthai-devel if you want to develop programs which will use libthai. %prep -%setup -q -n %{name}-%{version} -a 1 -mv libdatrie-%{datrie_version} libdatrie -%patch -p1 -b .static-build -%patch1 -p1 -b .multilib +%setup -q +%patch -p1 -b .multilib %build - -# libthai depends on this library called libdatrie. libdatrie is a -# data-structure implementaiton that the author of libthai ripped out of it. -# However, since libthai is the only user of that code, there's no reason to -# 1) package it separately, 2) use it as a shared library. -# So, we compile it as a libtool convenience library and include in libthai.so, -# and use symbol hiding to hide them (and other internal symbols). -# -# The patch takes care of making datrie into a convenience lib and making sure -# libthai will include it (and hide its symbols), and the exports make sure -# libthai finds the uninstalled libdatrie. We need to call automake, since -# the patch modifies a few Makefile.am's. - -{ - pushd libdatrie - autoreconf -i -f - %configure - make - popd -} - -export DATRIE_CFLAGS="-I$PWD/libdatrie" -export DATRIE_LIBS="$PWD/libdatrie/datrie/libdatrie.la" -export PATH="$PWD/libdatrie/tools:$PATH" - -autoreconf -i -f - %configure --disable-static make @@ -110,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/* %changelog +* Fri Jul 4 2014 Daiki Ueno - 0.1.20-3 +- Unbundle libdatrie (Closes: #1062540) + * Sat Jun 07 2014 Fedora Release Engineering - 0.1.20-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/sources b/sources index 6536327..ce73285 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -fc25a7bf5ec7405e30ae1512a8e2226c libdatrie-0.2.8.tar.xz 2b58148d73361316121d5384efeda9e6 libthai-0.1.20.tar.xz From b31279737d6a928d23e4488046a817b32a0d1876 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 17 Aug 2014 06:18:04 +0000 Subject: [PATCH 19/60] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- libthai.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libthai.spec b/libthai.spec index 194eb8a..c21aac5 100644 --- a/libthai.spec +++ b/libthai.spec @@ -3,7 +3,7 @@ Summary: Thai language support routines Name: libthai Version: 0.1.20 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv2+ Group: System Environment/Libraries Source: ftp://linux.thai.net/pub/thailinux/software/libthai/libthai-%{version}.tar.xz @@ -75,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/* %changelog +* Sun Aug 17 2014 Fedora Release Engineering - 0.1.20-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Fri Jul 4 2014 Daiki Ueno - 0.1.20-3 - Unbundle libdatrie (Closes: #1062540) From 10a84d831bd4c59fd4318d3bf7c26153667f124c Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Tue, 2 Sep 2014 10:47:55 +0900 Subject: [PATCH 20/60] Update to 0.1.21 --- .gitignore | 1 + libthai.spec | 9 +++++---- sources | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 0f99c38..276e7b4 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ libdatrie-0.2.2.tar.gz /libthai-0.1.19.tar.xz /libdatrie-0.2.8.tar.xz /libthai-0.1.20.tar.xz +/libthai-0.1.21.tar.xz diff --git a/libthai.spec b/libthai.spec index c21aac5..0e38691 100644 --- a/libthai.spec +++ b/libthai.spec @@ -1,9 +1,7 @@ -%define datrie_version 0.2.8 - Summary: Thai language support routines Name: libthai -Version: 0.1.20 -Release: 4%{?dist} +Version: 0.1.21 +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries Source: ftp://linux.thai.net/pub/thailinux/software/libthai/libthai-%{version}.tar.xz @@ -75,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/* %changelog +* Tue Sep 2 2014 Daiki Ueno - 0.1.21-1 +- Update to 0.1.21 + * Sun Aug 17 2014 Fedora Release Engineering - 0.1.20-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index ce73285..fcacc56 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2b58148d73361316121d5384efeda9e6 libthai-0.1.20.tar.xz +cee51e8359a6a382788af304905ff804 libthai-0.1.21.tar.xz From b1b1a52d2a8e695d741db28d1ec3d8647a635251 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 17:25:00 +0000 Subject: [PATCH 21/60] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- libthai.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libthai.spec b/libthai.spec index 0e38691..10aa96b 100644 --- a/libthai.spec +++ b/libthai.spec @@ -1,7 +1,7 @@ Summary: Thai language support routines Name: libthai Version: 0.1.21 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: System Environment/Libraries Source: ftp://linux.thai.net/pub/thailinux/software/libthai/libthai-%{version}.tar.xz @@ -73,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/* %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 0.1.21-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Tue Sep 2 2014 Daiki Ueno - 0.1.21-1 - Update to 0.1.21 From e87e4c0b770334c3041c1803b41b380dfe2e8a54 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 4 Feb 2016 04:00:43 +0000 Subject: [PATCH 22/60] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- libthai.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libthai.spec b/libthai.spec index 10aa96b..c7eade3 100644 --- a/libthai.spec +++ b/libthai.spec @@ -1,7 +1,7 @@ Summary: Thai language support routines Name: libthai Version: 0.1.21 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ Group: System Environment/Libraries Source: ftp://linux.thai.net/pub/thailinux/software/libthai/libthai-%{version}.tar.xz @@ -73,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/* %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 0.1.21-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Wed Jun 17 2015 Fedora Release Engineering - 0.1.21-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From da10158c3830fd51ae93f8ef67bc031d09853691 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Tue, 16 Feb 2016 15:13:59 +0900 Subject: [PATCH 23/60] Update to 0.1.24-1 --- .gitignore | 1 + libthai-0.1.24-gcc6.patch | 36 ++++++++++++++++++++++++++++++++++++ libthai-0.1.9-multilib.patch | 20 ++++++++++---------- libthai.spec | 14 ++++++++++---- sources | 2 +- 5 files changed, 58 insertions(+), 15 deletions(-) create mode 100644 libthai-0.1.24-gcc6.patch diff --git a/.gitignore b/.gitignore index 276e7b4..cf6bda3 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ libdatrie-0.2.2.tar.gz /libdatrie-0.2.8.tar.xz /libthai-0.1.20.tar.xz /libthai-0.1.21.tar.xz +/libthai-0.1.24.tar.xz diff --git a/libthai-0.1.24-gcc6.patch b/libthai-0.1.24-gcc6.patch new file mode 100644 index 0000000..1fe65e8 --- /dev/null +++ b/libthai-0.1.24-gcc6.patch @@ -0,0 +1,36 @@ +Index: ChangeLog +=================================================================== +--- ChangeLog.orig ++++ ChangeLog +@@ -28,6 +28,18 @@ + + 2015-11-22 Theppitak Karoonboonyanan + ++ Fix compilation error with GCC 6 ++ ++ * include/thai/thctype.h (_th_bitmsk): ++ - Use unsigned int instead of unsigned short for bitmask base, ++ as GCC 6 takes ~0 as -1 for unsigned short, ++ and causes compilation error for scim-thai. ++ ++ Thanks Martin Michlmayr for the report via Debian #811690 ++ http://bugs.debian.org/811690 ++ ++2016-01-20 Theppitak Karoonboonyanan ++ + * configure.ac: Post-release version suffix added. + + 2015-10-22 Theppitak Karoonboonyanan +Index: include/thai/thctype.h +=================================================================== +--- include/thai/thctype.h.orig ++++ include/thai/thctype.h +@@ -363,7 +363,7 @@ extern int th_iscombchar(thchar_t c); + #include + #define _th_ISbit(bit) (1 << (bit)) + #define _th_bitfld(base, val) ((val) << (base)) +-#define _th_bitmsk(base, bits) (~((~(unsigned short)0) << (bits)) << (base)) ++#define _th_bitmsk(base, bits) (~((~(unsigned)0) << (bits)) << (base)) + + enum { + _th_IStis = _th_ISbit(0), /* TIS-620 char */ diff --git a/libthai-0.1.9-multilib.patch b/libthai-0.1.9-multilib.patch index 31dea3f..58522cf 100644 --- a/libthai-0.1.9-multilib.patch +++ b/libthai-0.1.9-multilib.patch @@ -1,20 +1,20 @@ -Index: libthai-0.1.19/doc/Doxyfile.in +Index: libthai-0.1.24/doc/Doxyfile.in =================================================================== ---- libthai-0.1.19.orig/doc/Doxyfile.in -+++ libthai-0.1.19/doc/Doxyfile.in -@@ -940,7 +940,7 @@ HTML_HEADER = - # each generated HTML page. If it is left blank doxygen will generate a - # standard footer. +--- libthai-0.1.24.orig/doc/Doxyfile.in ++++ libthai-0.1.24/doc/Doxyfile.in +@@ -1124,7 +1124,7 @@ HTML_HEADER = + # that doxygen normally uses. + # This tag requires that the tag GENERATE_HTML is set to YES. -HTML_FOOTER = +HTML_FOOTER = no_date_footer.html - # The HTML_STYLESHEET tag can be used to specify a user-defined cascading - # style sheet that is used by each HTML page. It can be used to -Index: libthai-0.1.19/doc/no_date_footer.html + # The HTML_STYLESHEET tag can be used to specify a user-defined cascading style + # sheet that is used by each HTML page. It can be used to fine-tune the look of +Index: libthai-0.1.24/doc/no_date_footer.html =================================================================== --- /dev/null -+++ libthai-0.1.19/doc/no_date_footer.html ++++ libthai-0.1.24/doc/no_date_footer.html @@ -0,0 +1,7 @@ +
+Generated for $projectname by  Date: Thu, 22 Jul 2021 12:31:12 +0000 Subject: [PATCH 45/60] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libthai.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libthai.spec b/libthai.spec index 2980377..e77f022 100644 --- a/libthai.spec +++ b/libthai.spec @@ -1,7 +1,7 @@ Summary: Thai language support routines Name: libthai Version: 0.1.28 -Release: 6%{?dist} +Release: 7%{?dist} License: LGPLv2+ Source: ftp://linux.thai.net/pub/thailinux/software/libthai/libthai-%{version}.tar.xz Patch0: libthai-0.1.9-multilib.patch @@ -65,6 +65,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la %{_libdir}/pkgconfig/* %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 0.1.28-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 0.1.28-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From f6b7b3234196ebd7c25f27d6a6e17ed1183ca440 Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Thu, 23 Dec 2021 14:06:57 +0800 Subject: [PATCH 46/60] Update to 0.1.29 --- .gitignore | 1 + libthai.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 528b747..819235a 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ libdatrie-0.2.2.tar.gz /libthai-0.1.25.tar.xz /libthai-0.1.27.tar.xz /libthai-0.1.28.tar.xz +/libthai-0.1.29.tar.xz diff --git a/libthai.spec b/libthai.spec index e77f022..938f0f4 100644 --- a/libthai.spec +++ b/libthai.spec @@ -1,9 +1,9 @@ Summary: Thai language support routines Name: libthai -Version: 0.1.28 -Release: 7%{?dist} +Version: 0.1.29 +Release: 1%{?dist} License: LGPLv2+ -Source: ftp://linux.thai.net/pub/thailinux/software/libthai/libthai-%{version}.tar.xz +Source: http://linux.thai.net/pub/thailinux/software/libthai/libthai-%{version}.tar.xz Patch0: libthai-0.1.9-multilib.patch URL: http://linux.thai.net @@ -65,6 +65,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la %{_libdir}/pkgconfig/* %changelog +* Thu Dec 23 2021 Peng Wu - 0.1.29-1 +- Update to 0.1.29 + * Thu Jul 22 2021 Fedora Release Engineering - 0.1.28-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 2a8d628..ded3452 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libthai-0.1.28.tar.xz) = 925be8367ae0cba026e602f1f60c813306e9051e22fe722afba496b6e493f8c1f3eb56abb77ca663f53678b14ad793daf3269b32d32720c0d869b906cdf15f4e +SHA512 (libthai-0.1.29.tar.xz) = 0ba1261581a1705a2a2546a3071acb3c63892dbf111f0dad415667165a6b9542a5e4549061c67b11ec53de7c9e70fceb3c04d794fd12a22d991a539dbacebda1 From f6a70f04fec95a854bfc991a3fe28803dc76c1f1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 17:24:05 +0000 Subject: [PATCH 47/60] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libthai.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libthai.spec b/libthai.spec index 938f0f4..ca25ed6 100644 --- a/libthai.spec +++ b/libthai.spec @@ -1,7 +1,7 @@ Summary: Thai language support routines Name: libthai Version: 0.1.29 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Source: http://linux.thai.net/pub/thailinux/software/libthai/libthai-%{version}.tar.xz Patch0: libthai-0.1.9-multilib.patch @@ -65,6 +65,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la %{_libdir}/pkgconfig/* %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 0.1.29-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Dec 23 2021 Peng Wu - 0.1.29-1 - Update to 0.1.29 From 1e986ddd95f0657c5c040e624399d1bec4c23e3b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 19:10:19 +0000 Subject: [PATCH 48/60] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libthai.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libthai.spec b/libthai.spec index ca25ed6..d6e69c5 100644 --- a/libthai.spec +++ b/libthai.spec @@ -1,7 +1,7 @@ Summary: Thai language support routines Name: libthai Version: 0.1.29 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ Source: http://linux.thai.net/pub/thailinux/software/libthai/libthai-%{version}.tar.xz Patch0: libthai-0.1.9-multilib.patch @@ -65,6 +65,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la %{_libdir}/pkgconfig/* %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 0.1.29-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jan 20 2022 Fedora Release Engineering - 0.1.29-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From b77f1c4b44665628ae0d0460de119c1e02e61cf4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 17:35:37 +0000 Subject: [PATCH 49/60] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libthai.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libthai.spec b/libthai.spec index d6e69c5..847dce2 100644 --- a/libthai.spec +++ b/libthai.spec @@ -1,7 +1,7 @@ Summary: Thai language support routines Name: libthai Version: 0.1.29 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv2+ Source: http://linux.thai.net/pub/thailinux/software/libthai/libthai-%{version}.tar.xz Patch0: libthai-0.1.9-multilib.patch @@ -65,6 +65,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la %{_libdir}/pkgconfig/* %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 0.1.29-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Jul 21 2022 Fedora Release Engineering - 0.1.29-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From ad243956f6f4ecd306fe745d9359dc126ff41c9a Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Wed, 17 May 2023 15:50:11 +0800 Subject: [PATCH 50/60] Migrate to SPDX license --- libthai.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libthai.spec b/libthai.spec index 847dce2..0a075dc 100644 --- a/libthai.spec +++ b/libthai.spec @@ -1,8 +1,8 @@ Summary: Thai language support routines Name: libthai Version: 0.1.29 -Release: 4%{?dist} -License: LGPLv2+ +Release: 5%{?dist} +License: LGPL-2.1-or-later Source: http://linux.thai.net/pub/thailinux/software/libthai/libthai-%{version}.tar.xz Patch0: libthai-0.1.9-multilib.patch URL: http://linux.thai.net @@ -31,8 +31,7 @@ Install libthai-devel if you want to develop programs which will use libthai. %prep -%setup -q -%patch0 -p1 -b .multilib +%autosetup -p1 %build %configure --disable-static @@ -65,6 +64,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la %{_libdir}/pkgconfig/* %changelog +* Wed May 17 2023 Peng Wu - 0.1.29-5 +- Migrate to SPDX license + * Thu Jan 19 2023 Fedora Release Engineering - 0.1.29-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 2e279c7cf4492d55549220babe0c794b15aefa43 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 12:16:46 +0000 Subject: [PATCH 51/60] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libthai.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libthai.spec b/libthai.spec index 0a075dc..6ff1608 100644 --- a/libthai.spec +++ b/libthai.spec @@ -1,7 +1,7 @@ Summary: Thai language support routines Name: libthai Version: 0.1.29 -Release: 5%{?dist} +Release: 6%{?dist} License: LGPL-2.1-or-later Source: http://linux.thai.net/pub/thailinux/software/libthai/libthai-%{version}.tar.xz Patch0: libthai-0.1.9-multilib.patch @@ -64,6 +64,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la %{_libdir}/pkgconfig/* %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 0.1.29-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed May 17 2023 Peng Wu - 0.1.29-5 - Migrate to SPDX license From 1e6676b31cc9b84429ba02a1b789358fbc1d462b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 05:29:59 +0000 Subject: [PATCH 52/60] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- libthai.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libthai.spec b/libthai.spec index 6ff1608..ed20199 100644 --- a/libthai.spec +++ b/libthai.spec @@ -1,7 +1,7 @@ Summary: Thai language support routines Name: libthai Version: 0.1.29 -Release: 6%{?dist} +Release: 7%{?dist} License: LGPL-2.1-or-later Source: http://linux.thai.net/pub/thailinux/software/libthai/libthai-%{version}.tar.xz Patch0: libthai-0.1.9-multilib.patch @@ -64,6 +64,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la %{_libdir}/pkgconfig/* %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 0.1.29-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Jul 20 2023 Fedora Release Engineering - 0.1.29-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 06573c30504ed93479200238b9f729d5dd83eebf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 03:41:43 +0000 Subject: [PATCH 53/60] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- libthai.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libthai.spec b/libthai.spec index ed20199..87a0474 100644 --- a/libthai.spec +++ b/libthai.spec @@ -1,7 +1,7 @@ Summary: Thai language support routines Name: libthai Version: 0.1.29 -Release: 7%{?dist} +Release: 8%{?dist} License: LGPL-2.1-or-later Source: http://linux.thai.net/pub/thailinux/software/libthai/libthai-%{version}.tar.xz Patch0: libthai-0.1.9-multilib.patch @@ -64,6 +64,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la %{_libdir}/pkgconfig/* %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 0.1.29-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 0.1.29-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 26a19fa26cc7d1b50848ca36c22d87809183b623 Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Fri, 31 May 2024 11:51:36 +0800 Subject: [PATCH 54/60] Rewrite CI tests --- .fmf/version | 1 + plans/basic.fmf | 6 ++++++ tests/main.fmf | 13 +++++++++++++ tests/make_check.sh | 9 +++++++++ tests/tests.yml | 21 --------------------- 5 files changed, 29 insertions(+), 21 deletions(-) create mode 100644 .fmf/version create mode 100644 plans/basic.fmf create mode 100644 tests/main.fmf delete mode 100644 tests/tests.yml diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/plans/basic.fmf b/plans/basic.fmf new file mode 100644 index 0000000..d57536e --- /dev/null +++ b/plans/basic.fmf @@ -0,0 +1,6 @@ +summary: Basic smoke test +discover: + how: fmf + dist-git-source: true +execute: + how: tmt diff --git a/tests/main.fmf b/tests/main.fmf new file mode 100644 index 0000000..5241982 --- /dev/null +++ b/tests/main.fmf @@ -0,0 +1,13 @@ +test: bash ./make_check.sh .. +duration: 50m +framework: shell +require: + - make + - gcc + - autoconf + - autoconf-archive + - automake + - libtool + - doxygen + - libdatrie-devel + - rpm-build diff --git a/tests/make_check.sh b/tests/make_check.sh index a09a48b..e2f16d0 100644 --- a/tests/make_check.sh +++ b/tests/make_check.sh @@ -9,6 +9,15 @@ check_return_value () { } cd $1 + +VERSION=`rpmspec -q --srpm --qf "%{version}" libthai.spec 2>/dev/null` + +if test -d libthai-$VERSION-build; +then cd libthai-$VERSION-build; +fi + +cd libthai-$VERSION + ./configure --prefix=/usr check_return_value $? make diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index 73a8820..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,21 +0,0 @@ -- hosts: localhost - vars: - - artifacts: "{{ lookup('env', 'TEST_ARTIFACTS')|default('./artifacts', true) }}" - tags: - - classic - remote_user: root - roles: - - role: standard-test-source # to get the source tar ball to do “make check” - - role: standard-test-basic - required_packages: - - make - - gcc - - autoconf - - automake - - libtool - - doxygen - - libdatrie-devel - tests: - - make-check: - dir: ./ - run: bash ./make_check.sh ./source From a78d349d5876de896c6d7c044d94f8764dae2a4f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 15:15:17 +0000 Subject: [PATCH 55/60] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- libthai.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libthai.spec b/libthai.spec index 87a0474..71388a1 100644 --- a/libthai.spec +++ b/libthai.spec @@ -1,7 +1,7 @@ Summary: Thai language support routines Name: libthai Version: 0.1.29 -Release: 8%{?dist} +Release: 9%{?dist} License: LGPL-2.1-or-later Source: http://linux.thai.net/pub/thailinux/software/libthai/libthai-%{version}.tar.xz Patch0: libthai-0.1.9-multilib.patch @@ -64,6 +64,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la %{_libdir}/pkgconfig/* %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 0.1.29-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Thu Jan 25 2024 Fedora Release Engineering - 0.1.29-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 4d768f2043a003353d9991bda6f1d0f021918ea7 Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Thu, 16 Jan 2025 16:07:23 +0800 Subject: [PATCH 56/60] Rewrite CI tests to use beakerlib framework --- plans/basic.fmf | 1 - tests/main.fmf | 6 ++++-- tests/make_check.sh | 26 -------------------------- tests/runtest.sh | 35 +++++++++++++++++++++++++++++++++++ 4 files changed, 39 insertions(+), 29 deletions(-) delete mode 100644 tests/make_check.sh create mode 100755 tests/runtest.sh diff --git a/plans/basic.fmf b/plans/basic.fmf index d57536e..c1627f9 100644 --- a/plans/basic.fmf +++ b/plans/basic.fmf @@ -1,6 +1,5 @@ summary: Basic smoke test discover: how: fmf - dist-git-source: true execute: how: tmt diff --git a/tests/main.fmf b/tests/main.fmf index 5241982..5c33677 100644 --- a/tests/main.fmf +++ b/tests/main.fmf @@ -1,6 +1,6 @@ -test: bash ./make_check.sh .. +test: ./runtest.sh duration: 50m -framework: shell +framework: beakerlib require: - make - gcc @@ -10,4 +10,6 @@ require: - libtool - doxygen - libdatrie-devel + - libthai + - gnome-common - rpm-build diff --git a/tests/make_check.sh b/tests/make_check.sh deleted file mode 100644 index e2f16d0..0000000 --- a/tests/make_check.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -set -x - -check_return_value () { - if [ $1 != 0 ] ; then - exit $1 - fi -} - -cd $1 - -VERSION=`rpmspec -q --srpm --qf "%{version}" libthai.spec 2>/dev/null` - -if test -d libthai-$VERSION-build; -then cd libthai-$VERSION-build; -fi - -cd libthai-$VERSION - -./configure --prefix=/usr -check_return_value $? -make -check_return_value $? -make check -exit $? diff --git a/tests/runtest.sh b/tests/runtest.sh new file mode 100755 index 0000000..07ca06b --- /dev/null +++ b/tests/runtest.sh @@ -0,0 +1,35 @@ +#!/bin/bash +. /usr/share/beakerlib/beakerlib.sh || exit 1 + +rlJournalStart + rlPhaseStartSetup + rlShowPackageVersion libthai + rlRun -t -l "VERSION=$(rpm -q libthai --queryformat='%{version}')" 0 "Get VERSION" + FEDORA_VERSION=$(rlGetDistroRelease) + rlLog "FEDORA_VERSION=${DISTRO_RELEASE}" + rlRun "tmp=\$(mktemp -d)" 0 "Create tmp directory" + rlRun "pushd $tmp" + rlFetchSrcForInstalled "libthai" + rlRun "rpm --define '_topdir $tmp' -i *src.rpm" + rlRun -t -l "mkdir BUILD" 0 "Creating BUILD directory" + rlRun -t -l "rpmbuild --noclean --nodeps --define '_topdir $tmp' -bp $tmp/SPECS/*spec" + if [ -d BUILD/libthai-${VERSION}-build ]; then + rlRun -t -l "pushd BUILD/libthai-${VERSION}-build/libthai-${VERSION}" + else + rlRun -t -l "pushd BUILD/libthai-${VERSION}" + fi + rlPhaseEnd + + rlPhaseStartTest + rlRun "set -o pipefail" + rlRun -t -l "NOCONFIGURE=1 gnome-autogen.sh" + rlRun -t -l "./configure" + rlRun -t -l "make" + rlRun -t -l "make check" + rlPhaseEnd + + rlPhaseStartCleanup + rlRun "popd; popd" + rlRun "rm -r $tmp" 0 "Remove tmp directory" + rlPhaseEnd +rlJournalEnd From 57b5ab532bf7b3bf5475824ec939882c5632b1eb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 14:22:01 +0000 Subject: [PATCH 57/60] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- libthai.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libthai.spec b/libthai.spec index 71388a1..c67ac32 100644 --- a/libthai.spec +++ b/libthai.spec @@ -1,7 +1,7 @@ Summary: Thai language support routines Name: libthai Version: 0.1.29 -Release: 9%{?dist} +Release: 10%{?dist} License: LGPL-2.1-or-later Source: http://linux.thai.net/pub/thailinux/software/libthai/libthai-%{version}.tar.xz Patch0: libthai-0.1.9-multilib.patch @@ -64,6 +64,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la %{_libdir}/pkgconfig/* %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 0.1.29-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Jul 18 2024 Fedora Release Engineering - 0.1.29-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From e058c897b4571cc883f18e7e4a24ceeed49fd7e4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 20:26:57 +0000 Subject: [PATCH 58/60] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- libthai.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libthai.spec b/libthai.spec index c67ac32..aabb0bb 100644 --- a/libthai.spec +++ b/libthai.spec @@ -1,7 +1,7 @@ Summary: Thai language support routines Name: libthai Version: 0.1.29 -Release: 10%{?dist} +Release: 11%{?dist} License: LGPL-2.1-or-later Source: http://linux.thai.net/pub/thailinux/software/libthai/libthai-%{version}.tar.xz Patch0: libthai-0.1.9-multilib.patch @@ -64,6 +64,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la %{_libdir}/pkgconfig/* %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 0.1.29-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Jan 17 2025 Fedora Release Engineering - 0.1.29-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 6472895adf8815d7e8c08c276b76923ca7955b07 Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Mon, 5 Jan 2026 13:04:58 +0800 Subject: [PATCH 59/60] Update to 0.1.30 --- .gitignore | 1 + libthai.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 819235a..8206501 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ libdatrie-0.2.2.tar.gz /libthai-0.1.27.tar.xz /libthai-0.1.28.tar.xz /libthai-0.1.29.tar.xz +/libthai-0.1.30.tar.xz diff --git a/libthai.spec b/libthai.spec index aabb0bb..e254c39 100644 --- a/libthai.spec +++ b/libthai.spec @@ -1,7 +1,7 @@ Summary: Thai language support routines Name: libthai -Version: 0.1.29 -Release: 11%{?dist} +Version: 0.1.30 +Release: 1%{?dist} License: LGPL-2.1-or-later Source: http://linux.thai.net/pub/thailinux/software/libthai/libthai-%{version}.tar.xz Patch0: libthai-0.1.9-multilib.patch @@ -64,6 +64,10 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la %{_libdir}/pkgconfig/* %changelog +* Mon Jan 05 2026 Peng Wu - 0.1.30-1 +- Update to 0.1.30 +- Resolves: RHBZ#2426765 + * Thu Jul 24 2025 Fedora Release Engineering - 0.1.29-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/sources b/sources index ded3452..8f9e768 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libthai-0.1.29.tar.xz) = 0ba1261581a1705a2a2546a3071acb3c63892dbf111f0dad415667165a6b9542a5e4549061c67b11ec53de7c9e70fceb3c04d794fd12a22d991a539dbacebda1 +SHA512 (libthai-0.1.30.tar.xz) = c84d575b6855d54b1ea1d9878a94153ba7807cc736f7bf01327d17a6444c6fd4b18deae2ab5a2612847892c9d94ed4ceb54fbf25244aa6eb88a3605260ad328e From ef30654345e9a7a5097d2e8884fe009ee195d5f0 Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Mon, 5 Jan 2026 13:25:14 +0800 Subject: [PATCH 60/60] Update libthai-0.1.9-multilib.patch --- libthai-0.1.9-multilib.patch | 14 +++++++------- libthai.spec | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libthai-0.1.9-multilib.patch b/libthai-0.1.9-multilib.patch index 58522cf..176fc46 100644 --- a/libthai-0.1.9-multilib.patch +++ b/libthai-0.1.9-multilib.patch @@ -1,9 +1,9 @@ -Index: libthai-0.1.24/doc/Doxyfile.in +Index: libthai-0.1.30/doc/Doxyfile.in =================================================================== ---- libthai-0.1.24.orig/doc/Doxyfile.in -+++ libthai-0.1.24/doc/Doxyfile.in -@@ -1124,7 +1124,7 @@ HTML_HEADER = - # that doxygen normally uses. +--- libthai-0.1.30.orig/doc/Doxyfile.in ++++ libthai-0.1.30/doc/Doxyfile.in +@@ -1432,7 +1432,7 @@ HTML_HEADER = + # that Doxygen normally uses. # This tag requires that the tag GENERATE_HTML is set to YES. -HTML_FOOTER = @@ -11,10 +11,10 @@ Index: libthai-0.1.24/doc/Doxyfile.in # The HTML_STYLESHEET tag can be used to specify a user-defined cascading style # sheet that is used by each HTML page. It can be used to fine-tune the look of -Index: libthai-0.1.24/doc/no_date_footer.html +Index: libthai-0.1.30/doc/no_date_footer.html =================================================================== --- /dev/null -+++ libthai-0.1.24/doc/no_date_footer.html ++++ libthai-0.1.30/doc/no_date_footer.html @@ -0,0 +1,7 @@ +
+Generated for $projectname by