packages: mutt/mutt.spec, mutt/mutt-db.patch (NEW)=?UTF-8?Q?=20?=- properly handle db/gdb...
qboosh
qboosh at pld-linux.org
Sat Apr 7 07:50:48 CEST 2012
Author: qboosh Date: Sat Apr 7 05:50:48 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- properly handle db/gdbm/qdbm/tokyocabinet selection; don't "BR'em all"
- added db patch to detect db>4.6 and avoid using -L/usr/lib
---- Files affected:
packages/mutt:
mutt.spec (1.245 -> 1.246) , mutt-db.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/mutt/mutt.spec
diff -u packages/mutt/mutt.spec:1.245 packages/mutt/mutt.spec:1.246
--- packages/mutt/mutt.spec:1.245 Thu Apr 5 10:20:15 2012
+++ packages/mutt/mutt.spec Sat Apr 7 07:50:43 2012
@@ -1,6 +1,7 @@
# $Revision$, $Date$
#
# TODO:
+# - gss/heimdal
# - finish -folder_columns.patch
#
# Conditional build:
@@ -10,7 +11,13 @@
%bcond_with imap_recent # show IMAP RECENT messages as new (instead of UNSEEN)
%bcond_without sasl # don't use sasl
%bcond_without home_etc # don't use home_etc
+%bcond_with gdbm # use GDBM instead of BerkeleyDB
+%bcond_with qdbm # use QDBM instead of BerkeleyDB
+%bcond_with tokyocabinet # use TokyoCabinet instead of BerkeleyDB
#
+%if %{without gdbm} && %{without qdbm} && %{without tokyocabinet}
+%define with_bdb 1
+%endif
Summary: The Mutt Mail User Agent
Summary(de.UTF-8): Der Mutt Mail-User-Agent
Summary(es.UTF-8): Mutt, cliente de correo electrónico
@@ -23,7 +30,7 @@
Summary(uk.UTF-8): Поштова клієнтська програма Mutt
Name: mutt
Version: 1.5.21
-Release: 8
+Release: 9
Epoch: 6
License: GPL v2+
Group: Applications/Mail
@@ -60,26 +67,26 @@
Patch21: %{name}-smime.rc.patch
Patch22: %{name}-sidebar.patch
Patch23: %{name}-imap_fast_trash.patch
+Patch24: %{name}-db.patch
URL: http://www.mutt.org/
-BuildRequires: autoconf
-BuildRequires: automake
+BuildRequires: autoconf >= 2.54
+BuildRequires: automake >= 1.6
%{?with_sasl:BuildRequires: cyrus-sasl-devel >= 2.1.0}
-BuildRequires: db-devel >= 4.0
-BuildRequires: db4.7-devel
+%{?with_bdb:BuildRequires: db-devel >= 4.0}
BuildRequires: docbook-dtd42-xml
BuildRequires: docbook-style-xsl
-BuildRequires: gdbm-devel
+%{?with_gdbm:BuildRequires: gdbm-devel}
BuildRequires: gettext-devel
-BuildRequires: gpgme-devel >= 1:1.1.0
+BuildRequires: gpgme-devel >= 1:1.1.1
%{?with_home_etc:BuildRequires: home-etc-devel >= 1.0.8}
BuildRequires: libidn-devel
BuildRequires: libxslt-progs
BuildRequires: lynx
%{!?with_slang:BuildRequires: ncurses-devel >= 5.0}
BuildRequires: openssl-devel >= 0.9.7d
-BuildRequires: qdbm-devel
+%{?with_qdbm:BuildRequires: qdbm-devel}
%{?with_slang:BuildRequires: slang-devel}
-BuildRequires: tokyocabinet-devel
+%{?with_tokyocabinet:BuildRequires: tokyocabinet-devel}
Requires: iconv
Suggests: mailcap
%{?with_home_etc:Conflicts: home-etc < 1.0.8}
@@ -169,9 +176,10 @@
%patch21 -p1
%patch22 -p1
%patch23 -p1
+%patch24 -p1
# force regeneration (manual.sgml is modified by some patches)
-rm -f doc/{manual*.html,manual.txt}
+%{__rm} doc/{manual*.html,manual.txt}
%build
%{__aclocal} -I m4
@@ -192,17 +200,19 @@
%{?with_nntp:--enable-nntp} \
--enable-pop \
--enable-smtp \
- --with-bdb=/usr \
- --without-gdbm \
+ %{?with_bdb:--with-bdb=/usr} \
%{!?with_slang:--with-curses} \
--with-docdir=%{_docdir}/%{name} \
+ %{?with_gdbm:--with-gdbm} \
%{?with_home_etc:--with-home-etc} \
--with-mailpath=/var/mail \
--with-mixmaster \
+ %{?with_qdbm:--with-qdbm} \
--with-regex \
%{?with_sasl:--with-sasl} \
%{?with_slang:--with-slang} \
- --with-ssl
+ --with-ssl \
+ %{?with_tokyocabinet:--with-tokyocabinet}
%{__make} -j1 -C doc
%{__make}
@@ -234,12 +244,12 @@
EOF
# keep manual.txt.gz, the rest is installed as %doc
-rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}/[!m]*
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}/[!m]*
# conflict with qmail
-rm -f $RPM_BUILD_ROOT%{_mandir}/man5/mbox.5*
-
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/mime.types
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man5/mbox.5*
+# belongs to mailcap
+%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/mime.types
%find_lang %{name}
@@ -261,10 +271,14 @@
%attr(2755,root,mail) %{_bindir}/mutt_dotlock
%{_docdir}/%{name}
-%{_desktopdir}/*.desktop
+%{_desktopdir}/mutt.desktop
%{_pixmapsdir}/mutt.png
-%{_mandir}/man*/*
-%lang(pl) %{_mandir}/pl/man*/*
+%{_mandir}/man1/flea.1*
+%{_mandir}/man1/mutt*.1*
+%{_mandir}/man1/smime_keys.1*
+%{_mandir}/man5/mmdf.5*
+%{_mandir}/man5/muttrc.5*
+%lang(pl) %{_mandir}/pl/man1/*
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -272,6 +286,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.246 2012/04/07 05:50:43 qboosh
+- properly handle db/gdbm/qdbm/tokyocabinet selection; don't "BR'em all"
+- added db patch to detect db>4.6 and avoid using -L/usr/lib
+
Revision 1.245 2012/04/05 08:20:15 hawk
- revert last commit
================================================================
Index: packages/mutt/mutt-db.patch
diff -u /dev/null packages/mutt/mutt-db.patch:1.1
--- /dev/null Sat Apr 7 07:50:48 2012
+++ packages/mutt/mutt-db.patch Sat Apr 7 07:50:43 2012
@@ -0,0 +1,38 @@
+--- mutt-1.5.21/configure.ac.orig 2012-04-06 17:33:23.905605556 +0200
++++ mutt-1.5.21/configure.ac 2012-04-07 07:42:20.793977750 +0200
+@@ -989,20 +989,20 @@
+ bdbpfx="$bdbpfx $d/$v"
+ done
+ done
+- BDB_VERSIONS="db-4 db4 db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db ''"
++ BDB_VERSIONS="db-5.3 db-5.2 db-5.1 db-5.0 db-5 db5 db-4.7 db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4 db4 db ''"
+ AC_MSG_CHECKING([for BerkeleyDB > 4.0])
+ for d in $bdbpfx; do
+ BDB_INCLUDE_DIR=""
+- BDB_LIB_DIR=""
++ BDB_LIB_L=""
+ for v in / $BDB_VERSIONS; do
+ if test -r "$d/include/$v/db.h"; then
+ BDB_INCLUDE_DIR="$d/include/$v"
+- for bdblibdir in "$d/lib/$v" "$d/lib"; do
+- test -d "$bdblibdir" || continue
+- BDB_LIB_DIR="$bdblibdir"
++ for bdblibdir in '' "$d/lib/$v" "$d/lib"; do
++ test -z "$bdblibdir" -o -d "$bdblibdir" || continue
++ BDB_LIB_L="${bdblibdir:+-L$bdblibdir}"
+ for l in `echo $BDB_VERSIONS`; do
+ CPPFLAGS="$OLDCPPFLAGS -I$BDB_INCLUDE_DIR"
+- LIBS="$OLDLIBS -L$BDB_LIB_DIR -l$l"
++ LIBS="$OLDLIBS $BDB_LIB_L -l$l"
+ AC_TRY_LINK([
+ #include <stdlib.h>
+ #include <db.h>
+@@ -1025,7 +1025,7 @@
+ then
+ AC_MSG_RESULT(yes)
+ CPPFLAGS="$OLDCPPFLAGS -I$BDB_INCLUDE_DIR"
+- LIBS="$OLDLIBS -L$BDB_LIB_DIR -l$BDB_LIB"
++ LIBS="$OLDLIBS $BDB_LIB_L -l$BDB_LIB"
+ AC_DEFINE(HAVE_DB4, 1, [Berkeley DB4 Support])
+ db_found=bdb
+ else
================================================================
---- CVS-web:
http://cvs.pld-linux.org/packages/mutt/mutt.spec?r1=1.245&r2=1.246
More information about the pld-cvs-commit
mailing list