Fixes docs build

This commit is contained in:
Peng Wu 2016-04-06 14:49:08 +08:00
parent a5e0b7fca0
commit 75606432e1
2 changed files with 23 additions and 1 deletions

View File

@ -0,0 +1,14 @@
Index: libdatrie-0.2.9/configure.ac
===================================================================
--- libdatrie-0.2.9.orig/configure.ac
+++ libdatrie-0.2.9/configure.ac
@@ -113,7 +113,8 @@ if test "x$enable_doxygen_doc" = "xyes";
else
AC_MSG_CHECKING([doxygen >= $DOXYGEN_REQ_VER])
DOXYGEN_VER=$($DOXYGEN --version)
- if expr $DOXYGEN_VER \< $DOXYGEN_REQ_VER > /dev/null; then
+ AS_VERSION_COMPARE($DOXYGEN_VER, $DOXYGEN_REQ_VER, [HAVE_DOXYGEN=0], [HAVE_DOXYGEN=1], [HAVE_DOXYGEN=1])
+ if [test "$HAVE_DOXYGEN" = "0"]; then
AC_MSG_RESULT([$DOXYGEN_VER, no, documentation disabled])
enable_doxygen_doc="no"
else

View File

@ -1,10 +1,12 @@
Name: libdatrie
Version: 0.2.9
Release: 2%{?dist}
Release: 3%{?dist}
Summary: Implementation of Double-Array structure for representing trie
License: LGPLv2+
URL: http://linux.thai.net/projects/datrie
Source0: http://linux.thai.net/pub/thailinux/software/libthai/%{name}-%{version}.tar.xz
Patch0: libdatrie-fixes-docs.patch
BuildRequires: autoconf, automake, libtool
BuildRequires: doxygen
%description
@ -27,8 +29,10 @@ developing applications that use %{name}.
%prep
%setup -q
%patch0 -p1 -b .docs
%build
autoreconf -f -i -v
#sed -i '/sys_lib_dlsearch_path_spec/s|/usr/lib |/usr/lib /usr/lib64|' configure
%configure --disable-static \
--with-html-docdir=%{_pkgdocdir}-devel
@ -59,8 +63,12 @@ LD_LIBRARY_PATH=../datrie/.libs %make_build check
%{_libdir}/pkgconfig/datrie-0.2.pc
%{_bindir}/trietool*
%{_mandir}/man1/trietool*
%{_pkgdocdir}-devel/*.{html,css,png,js}
%changelog
* Wed Apr 6 2016 Peng Wu <pwu@redhat.com> - 0.2.9-3
- Fixes docs build
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.9-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild