From 2605135c57f1713634444f9ac244deb8433d25152d0021442973316e10dd3b95 Mon Sep 17 00:00:00 2001
From: Adam Majer <amajer@suse.com>
Date: Mon, 19 Feb 2018 09:19:29 +0000
Subject: [PATCH] Accepting request 577713 from home:avindra

- update to version 0.2.10
  * Correctly check doxygen version on configure
  * Optimization on AlphaMap mapping
- remove libdatrie-doxygen-version-check.patch
  * upstreamed in 7db54c662357dba5f109eaf1b24490f46ca23d44
- use https urls

OBS-URL: https://build.opensuse.org/request/show/577713
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libdatrie?expand=0&rev=22
---
 libdatrie-0.2.10.tar.xz               |  3 +++
 libdatrie-0.2.9.tar.xz                |  3 ---
 libdatrie-doxygen-version-check.patch | 18 ------------------
 libdatrie.changes                     | 10 ++++++++++
 libdatrie.spec                        | 21 +++++++--------------
 5 files changed, 20 insertions(+), 35 deletions(-)
 create mode 100644 libdatrie-0.2.10.tar.xz
 delete mode 100644 libdatrie-0.2.9.tar.xz
 delete mode 100644 libdatrie-doxygen-version-check.patch

diff --git a/libdatrie-0.2.10.tar.xz b/libdatrie-0.2.10.tar.xz
new file mode 100644
index 0000000..80b30f9
--- /dev/null
+++ b/libdatrie-0.2.10.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:180eff7b0309ca19a02d5864e744185d715f021398a096fec6cf960f8ebfaa2b
+size 294380
diff --git a/libdatrie-0.2.9.tar.xz b/libdatrie-0.2.9.tar.xz
deleted file mode 100644
index 6a930a1..0000000
--- a/libdatrie-0.2.9.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d980713e7ad8e19cf3b54ee0173782b94332af8e7e4e936dde01d2cd72e1da1d
-size 290940
diff --git a/libdatrie-doxygen-version-check.patch b/libdatrie-doxygen-version-check.patch
deleted file mode 100644
index 88ae997..0000000
--- a/libdatrie-doxygen-version-check.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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 4e3b0cf..0026c5c 100644
--- a/libdatrie.changes
+++ b/libdatrie.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Sun Feb 18 09:31:26 UTC 2018 - avindra@opensuse.org
+
+- update to version 0.2.10
+  * Correctly check doxygen version on configure
+  * Optimization on AlphaMap mapping
+- remove libdatrie-doxygen-version-check.patch
+  * upstreamed in 7db54c662357dba5f109eaf1b24490f46ca23d44
+- use https urls
+
 -------------------------------------------------------------------
 Tue Aug 18 14:48:57 UTC 2015 - pgajdos@suse.com
 
diff --git a/libdatrie.spec b/libdatrie.spec
index d230669..23fc4e9 100644
--- a/libdatrie.spec
+++ b/libdatrie.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libdatrie
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,22 +17,19 @@
 
 
 Name:           libdatrie
-Version:        0.2.9
+Version:        0.2.10
 Release:        0
 Summary:        Double-Array Trie Library
 License:        LGPL-2.1
 Group:          System/Libraries
-Url:            http://linux.thai.net/~thep/datrie/datrie.html
-Source:         http://linux.thai.net/pub/thailinux/software/libthai/%{name}-%{version}.tar.xz
+Url:            https://linux.thai.net/~thep/datrie/datrie.html
+Source:         https://linux.thai.net/pub/thailinux/software/libthai/%{name}-%{version}.tar.xz
 Source99:       baselibs.conf
-# sent upstream (theppitak@gmail.com)
-Patch0:         libdatrie-doxygen-version-check.patch
 BuildRequires:  autoconf-archive
 BuildRequires:  doxygen
 BuildRequires:  libtool
-BuildRequires:  pkg-config
+BuildRequires:  pkgconfig
 BuildRequires:  xz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 This is an implementation of double-array structure for representing
@@ -59,7 +56,6 @@ This package contains the development files for libdatrie.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 autoreconf -fiv
@@ -69,24 +65,21 @@ autoreconf -fiv
 make %{?_smp_mflags}
 
 %install
-%makeinstall
+%make_install
 rm -f %{buildroot}%{_libdir}/libdatrie.la
 # This is not installed where it should
 mv %{buildroot}%{_datadir}/doc/libdatrie/README.migration %{buildroot}%{_docdir}/libdatrie/
 
 %post -n libdatrie1 -p /sbin/ldconfig
-
 %postun -n libdatrie1 -p /sbin/ldconfig
 
 %files -n libdatrie1
-%defattr(-,root,root)
 %doc AUTHORS ChangeLog COPYING README
 %{_libdir}/libdatrie.so.1*
 
 %files devel
-%defattr(-,root,root)
 %{_bindir}/trietool*
-%doc %{_mandir}/man*/trietool*.1.gz
+%{_mandir}/man*/trietool*.1%{ext_man}
 %{_includedir}/datrie/
 %{_libdir}/libdatrie.so
 %{_libdir}/pkgconfig/datrie-0.2.pc