rpms/libthai/devel libthai-0.1.9-multilib.patch, NONE, 1.1 libthai.spec, 1.7, 1.8

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/libthai/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30469

Modified Files:
	libthai.spec 
Added Files:
	libthai-0.1.9-multilib.patch 
Log Message:
Try to fix multilib issue


libthai-0.1.9-multilib.patch:

--- NEW FILE libthai-0.1.9-multilib.patch ---
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 @@
+<hr size="1"><address style="text-align: right;"><small>
+Generated for $projectname by <a href="http://www.doxygen.org/
+index.html"><img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 
+$doxygenversion</small></address>
+</body>
+</html>
+
+
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


Index: libthai.spec
===================================================================
RCS file: /cvs/extras/rpms/libthai/devel/libthai.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libthai.spec	18 Feb 2008 21:06:35 -0000	1.7
+++ libthai.spec	17 Mar 2008 17:40:18 -0000	1.8
@@ -4,13 +4,14 @@
 Summary:  Thai language support routines
 Name: libthai
 Version: 0.1.9
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPL
 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
 Patch1: libthai-0.1.9-doxygen-segfault.patch
+Patch2: libthai-0.1.9-multilib.patch
 URL: http://linux.thai.net
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
@@ -43,6 +44,7 @@
 %setup -q -n %{name}-%{version} -a 1
 %patch -p1 -b .static-build
 %patch1 -p1 -b .doxygen-segfault
+%patch2 -p1 -b .multilib
 
 %build
 
@@ -110,6 +112,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Mar 17 2008 Matthias Clasen <mclasen at redhat.com> - 0.1.9-4
+- Attempt to fix multilib conflict
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.1.9-3
 - Autorebuild for GCC 4.3