fix cdb bcond and make cdb an optional package

diff --git a/postfix-no_cdb.patch b/postfix-no_cdb.patch
deleted file mode 100644 (file)
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)

diff --git a/postfix.spec b/postfix.spec
index 115286d88079e4a0eb85314a7d948da873bce6a7..4e0e9881062ff738025764b956036a55259d8710 100644 (file)
--- a/postfix.spec
+++ b/postfix.spec
@@ -65,7 +65,6 @@ Patch8:               %{name}-dictname.patch
 
 Patch11:       %{name}-scache_clnt.patch
 Patch12:       format-security.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
 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.
 
 %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
 %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
 %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
 
 %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/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
 %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
 
 %{_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
 %files qshape
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qshape