packages: mailutils/mailutils-info.patch, mailutils/mailutils.spec, mailuti...
qboosh
qboosh at pld-linux.org
Sun Sep 26 11:34:43 CEST 2010
Author: qboosh Date: Sun Sep 26 09:34:43 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 2.2
- removed outdated pl.po-update patch
---- Files affected:
packages/mailutils:
mailutils-info.patch (1.2 -> 1.3) , mailutils.spec (1.28 -> 1.29) , mailutils-pl.po-update.patch (1.1 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/mailutils/mailutils-info.patch
diff -u packages/mailutils/mailutils-info.patch:1.2 packages/mailutils/mailutils-info.patch:1.3
--- packages/mailutils/mailutils-info.patch:1.2 Tue Jul 3 19:00:05 2007
+++ packages/mailutils/mailutils-info.patch Sun Sep 26 11:34:37 2010
@@ -1,37 +1,42 @@
---- mailutils-1.2/doc/texinfo/mailutils.texi.orig 2005-05-18 23:29:54.000000000 +0200
-+++ mailutils-1.2/doc/texinfo/mailutils.texi 2007-07-03 18:07:50.299630956 +0200
-@@ -21,22 +21,19 @@
- @syncodeindex tp fn
+--- mailutils-2.2/doc/texinfo/mailutils.texi.orig 2010-01-13 15:15:59.000000000 +0100
++++ mailutils-2.2/doc/texinfo/mailutils.texi 2010-09-25 20:30:22.960561491 +0200
+@@ -24,24 +24,21 @@
+ @syncodeindex kw ky
@ifinfo
- at dircategory Email
-+ at dircategory Net utilities:
- @direntry
--* Mailutils: (mailutils). Utilities & library for mailboxes, protocols.
+- at direntry
+-* Mailutils: (mailutils). GNU Mail Utilities.
- at end direntry
- at dircategory Individual utilities
- at direntry
--* comsatd: (mailutils)comsatd. Comsat daemon.
--* frm: (mailutils)frm. List headers from a mailbox.
--* guimb: (mailutils)guimb. Mailbox processing language.
--* imap4d: (mailutils)imap4d. IMAP4 daemon.
--* mail.local: (mailutils)mail.local. Deliver mail to local mailbox.
--* mail: (mailutils)mail. Send and receive mail.
--* messages: (mailutils)messages. Count messages in mailbox.
--* pop3d: (mailutils)pop3d. POP3 daemon.
--* readmsg: (mailutils)readmsg. Extract messages from a folder.
--* sieve: (mailutils)sieve. Mail filtering utility.
-+* Mailutils: (mailutils). Utilities & library for mailboxes, protocols
-+* comsatd: (mailutils)comsatd. Comsat daemon
-+* frm: (mailutils)frm. List headers from a mailbox
-+* guimb: (mailutils)guimb. Mailbox processing language
-+* imap4d: (mailutils)imap4d. IMAP4 daemon
-+* mail.local: (mailutils)mail.local. Deliver mail to local mailbox
-+* mail: (mailutils)mail. Send and receive mail
-+* messages: (mailutils)messages. Count messages in mailbox
-+* pop3d: (mailutils)pop3d. POP3 daemon
-+* readmsg: (mailutils)readmsg. Extract messages from a folder
-+* sieve: (mailutils)sieve. Mail filtering utility
+-* comsatd: (mailutils)comsatd. Comsat Daemon.
+-* frm: (mailutils)frm. List Headers from a Mailbox.
+-* guimb: (mailutils)guimb. Mailbox Processing Language.
+-* imap4d: (mailutils)imap4d. IMAP4 Daemon.
+-* mail: (mailutils)mail. Send and Receive Mail.
+-* maidag: (mailutils)maidag. A General-Purpose Mail Delivery Agent.
+-* messages: (mailutils)messages. Count Messages in a Mailbox.
+-* pop3d: (mailutils)pop3d. POP3 Daemon.
+-* readmsg: (mailutils)readmsg. Extract Messages from a Folder.
+-* sieve: (mailutils)sieve. Mail Filtering Utility.
+-* mimeview: (mailutils)mimeview. View MIME Messages.
+-* mailutils-config: (mailutils)mailutils-config. List Information about Mailutils.
++ at dircategory Net utilities:
++ at direntry
++* Mailutils: (mailutils). GNU Mail Utilities
++* comsatd: (mailutils)comsatd. Comsat Daemon
++* frm: (mailutils)frm. List Headers from a Mailbox
++* guimb: (mailutils)guimb. Mailbox Processing Language
++* imap4d: (mailutils)imap4d. IMAP4 Daemon
++* mail: (mailutils)mail. Send and Receive Mail
++* maidag: (mailutils)maidag. A General-Purpose Mail Delivery Agent
++* messages: (mailutils)messages. Count Messages in a Mailbox
++* pop3d: (mailutils)pop3d. POP3 Daemon
++* readmsg: (mailutils)readmsg. Extract Messages from a Folder
++* sieve: (mailutils)sieve. Mail Filtering Utility
++* mimeview: (mailutils)mimeview. View MIME Messages
++* mailutils-config: (mailutils)mailutils-config. List Information about Mailutils
@end direntry
@end ifinfo
================================================================
Index: packages/mailutils/mailutils.spec
diff -u packages/mailutils/mailutils.spec:1.28 packages/mailutils/mailutils.spec:1.29
--- packages/mailutils/mailutils.spec:1.28 Fri Jul 3 01:51:47 2009
+++ packages/mailutils/mailutils.spec Sun Sep 26 11:34:37 2010
@@ -1,43 +1,50 @@
# $Revision$, $Date$
# TODO:
# - look at files in main package (more split?)
+# - guile and python packages?
# - scripts for daemons
-# - some dbm (gdbm? db as (n)dbm? db after update from db2 to db4.1 API?)
+# - some dbm? (berkeley db?)
#
# Conditional build:
%bcond_without gssapi # GSSAPI authentication (krb5 or heimdal)
%bcond_without sasl # without SASL (using GNU SASL)
-%bcond_with gss # use GSS instead of krb5
+%bcond_with gss # use GSS instead of heimdal
#
Summary: GNU mail utilities
Summary(pl.UTF-8): Narzędzia pocztowe z projektu GNU
Name: mailutils
-Version: 1.2
+Version: 2.2
Release: 1
License: GPL v3+
Group: Applications/Mail
-Source0: http://ftp.gnu.org/gnu/mailutils/%{name}-%{version}.tar.bz2
-# Source0-md5: 0a5bf84e908f15343414c6a95118a373
+Source0: http://ftp.gnu.org/gnu/mailutils/%{name}-%{version}.tar.lzma
+# Source0-md5: 9cd0b3af77df3442665d1a12c329b807
Patch0: %{name}-info.patch
-Patch1: %{name}-pl.po-update.patch
-Patch2: %{name}-tinfo.patch
+Patch1: %{name}-tinfo.patch
URL: http://www.gnu.org/software/mailutils/mailutils.html
-BuildRequires: autoconf >= 2.60
-BuildRequires: automake >= 1:1.8.5
+BuildRequires: autoconf >= 2.63
+BuildRequires: automake >= 1:1.11
BuildRequires: fribidi-devel
-BuildRequires: gettext-devel >= 0.15
-BuildRequires: gnu-radius-devel
+BuildRequires: gettext-devel >= 0.17
+BuildRequires: gnu-radius-devel >= 1.6
BuildRequires: gnutls-devel >= 1.2.5
%{?with_sasl:BuildRequires: gsasl-devel >= 0.2.3}
-BuildRequires: guile-devel >= 1.4
+BuildRequires: guile-devel >= 1.8
BuildRequires: libltdl-devel
+BuildRequires: libwrap-devel
+BuildRequires: libtool
BuildRequires: mysql-devel
BuildRequires: ncurses-devel
+BuildRequires: openldap-devel
BuildRequires: pam-devel
BuildRequires: postgresql-devel
+BuildRequires: python-devel >= 1:2.5
BuildRequires: readline-devel
+BuildRequires: rpmbuild(macros) >= 1.219
+BuildRequires: tar >= 1:1.22
BuildRequires: texinfo
BuildRequires: unixODBC-devel
+BuildRequires: xz
%if %{with gssapi}
%if %{with gss}
BuildRequires: gss-devel >= 0.0.9
@@ -149,25 +156,26 @@
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
-%patch2 -p0
+%patch1 -p0
-rm -f po/stamp-po
+%{__rm} po/stamp-po
%build
%{__libtoolize}
-%{__aclocal} -I m4
+%{__aclocal} -I m4 -I am -I gint
%{__autoconf}
%{__autoheader}
%{__automake}
%configure \
%{!?with_gss:ac_cv_header_gss_h=no} \
+ --disable-silent-rules \
--with-gnutls \
+ %{?with_sasl:--with-gsasl} \
+ %{?with_gssapi:--with-gssapi} \
+ --with-mh-bindir=%{_libexecdir}/mu-mh \
--with-mysql \
- --with-postgres \
--with-odbc=odbc \
- %{?with_sasl:--with-gsasl} \
- %{?with_gssapi:--with-gssapi}
+ --with-postgres
%{__make}
@@ -177,28 +185,29 @@
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT%{_libdir}/mailutils/*.{la,a}
-# fix to point to library itself, not .so link
-ln -sf $(basename $RPM_BUILD_ROOT%{_libdir}/libmu_scm.so.*.*.*) $RPM_BUILD_ROOT%{_libdir}/libguile-mailutils-v-1.2.so
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/mailutils/*.{la,a}
+%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/mailutils/c_api.{la,a}
+
+%py_postclean
%find_lang %{name}
%clean
rm -rf $RPM_BUILD_ROOT
-%post -p /sbin/postshell
+%post -p /sbin/postshell
-/usr/sbin/fix-info-dir -c %{_infodir}
-%postun -p /sbin/postshell
+%postun -p /sbin/postshell
-/usr/sbin/fix-info-dir -c %{_infodir}
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
-%post devel -p /sbin/postshell
+%post devel -p /sbin/postshell
-/usr/sbin/fix-info-dir -c %{_infodir}
-%postun devel -p /sbin/postshell
+%postun devel -p /sbin/postshell
-/usr/sbin/fix-info-dir -c %{_infodir}
%files -f %{name}.lang
@@ -215,42 +224,128 @@
%attr(755,root,root) %{_bindir}/sieve
%attr(755,root,root) %{_bindir}/sieve.scm
%attr(755,root,root) %{_sbindir}/comsatd
-%attr(755,root,root) %{_libexecdir}/mail.local
-%attr(755,root,root) %{_libexecdir}/mail.remote
+%attr(755,root,root) %{_sbindir}/maidag
+# traditional bin/mh dir
+%dir %{_libexecdir}/mu-mh
+%attr(755,root,root) %{_libexecdir}/mu-mh/ali
+%attr(755,root,root) %{_libexecdir}/mu-mh/anno
+%attr(755,root,root) %{_libexecdir}/mu-mh/burst
+%attr(755,root,root) %{_libexecdir}/mu-mh/comp
+%attr(755,root,root) %{_libexecdir}/mu-mh/fmtcheck
+%attr(755,root,root) %{_libexecdir}/mu-mh/folder
+%attr(755,root,root) %{_libexecdir}/mu-mh/folders
+%attr(755,root,root) %{_libexecdir}/mu-mh/forw
+%attr(755,root,root) %{_libexecdir}/mu-mh/inc
+%attr(755,root,root) %{_libexecdir}/mu-mh/install-mh
+%attr(755,root,root) %{_libexecdir}/mu-mh/mark
+%attr(755,root,root) %{_libexecdir}/mu-mh/mhl
+%attr(755,root,root) %{_libexecdir}/mu-mh/mhn
+%attr(755,root,root) %{_libexecdir}/mu-mh/mhparam
+%attr(755,root,root) %{_libexecdir}/mu-mh/mhpath
+%attr(755,root,root) %{_libexecdir}/mu-mh/pick
+%attr(755,root,root) %{_libexecdir}/mu-mh/refile
+%attr(755,root,root) %{_libexecdir}/mu-mh/repl
+%attr(755,root,root) %{_libexecdir}/mu-mh/rmf
+%attr(755,root,root) %{_libexecdir}/mu-mh/rmm
+%attr(755,root,root) %{_libexecdir}/mu-mh/scan
+%attr(755,root,root) %{_libexecdir}/mu-mh/send
+%attr(755,root,root) %{_libexecdir}/mu-mh/sortm
+%attr(755,root,root) %{_libexecdir}/mu-mh/whatnow
+%attr(755,root,root) %{_libexecdir}/mu-mh/whom
%dir %{_libdir}/mailutils
%attr(755,root,root) %{_libdir}/mailutils/*.so
%{_datadir}/mailutils
%{_datadir}/guile/site/mailutils
-%{_datadir}/guile/site/sieve-modules
+%dir %{py_sitedir}/mailutils
+%attr(755,root,root) %{py_sitedir}/mailutils/c_api.so
+%dir %{py_sitescriptdir}/mailutils
+%{py_sitescriptdir}/mailutils/*.py[co]
%{_infodir}/mailutils.info*
%files libs
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libmailutils.so.*.*.*
-%attr(755,root,root) %{_libdir}/libmu_*.so.*.*.*
-%attr(755,root,root) %{_libdir}/libmuauth.so.*.*.*
-%attr(755,root,root) %{_libdir}/libsieve.so.*.*.*
-%attr(755,root,root) %{_libdir}/libguile-mailutils-v-1.2.so
+%attr(755,root,root) %ghost %{_libdir}/libmailutils.so.2
+%attr(755,root,root) %{_libdir}/libmu_auth.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libmu_auth.so.2
+%attr(755,root,root) %{_libdir}/libmu_cfg.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libmu_cfg.so.0
+%attr(755,root,root) %{_libdir}/libmu_cpp.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libmu_cpp.so.2
+%attr(755,root,root) %{_libdir}/libmu_imap.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libmu_imap.so.2
+%attr(755,root,root) %{_libdir}/libmu_maildir.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libmu_maildir.so.2
+%attr(755,root,root) %{_libdir}/libmu_mailer.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libmu_mailer.so.2
+%attr(755,root,root) %{_libdir}/libmu_mbox.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libmu_mbox.so.2
+%attr(755,root,root) %{_libdir}/libmu_mh.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libmu_mh.so.2
+%attr(755,root,root) %{_libdir}/libmu_nntp.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libmu_nntp.so.2
+%attr(755,root,root) %{_libdir}/libmu_pop.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libmu_pop.so.2
+%attr(755,root,root) %{_libdir}/libmu_py.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libmu_py.so.2
+%attr(755,root,root) %{_libdir}/libmu_scm.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libmu_scm.so.2
+%attr(755,root,root) %{_libdir}/libmu_sieve.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libmu_sieve.so.2
+%attr(755,root,root) %{_libdir}/libguile-mailutils-v-2.2.so
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/mailutils-config
%attr(755,root,root) %{_libdir}/libmailutils.so
-%attr(755,root,root) %{_libdir}/libmu_*.so
-%attr(755,root,root) %{_libdir}/libmuauth.so
-%attr(755,root,root) %{_libdir}/libsieve.so
+%attr(755,root,root) %{_libdir}/libmu_auth.so
+%attr(755,root,root) %{_libdir}/libmu_cfg.so
+%attr(755,root,root) %{_libdir}/libmu_cpp.so
+%attr(755,root,root) %{_libdir}/libmu_imap.so
+%attr(755,root,root) %{_libdir}/libmu_maildir.so
+%attr(755,root,root) %{_libdir}/libmu_mailer.so
+%attr(755,root,root) %{_libdir}/libmu_mbox.so
+%attr(755,root,root) %{_libdir}/libmu_mh.so
+%attr(755,root,root) %{_libdir}/libmu_nntp.so
+%attr(755,root,root) %{_libdir}/libmu_pop.so
+%attr(755,root,root) %{_libdir}/libmu_py.so
+%attr(755,root,root) %{_libdir}/libmu_scm.so
+%attr(755,root,root) %{_libdir}/libmu_sieve.so
%{_libdir}/libmailutils.la
-%{_libdir}/libmu_*.la
-%{_libdir}/libmuauth.la
-%{_libdir}/libsieve.la
+%{_libdir}/libmu_auth.la
+%{_libdir}/libmu_cfg.la
+%{_libdir}/libmu_cpp.la
+%{_libdir}/libmu_imap.la
+%{_libdir}/libmu_maildir.la
+%{_libdir}/libmu_mailer.la
+%{_libdir}/libmu_mbox.la
+%{_libdir}/libmu_mh.la
+%{_libdir}/libmu_nntp.la
+%{_libdir}/libmu_pop.la
+%{_libdir}/libmu_py.la
+%{_libdir}/libmu_scm.la
+%{_libdir}/libmu_sieve.la
+# static-only
+%{_libdir}/libmu_argp.a
%{_includedir}/mailutils
+%{_aclocaldir}/mailutils.m4
%files static
%defattr(644,root,root,755)
%{_libdir}/libmailutils.a
-%{_libdir}/libmu_*.a
-%{_libdir}/libmuauth.a
-%{_libdir}/libsieve.a
+%{_libdir}/libmu_auth.a
+%{_libdir}/libmu_cfg.a
+%{_libdir}/libmu_cpp.a
+%{_libdir}/libmu_imap.a
+%{_libdir}/libmu_maildir.a
+%{_libdir}/libmu_mailer.a
+%{_libdir}/libmu_mbox.a
+%{_libdir}/libmu_mh.a
+%{_libdir}/libmu_nntp.a
+%{_libdir}/libmu_pop.a
+%{_libdir}/libmu_py.a
+%{_libdir}/libmu_scm.a
+%{_libdir}/libmu_sieve.a
%files -n gnu-mail
%defattr(644,root,root,755)
@@ -274,6 +369,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.29 2010/09/26 09:34:37 qboosh
+- updated to 2.2
+- removed outdated pl.po-update patch
+
Revision 1.28 2009/07/02 23:51:47 baggins
- switch to heimdal kerberos
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mailutils/mailutils-info.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mailutils/mailutils.spec?r1=1.28&r2=1.29&f=u
More information about the pld-cvs-commit
mailing list