Skip to content

Commit

Permalink
Reorganized dependent packages
Browse files Browse the repository at this point in the history
  • Loading branch information
Takeshi Nakatani committed Oct 24, 2024
1 parent 71be3d1 commit 17a25d5
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 12 deletions.
2 changes: 1 addition & 1 deletion buildutils/APKBUILD.templ.in
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ makedepends="
util-linux-misc
musl-locales
procps
openssl-dev
@ALP_DEPS_CRYPT_DEV_PKG@
"

install=""
Expand Down
6 changes: 3 additions & 3 deletions buildutils/control.in
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions buildutils/k2hash.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -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@
Expand Down Expand Up @@ -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.
Expand Down
16 changes: 11 additions & 5 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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")

;;
*)
Expand Down

0 comments on commit 17a25d5

Please sign in to comment.