diff --git a/libdatrie-0.2.8.tar.xz b/libdatrie-0.2.8.tar.xz deleted file mode 100644 index b944825..0000000 --- a/libdatrie-0.2.8.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6a14d55c5687fc325216fffb5db0cf55d31b108cce65314a6d5c8042417ab7c2 -size 286428 diff --git a/libdatrie-0.2.9.tar.xz b/libdatrie-0.2.9.tar.xz new file mode 100644 index 0000000..6a930a1 --- /dev/null +++ b/libdatrie-0.2.9.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d980713e7ad8e19cf3b54ee0173782b94332af8e7e4e936dde01d2cd72e1da1d +size 290940 diff --git a/libdatrie-doxygen-found-is-enough.patch b/libdatrie-doxygen-found-is-enough.patch deleted file mode 100644 index f679219..0000000 --- a/libdatrie-doxygen-found-is-enough.patch +++ /dev/null @@ -1,18 +0,0 @@ -Index: libdatrie-0.2.8/configure.ac -=================================================================== ---- libdatrie-0.2.8.orig/configure.ac -+++ libdatrie-0.2.8/configure.ac -@@ -112,12 +112,7 @@ 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 -- AC_MSG_RESULT([$DOXYGEN_VER, no, documentation disabled]) -- enable_doxygen_doc="no" -- else -- AC_MSG_RESULT([$DOXYGEN_VER, yes]) -- fi -+ AC_MSG_RESULT([$DOXYGEN_VER, yes]) - fi - fi - diff --git a/libdatrie-doxygen-version-check.patch b/libdatrie-doxygen-version-check.patch new file mode 100644 index 0000000..88ae997 --- /dev/null +++ b/libdatrie-doxygen-version-check.patch @@ -0,0 +1,18 @@ +--- libdatrie-0.2.8/configure.ac 2014-01-10 05:20:37.000000000 +0100 ++++ libdatrie-0.2.8/configure.ac 2015-08-18 16:42:15.274113614 +0200 +@@ -112,12 +112,9 @@ 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 +- AC_MSG_RESULT([$DOXYGEN_VER, no, documentation disabled]) +- enable_doxygen_doc="no" +- else +- AC_MSG_RESULT([$DOXYGEN_VER, yes]) +- fi ++ AX_COMPARE_VERSION([$DOXYGEN_VER],[ge],[DOXYGEN_REQ_VER], ++ [AC_MSG_RESULT([$DOXYGEN_VER, yes])], ++ [AC_MSG_RESULT([$DOXYGEN_VER, no, documentation disabled]); enable_doxygen_doc="no"]) + fi + fi + diff --git a/libdatrie.changes b/libdatrie.changes index 02c3edd..4e3b0cf 100644 --- a/libdatrie.changes +++ b/libdatrie.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Tue Aug 18 14:48:57 UTC 2015 - pgajdos@suse.com + +- update to version 0.2.9 + * Fix infinite loop on empty trie iteration. + * Document about alphabet size. + * Disable timestamp in Doxygen-generated doc. + * etc. see ChangeLog +- remove libdatrie-doxygen-found-is-enough.patch in favour of + libdatrie-doxygen-version-check.patch + ------------------------------------------------------------------- Tue Aug 18 11:28:57 UTC 2015 - dimstar@opensuse.org diff --git a/libdatrie.spec b/libdatrie.spec index baa64e2..f346d25 100644 --- a/libdatrie.spec +++ b/libdatrie.spec @@ -17,7 +17,7 @@ Name: libdatrie -Version: 0.2.8 +Version: 0.2.9 Release: 0 Summary: Double-Array Trie Library License: LGPL-2.1 @@ -25,8 +25,10 @@ Group: System/Libraries Url: http://linux.thai.net/~thep/datrie/datrie.html Source: ftp://linux.thai.net/pub/ThaiLinux/software/libthai/%{name}-%{version}.tar.xz Source99: baselibs.conf -Patch0: libdatrie-doxygen-found-is-enough.patch -BuildRequires: doxygen >= 1.8.4 +# sent upstream (theppitak@gmail.com) +Patch0: libdatrie-doxygen-version-check.patch +BuildRequires: autoconf-archive +BuildRequires: doxygen BuildRequires: libtool BuildRequires: pkg-config BuildRequires: xz @@ -83,8 +85,8 @@ mv %{buildroot}%{_datadir}/doc/libdatrie/README.migration %{buildroot}%{_docdir} %files devel %defattr(-,root,root) -%{_bindir}/trietool-0.2 -%doc %{_mandir}/man*/trietool-0.2.* +%{_bindir}/trietool* +%doc %{_mandir}/man*/trietool*.1.gz %{_includedir}/datrie/ %{_libdir}/libdatrie.so %{_libdir}/pkgconfig/datrie-0.2.pc