From ffefb71633d9181e223dc8adf62fff4b145c1c13 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 17 Mar 2008 17:40:18 +0000 Subject: [PATCH] Try to fix multilib issue --- libthai-0.1.9-multilib.patch | 24 ++++++++++++++++++++++++ libthai.spec | 7 ++++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 libthai-0.1.9-multilib.patch diff --git a/libthai-0.1.9-multilib.patch b/libthai-0.1.9-multilib.patch new file mode 100644 index 0000000..57cd61a --- /dev/null +++ b/libthai-0.1.9-multilib.patch @@ -0,0 +1,24 @@ +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 @@ ++
++Generated for $projectname by doxygen ++$doxygenversion
++ ++ ++ ++ +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 c9edeff..e080005 100644 --- a/libthai.spec +++ b/libthai.spec @@ -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 @@ libthai. %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 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/* %changelog +* Mon Mar 17 2008 Matthias Clasen - 0.1.9-4 +- Attempt to fix multilib conflict + * Mon Feb 18 2008 Fedora Release Engineering - 0.1.9-3 - Autorebuild for GCC 4.3