!5 Decouple the deprecated package tinycdb by removing subpackage postfix-cdb

From: @caodongxia
Reviewed-by: @zengwefeng
Signed-off-by: @zengwefeng
This commit is contained in:
openeuler-ci-bot 2021-02-05 19:18:45 +08:00 committed by Gitee
commit 9734f014df

View File

@ -23,10 +23,10 @@
Name: postfix Name: postfix
Summary: Postfix Mail Transport Agent Summary: Postfix Mail Transport Agent
Version: 3.3.1 Version: 3.3.1
Release: 11 Release: 12
Epoch: 2 Epoch: 2
URL: http://www.postfix.org URL: http://www.postfix.org
License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+) License: (IPL-1.0 and GPLv2+) or (EPL-2.0 and GPLv2+)
Source0: ftp://ftp.porcupine.org/mirrors/postfix-release/official/%{name}-%{version}.tar.gz Source0: ftp://ftp.porcupine.org/mirrors/postfix-release/official/%{name}-%{version}.tar.gz
Source1: postfix-etc-init.d-postfix Source1: postfix-etc-init.d-postfix
Source2: postfix.service Source2: postfix.service
@ -46,7 +46,7 @@ Patch7: fix-postfix-build-failed.patch
Patch8: fix-build-error-with_glibc2.30-ftbfs.patch Patch8: fix-build-error-with_glibc2.30-ftbfs.patch
BuildRequires: libdb-devel perl-generators pkgconfig zlib-devel systemd-units libicu-devel libnsl2-devel gcc m4 openldap-devel BuildRequires: libdb-devel perl-generators pkgconfig zlib-devel systemd-units libicu-devel libnsl2-devel gcc m4 openldap-devel
BuildRequires: cyrus-sasl-devel pcre-devel mariadb-connector-c-devel postgresql-devel sqlite-devel tinycdb-devel openssl-devel procps-ng BuildRequires: cyrus-sasl-devel pcre-devel mariadb-connector-c-devel postgresql-devel sqlite-devel openssl-devel procps-ng
Requires(post): systemd-sysv %{_sbindir}/alternatives %{_bindir}/openssl Requires(post): systemd-sysv %{_sbindir}/alternatives %{_bindir}/openssl
Requires(pre): %{_sbindir}/groupadd %{_sbindir}/useradd Requires(pre): %{_sbindir}/groupadd %{_sbindir}/useradd
Requires(preun): %{_sbindir}/alternatives Requires(preun): %{_sbindir}/alternatives
@ -94,14 +94,6 @@ Requires: %{name} = %{epoch}:%{version}-%{release}
This provides support for PostgreSQL maps in Postfix. If you plan to use This provides support for PostgreSQL maps in Postfix. If you plan to use
PostgreSQL maps with Postfix, you need this. PostgreSQL maps with Postfix, you need this.
%package cdb
Summary: Postfix CDB map support
Requires: %{name} = %{epoch}:%{version}-%{release}
%description cdb
This provides support for CDB maps in Postfix. If you plan to use CDB
maps with Postfix, you need this.
%package_help %package_help
%prep %prep
@ -145,8 +137,6 @@ CCARGS="${CCARGS} -DHAS_PGSQL -I%{_includedir}/pgsql"
AUXLIBS_PGSQL="-lpq" AUXLIBS_PGSQL="-lpq"
CCARGS="${CCARGS} -DHAS_SQLITE `pkg-config --cflags sqlite3`" CCARGS="${CCARGS} -DHAS_SQLITE `pkg-config --cflags sqlite3`"
AUXLIBS_SQLITE="`pkg-config --libs sqlite3`" AUXLIBS_SQLITE="`pkg-config --libs sqlite3`"
CCARGS="${CCARGS} -DHAS_CDB `pkg-config --cflags libcdb`"
AUXLIBS_CDB="`pkg-config --libs libcdb`"
CCARGS="${CCARGS} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I%{_includedir}/sasl" CCARGS="${CCARGS} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I%{_includedir}/sasl"
AUXLIBS="${AUXLIBS} -L%{_libdir}/sasl2 -lsasl2" AUXLIBS="${AUXLIBS} -L%{_libdir}/sasl2 -lsasl2"
@ -276,7 +266,7 @@ function split_file
} }
pushd %{buildroot}%{postfix_config_dir} pushd %{buildroot}%{postfix_config_dir}
for map in mysql pgsql sqlite cdb ldap pcre; do for map in mysql pgsql sqlite ldap pcre; do
rm -f dynamicmaps.cf.d/"$map" "postfix-files.d/$map" rm -f dynamicmaps.cf.d/"$map" "postfix-files.d/$map"
split_file "^\s*$map\b" "$map" dynamicmaps.cf split_file "^\s*$map\b" "$map" dynamicmaps.cf
sed -i "s|postfix-$map\\.so|%{postfix_shlib_dir}/\\0|" "dynamicmaps.cf.d/$map" sed -i "s|postfix-$map\\.so|%{postfix_shlib_dir}/\\0|" "dynamicmaps.cf.d/$map"
@ -477,12 +467,6 @@ fi
%{postfix_config_dir}/postfix-files.d/pgsql %{postfix_config_dir}/postfix-files.d/pgsql
%{postfix_shlib_dir}/postfix-pgsql.so %{postfix_shlib_dir}/postfix-pgsql.so
%files cdb
%defattr(-,root,root)
%{postfix_config_dir}/dynamicmaps.cf.d/cdb
%{postfix_config_dir}/postfix-files.d/cdb
%{postfix_shlib_dir}/postfix-cdb.so
%files help %files help
%defattr(-,root,root) %defattr(-,root,root)
%{_mandir}/man1/qshape* %{_mandir}/man1/qshape*
@ -506,6 +490,9 @@ fi
%{postfix_doc_dir}/README_FILES/* %{postfix_doc_dir}/README_FILES/*
%changelog %changelog
* Fri Feb 05 2021 caodongxia <caodongxia@huawei.com> - 2:3.3.1-12
- Decouple the deprecated package tinycdb by removing subpackage postfix-cdb
* Thu Jul 30 2020 gaihuiying <gaihuiying1@huawei.com> - 2:3.3.1-11 * Thu Jul 30 2020 gaihuiying <gaihuiying1@huawei.com> - 2:3.3.1-11
- Type:bugfix - Type:bugfix
- ID:NA - ID:NA