diff --git a/buildutils/APKBUILD.templ.in b/buildutils/APKBUILD.templ.in index a379682..a240f71 100644 --- a/buildutils/APKBUILD.templ.in +++ b/buildutils/APKBUILD.templ.in @@ -55,7 +55,9 @@ url="https://k2hash.antpick.ax/" arch="x86_64" license="MIT" -depends="" +depends=" + libfullock +" depends_dev=" libfullock-dev " diff --git a/buildutils/Makefile.am b/buildutils/Makefile.am index 55165d6..5232ae0 100644 --- a/buildutils/Makefile.am +++ b/buildutils/Makefile.am @@ -31,8 +31,7 @@ EXTRA_DIST =make_variables.sh \ make_description.sh \ debian_build.sh \ rpm_build.sh \ - alpine_build.sh \ - k2hash.postinst + alpine_build.sh # # Local variables: diff --git a/buildutils/k2hash.postinst b/buildutils/k2hash.postinst deleted file mode 100644 index 341a15f..0000000 --- a/buildutils/k2hash.postinst +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -# -# K2HASH -# -# Copyright 2013 Yahoo Japan Corporation. -# -# K2HASH is key-valuew store base libraries. -# K2HASH is made for the purpose of the construction of -# original KVS system and the offer of the library. -# The characteristic is this KVS library which Key can -# layer. And can support multi-processing and multi-thread, -# and is provided safely as available KVS. -# -# For the full copyright and license information, please view -# the license file that was distributed with this source code. -# -# AUTHOR: Takeshi Nakatani -# CREATE: Mon, Aug 16 2021 -# REVISION: -# - -# -# Create /var/lib/antpickax directory -# -mkdir -p /var/lib/antpickax -chmod 0777 /var/lib/antpickax - -# -# Local variables: -# tab-width: 4 -# c-basic-offset: 4 -# End: -# vim600: noexpandtab sw=4 ts=4 fdm=marker -# vim<600: noexpandtab sw=4 ts=4 -# diff --git a/buildutils/k2hash.spec.in b/buildutils/k2hash.spec.in index ed01ba8..498eb41 100644 --- a/buildutils/k2hash.spec.in +++ b/buildutils/k2hash.spec.in @@ -73,7 +73,6 @@ BuildRequires: git-core gcc-c++ make libtool libfullock-devel >= @LIB_MINVER_LIB %install %make_install find %{buildroot} -name '*.la' -exec rm -f {} ';' -mkdir -p %{buildroot}/var/lib/antpickax %if %{make_check} %check @@ -103,7 +102,6 @@ rm -rf %{buildroot} %{_libdir}/*.so.1* %{_mandir}/man1/* %{_bindir}/* -%dir %attr(0777,root,root) /var/lib/antpickax # # devel package diff --git a/configure.ac b/configure.ac index d5bcff6..ff5e0e3 100644 --- a/configure.ac +++ b/configure.ac @@ -288,7 +288,7 @@ AM_CONDITIONAL([IS_OPENSSL3], [test "$is_openssl3" = yes]) # # Version list for Libraries # -AC_SUBST([LIB_MINVER_LIBFULLOCK], "1.0.60") +AC_SUBST([LIB_MINVER_LIBFULLOCK], "1.0.61") # # Checking Libraries @@ -303,7 +303,7 @@ AC_ARG_ENABLE(check-depend-libs, esac] ) AS_IF([test ${check_depend_libs} = 1], [AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no)]) -AS_IF([test ${check_depend_libs} = 1], [PKG_CHECK_MODULES([fullock], [libfullock >= 1.0.60], [], [AC_MSG_ERROR(not found libfullock package)])]) +AS_IF([test ${check_depend_libs} = 1], [PKG_CHECK_MODULES([fullock], [libfullock >= 1.0.61], [], [AC_MSG_ERROR(not found libfullock package)])]) # # CFLAGS/CXXFLAGS