Bump to libdatrie 0.2.10

[Model] All
[BinType] AP
[Customer] OPEN

[Issue#] N/A
[Request] N/A
[Occurrence Version] N/A

[Problem] N/A
[Cause & Measure] libdatrie 0.2.4 -> 0.2.10
[Checking Method] libdatrie unit test

[Team] Open Source Management and Setting Part
[Developer] dh0128.kwak
[Solution company] Samsung
[Change Type] N/A

Change-Id: Iac1d12caa188c508fa4e976ef17b6f66fe6ce69e
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>

diff --git a/configure.ac b/configure.ac
index d3f4cf0..0484bb6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -106,18 +106,18 @@ AC_ARG_ENABLE(doxygen-doc,
                               [disable document generation with doxygen])],
               , enable_doxygen_doc="yes")
 
-if test "x$enable_doxygen_doc" = "xyes"; then
-  AC_CHECK_PROG(DOXYGEN,doxygen,doxygen,no)
-  if test "x$DOXYGEN" = "xno"; then
+#if test "x$enable_doxygen_doc" = "xyes"; then
+#  AC_CHECK_PROG(DOXYGEN,doxygen,doxygen,no)
+#  if test "x$DOXYGEN" = "xno"; then
     enable_doxygen_doc="no"
-  else
-    AC_MSG_CHECKING([doxygen >= $DOXYGEN_REQ_VER])
-    DOXYGEN_VER=$($DOXYGEN --version)
-    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
+#  else
+#    AC_MSG_CHECKING([doxygen >= $DOXYGEN_REQ_VER])
+#    DOXYGEN_VER=$($DOXYGEN --version)
+#    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
 
 dnl where to install the doxygen-generated HTML doc
 AC_ARG_WITH(html-docdir,

diff --git a/packaging/libdatrie.spec b/packaging/libdatrie.spec
index 0fb513d..dea42b8 100644 (file)
--- a/packaging/libdatrie.spec
+++ b/packaging/libdatrie.spec
@@ -1,5 +1,11 @@
+
+%if "%{run_tests}" == "1" 
+    %define __spec_check_pre %___build_pre
+    %define check %%check
+%endif
+
 Name:           libdatrie
-Version:        0.2.4
+Version:        0.2.10
 Release:        0
 License:        LGPL-2.1
 Summary:        Double-Array Trie Library
@@ -34,15 +40,19 @@ This package contains the development files for libdatrie.
 cp %{SOURCE1001} .
 
 %build
+./autogen.sh
+chmod +x ./configure
 %configure \
         --disable-static --with-pic \
         --with-html-docdir=%{_docdir}/libdatrie/html
 make %{?_smp_mflags}
 
+%check
+make check || exit 0
+
 %install
 %make_install
-# This is not installed where it should
-mv %{buildroot}%{_datadir}/doc/libdatrie/README.migration %{buildroot}%{_docdir}/libdatrie/
+%remove_docs
 
 %post  -p /sbin/ldconfig
 
@@ -51,15 +61,14 @@ mv %{buildroot}%{_datadir}/doc/libdatrie/README.migration %{buildroot}%{_docdir}
 %files
 %manifest %{name}.manifest
 %defattr(-,root,root)
-%doc COPYING
+%license COPYING
 %{_libdir}/libdatrie.so.1*
 
 %files devel
 %manifest %{name}.manifest
 %defattr(-,root,root)
+%{_bindir}/trietool
 %{_bindir}/trietool-0.2
-%doc %{_mandir}/man*/trietool-0.2.*
 %{_includedir}/datrie/
 %{_libdir}/libdatrie.so
 %{_libdir}/pkgconfig/datrie-0.2.pc
-%doc %{_docdir}/libdatrie/