Try to fix multilib issue

This commit is contained in:
Matthias Clasen 2008-03-17 17:40:18 +00:00
parent cccbb8723b
commit ffefb71633
2 changed files with 30 additions and 1 deletions

View File

@ -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 @@
+<hr size="1"><address style="text-align: right;"><small>
+Generated for $projectname by&nbsp;<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

View File

@ -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 <mclasen@redhat.com> - 0.1.9-4
- Attempt to fix multilib conflict
* Mon Feb 18 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0.1.9-3
- Autorebuild for GCC 4.3