rpms/libthai
6
0
Fork 0
Code Issues Pull Requests Releases Activity

0.1.12

Browse Source
This commit is contained in:
Matthias Clasen 2009-06-27 22:24:09 +00:00
parent c7d9decfb8
commit 211a00bfb9
5 changed files with 56 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.cvsignore
View File

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

44
libthai-0.1.12-libdatrie-0.2.2-static-build.patch Normal file
View File

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

40
libthai-0.1.9-libdatrie-0.1.1-build-static.patch
View File

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

12
libthai.spec
View File

@ -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 <mclasen@redhat.com> - 0.1.12-1
- Update to 0.1.12
* Fri Feb 27 2009 Matthias Clasen <mclasen@redhat.com> - 0.1.9-7
- Fix the build

4
sources
View File

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