[packages/postfix] fix cdb bcond and make cdb an optional package
jajcus
jajcus at pld-linux.org
Wed Oct 17 14:41:20 CEST 2018
commit 53dec433dea3a048a6e9a030ed78fa8be54d3c35
Author: Jacek Konieczny <j.konieczny at eggsoft.pl>
Date: Wed Oct 17 14:21:50 2018 +0200
fix cdb bcond and make cdb an optional package
postfix-no_cdb.patch | 11 -----------
postfix.spec | 20 +++++++++++++++++---
2 files changed, 17 insertions(+), 14 deletions(-)
---
diff --git a/postfix.spec b/postfix.spec
index 115286d..4e0e988 100644
--- a/postfix.spec
+++ b/postfix.spec
@@ -65,7 +65,6 @@ Patch8: %{name}-dictname.patch
Patch11: %{name}-scache_clnt.patch
Patch12: format-security.patch
-Patch13: %{name}-no_cdb.patch
URL: http://www.postfix.org/
%{?with_sasl:BuildRequires: cyrus-sasl-devel}
BuildRequires: db-devel
@@ -245,6 +244,18 @@ This package provides support for LMDB maps in Postfix.
%description dict-lmdb -l pl.UTF-8
Ten pakiet dodaje obsługę map LMDB do Postfiksa.
+%package dict-cdb
+Summary: CDB map support for Postfix
+Summary(pl.UTF-8): Obsługa map CDB dla Postfiksa
+Group: Networking/Daemons/SMTP
+Requires: %{name} = %{epoch}:%{version}-%{release}
+
+%description dict-cdb
+This package provides support for CDB maps in Postfix.
+
+%description dict-cdb -l pl.UTF-8
+Ten pakiet dodaje obsługę map CDB do Postfiksa.
+
%package qshape
Summary: qshape - Print Postfix queue domain and age distribution
Summary(pl.UTF-8): qshape - wypisywanie rozkładu domen i wieku z kolejki Postfiksa
@@ -301,7 +312,6 @@ sed -i '/scache_clnt_create/s/server/var_scache_service/' src/global/scache_clnt
%if %{with vda}
%patch12 -p1
%endif
-%{!?with_cdb:%patch13 -p1}
%if %{with tcp}
sed -i 's/ifdef SNAPSHOT/if 1/' src/util/dict_open.c
@@ -484,7 +494,6 @@ fi
%attr(755,root,root) %{_libdir}/postfix/oqmgr
%attr(755,root,root) %{_libdir}/postfix/pickup
%attr(755,root,root) %{_libdir}/postfix/pipe
-%attr(755,root,root) %{_libdir}/postfix/postfix-cdb.so
%attr(755,root,root) %{_libdir}/postfix/postfix-script
%attr(755,root,root) %{_libdir}/postfix/postfix-tls-script
%attr(755,root,root) %{_libdir}/postfix/postfix-wrapper
@@ -589,6 +598,11 @@ fi
%{_mandir}/man5/lmdb_table.5*
%endif
+%if %{with cdb}
+%files dict-cdb
+%attr(755,root,root) %{_libdir}/postfix/postfix-cdb.so
+%endif
+
%files qshape
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/qshape
diff --git a/postfix-no_cdb.patch b/postfix-no_cdb.patch
deleted file mode 100644
index 10a46a3..0000000
--- a/postfix-no_cdb.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- postfix-2.11.5.orig/src/util/Makefile.in.orig 2015-08-11 13:48:16.897867369 +0200
-+++ postfix-2.11.5/src/util/Makefile.in 2015-08-11 13:54:19.074562492 +0200
-@@ -137,7 +137,7 @@
- gcc -shared -Wl,-soname,dict_pcre.so -o $@ $? -lpcre -L. -lutil
-
- $(LIB): $(OBJS)
-- gcc -shared -Wl,-soname,libpostfix-util.so.1 -o $(LIB) $(OBJS) -ldl -lcdb -lnsl -ldb
-+ gcc -shared -Wl,-soname,libpostfix-util.so.1 -o $(LIB) $(OBJS) -ldl -lnsl -ldb
-
- $(LIB_DIR)/$(LIB): $(LIB)
- cp $(LIB) $(LIB_DIR)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/postfix.git/commitdiff/39c262fff5a4849aa28ef826fddbeb13ef43d803
More information about the pld-cvs-commit
mailing list