Merge pull request #108 from ggtakec/fix/dep_crypt_pkgs

Reorganized dependent packages

buildutils/APKBUILD.templ.in

@@ -70,7 +70,7 @@ makedepends="
 	util-linux-misc
 	musl-locales
 	procps
-	openssl-dev
+	@ALP_DEPS_CRYPT_DEV_PKG@
 "
 
 install=""

buildutils/control.in

@@ -2,8 +2,8 @@ Source: @PACKAGE_NAME@
 Section: database
 Priority: optional
 Maintainer: @DEV_NAME@ <@DEV_EMAIL@>
-Build-Depends: @DEBHELPER_DEP@, libfullock-dev (>= @LIB_MINVER_LIBFULLOCK@), @DEB_DEPS_CRYPT_PKG@
-Depends: ${misc:Depends}
+Build-Depends: @DEBHELPER_DEP@, libfullock-dev (>= @LIB_MINVER_LIBFULLOCK@), @DEB_DEPS_CRYPT_DEV_PKG@
+Depends: ${misc:Depends}, @DEB_DEPS_CRYPT_PKG@
 Standards-Version: 3.9.8
 Homepage: https://@GIT_DOMAIN@/@GIT_ORG@/@GIT_REPO@
 Vcs-Git: git://@GIT_DOMAIN@/@GIT_ORG@/@[email protected]
@@ -12,7 +12,7 @@ Vcs-Browser: https://@GIT_DOMAIN@/@GIT_ORG@/@GIT_REPO@
 Package: @PACKAGE_NAME@-dev
 Section: devel
 Architecture: amd64
-Depends: ${misc:Depends}, @PACKAGE_NAME@ (= ${binary:Version}), libfullock-dev (>= @LIB_MINVER_LIBFULLOCK@), @DEB_DEPS_CRYPT_PKG@
+Depends: ${misc:Depends}, @PACKAGE_NAME@ (= ${binary:Version}), libfullock-dev (>= @LIB_MINVER_LIBFULLOCK@), @DEB_DEPS_CRYPT_DEV_PKG@
 Description: @SHORTDESC@ (development)
  Development package for building with @PACKAGE_NAME@ shared library.
   This package has header files and symbols for it.

buildutils/k2hash.spec.in

@@ -56,8 +56,8 @@ License: @PKGLICENSE@
 @RPMPKG_GROUP@
 URL: https://@GIT_DOMAIN@/@GIT_ORG@/@PACKAGE_NAME@
 Source0: https://@GIT_DOMAIN@/@GIT_ORG@/@PACKAGE_NAME@/archive/%{gittag}/%{name}-%{version}.tar.gz
-Requires: libfullock%{?_isa} >= @LIB_MINVER_LIBFULLOCK@
-BuildRequires: git-core gcc-c++ make libtool libfullock-devel >= @LIB_MINVER_LIBFULLOCK@ @RPM_DEPS_CRYPT_PKG@
+Requires: libfullock%{?_isa} >= @LIB_MINVER_LIBFULLOCK@ @RPM_DEPS_CRYPT_PKG@
+BuildRequires: git-core gcc-c++ make libtool libfullock-devel >= @LIB_MINVER_LIBFULLOCK@ @RPM_DEPS_CRYPT_DEV_PKG@
 
 %description
 @LONGDESC@
@@ -108,7 +108,7 @@ rm -rf %{buildroot}
 #
 %package devel
 Summary: @SHORTDESC@ (development)
-Requires: %{name}%{?_isa} = %{version}-%{release}, libfullock-devel%{?_isa} >= @LIB_MINVER_LIBFULLOCK@, @RPM_DEPS_CRYPT_PKG@
+Requires: %{name}%{?_isa} = %{version}-%{release}, libfullock-devel%{?_isa} >= @LIB_MINVER_LIBFULLOCK@, @RPM_DEPS_CRYPT_DEV_PKG@
 
 %description devel
 Development package for building with @PACKAGE_NAME@ shared library.

configure.ac

@@ -225,8 +225,11 @@ case "${crypt_lib}" in
 		#
 		# Depends Crypt library for packaging
 		#
-		AC_SUBST([DEB_DEPS_CRYPT_PKG], "libssl-dev")
-		AC_SUBST([RPM_DEPS_CRYPT_PKG], "openssl-devel")
+		AC_SUBST([DEB_DEPS_CRYPT_PKG],     "libssl3")
+		AC_SUBST([DEB_DEPS_CRYPT_DEV_PKG], "libssl-dev")
+		AC_SUBST([RPM_DEPS_CRYPT_PKG],     "openssl-libs")
+		AC_SUBST([RPM_DEPS_CRYPT_DEV_PKG], "openssl-devel")
+		AC_SUBST([ALP_DEPS_CRYPT_DEV_PKG], "openssl-dev")
 
 		;;
 	nss)
@@ -239,7 +242,8 @@ case "${crypt_lib}" in
 		#
 		# Depends Crypt library for packaging
 		#
-		AC_SUBST([RPM_DEPS_CRYPT_PKG], "nss-devel")
+		AC_SUBST([RPM_DEPS_CRYPT_PKG],     "nss")
+		AC_SUBST([RPM_DEPS_CRYPT_DEV_PKG], "nss-devel")
 
 		;;
 	nettle)
@@ -252,7 +256,8 @@ case "${crypt_lib}" in
 		#
 		# Depends Crypt library for packaging
 		#
-		AC_SUBST([RPM_DEPS_CRYPT_PKG], "nettle-devel")
+		AC_SUBST([RPM_DEPS_CRYPT_PKG],     "nettle")
+		AC_SUBST([RPM_DEPS_CRYPT_DEV_PKG], "nettle-devel")
 
 		;;
 	gcrypt)
@@ -271,7 +276,8 @@ case "${crypt_lib}" in
 		#
 		# Depends Crypt library for packaging
 		#
-		AC_SUBST([DEB_DEPS_CRYPT_PKG], "libgcrypt20-dev")
+		AC_SUBST([DEB_DEPS_CRYPT_PKG],     "libgcrypt20")
+		AC_SUBST([DEB_DEPS_CRYPT_DEV_PKG], "libgcrypt20-dev")
 
 		;;
 	*)