rpms/libthai/devel libthai-libdatrie-static-build.patch, NONE, 1.1 libthai.spec, 1.14, 1.15 libthai-0.1.12-libdatrie-0.2.2-static-build.patch, 1.1, NONE

[Behdad Esfahbod]

Author: behdad

Update of /cvs/pkgs/rpms/libthai/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15368

Modified Files:
	libthai.spec 
Added Files:
	libthai-libdatrie-static-build.patch 
Removed Files:
	libthai-0.1.12-libdatrie-0.2.2-static-build.patch 
Log Message:
* Wed Mar  3 2010 Behdad Esfahbod <behdad at redhat.com> - 0.1.14-3 
- Update to 0.1.14 


libthai-libdatrie-static-build.patch:
 libdatrie/datrie/Makefile.am |    2 +-
 libthai.pc.in                |    1 -
 src/Makefile.am              |    3 ++-
 src/thbrk/Makefile.am        |    1 -
 4 files changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE libthai-libdatrie-static-build.patch ---
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
@@ -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)
 


Index: libthai.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libthai/devel/libthai.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- libthai.spec	3 Mar 2010 22:45:44 -0000	1.14
+++ libthai.spec	3 Mar 2010 23:00:11 -0000	1.15
@@ -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 <behdad at redhat.com> - 0.1.14-2
+* Wed Mar  3 2010 Behdad Esfahbod <behdad at redhat.com> - 0.1.14-3
 - Update to 0.1.14
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.12-2


--- libthai-0.1.12-libdatrie-0.2.2-static-build.patch DELETED ---