rpms/esmtp/EL-4 .cvsignore, 1.2, 1.3 esmtp.spec, 1.3, 1.4 sources, 1.2, 1.3
Patrice Dumas (pertusus)
fedora-extras-commits at redhat.com
Tue Dec 18 22:36:06 UTC 2007
Author: pertusus
Update of /cvs/extras/rpms/esmtp/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6688/EL-4
Modified Files:
.cvsignore esmtp.spec sources
Log Message:
sync with devel
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/esmtp/EL-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 29 Aug 2005 21:26:00 -0000 1.2
+++ .cvsignore 18 Dec 2007 22:35:23 -0000 1.3
@@ -1 +1 @@
-esmtp-0.5.1.tar.bz2
+esmtp-0.6.0.tar.bz2
Index: esmtp.spec
===================================================================
RCS file: /cvs/extras/rpms/esmtp/EL-4/esmtp.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- esmtp.spec 30 Aug 2005 09:05:26 -0000 1.3
+++ esmtp.spec 18 Dec 2007 22:35:23 -0000 1.4
@@ -1,23 +1,29 @@
-Summary: User configurable relay-only Mail Transfer Agent (MTA)
-Summary(de): Benutzerkonfigurierbarer nur versendender Mail Transfer Agent (MTA)
-Name: esmtp
-Version: 0.5.1
-Release: 7%{?dist}
-Source: http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
-Source1: esmtp-0.4.1-mutt
-Url: http://esmtp.sourceforge.net/
-License: GPL
-Group: Applications/Internet
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Requires(post): %{_sbindir}/alternatives
-# workaround a missing libesmtp-devel Requires:
-BuildRequires: openssl-devel
-BuildRequires: libesmtp-devel
-Provides: %{_sbindir}/sendmail
+Summary: User configurable relay-only Mail Transfer Agent (MTA)
+Summary(de): Benutzerkonfigurierbarer nur versendender Mail Transfer Agent (MTA)
+Name: esmtp
+Version: 0.6.0
+Release: 3%{?dist}
+Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Source1: esmtp-0.4.1-mutt
+Url: http://esmtp.sourceforge.net/
+# no license in files. Some come from fetchmail, another from libesmtp
+# esmtp-wrapper is GPLv2+
+License: GPL+ and GPLv2+
+Group: Applications/Internet
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Requires(post): %{_sbindir}/alternatives
+Requires(preun): %{_sbindir}/alternatives
+BuildRequires: libesmtp-devel
+# these files are set up with alternatives
+Provides: %{_sbindir}/sendmail
+Provides: %{_bindir}/mailq
+# for esmtp-wrapper
+Requires: mktemp
# esmtp doesn't listen on port 25, so it cannot provide smtpdaemon.
# This implies that any program requiring a program that sends mail
-# should rely on another package that esmtp to fulfill the dependencies.
+# on port 25 should rely on another package than esmtp to fulfill the
+# dependency.
#Provides: smtpdaemon
%description
@@ -26,33 +32,18 @@
(including the CRAM-MD5 and NTLM SASL mechanisms) and the StartTLS SMTP
extensions.
-So these are ESMTP features:
- * requires no administration privileges
- * individual user configuration
- * sendmail command line compatible
- * supports the AUTH SMTP extension, with the CRAM-MD5 and NTLM SASL
- mechanisms
- * support the StartTLS SMTP extension
- * does not receive mail, expand aliases or manage a queue
-
%description -l de
ESMTP ist ein benutzerkonfigurierbarer nur versendender Mail Transfer
Agent (MTA) mit einem Sendmail-kompatiblen Syntax. Es basiert auf
libESMTP und unterstützt AUTH (mit CRAM-MD5 und NTLM SASL) und StartTLS
SMTP.
-Dies sind die ESMTP-Eigenschaften:
- * benötigt keine Administrator-Rechte
- * individuelle Benutzerkonfiguration
- * Sendmail-kompatibler Syntax
- * unterstützt AUTH, mit CRAM-MD5 und NTLM SASL
- * unterstützt StartTLS SMTP
- * empfängt keine E-Mails, erweiterte Aliases oder Verwaltung einer
- Warteschlange
-
%prep
%setup -q
-cp %{SOURCE1} mutt-esmtp
+cp -p %{SOURCE1} mutt-esmtp
+for file in esmtp.1 esmtprc.5; do
+ iconv -f ISO8859-1 -t UTF8 < $file > $file.new && touch -r $file $file.new && mv -f $file.new $file
+done
%build
%configure
@@ -60,42 +51,73 @@
%install
rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
+install -p -m0755 esmtp-wrapper $RPM_BUILD_ROOT%{_bindir}
# remove all the sendmail alternative installed, it is done in %post
-rm $RPM_BUILD_ROOT/%{_bindir}/mailq \
- $RPM_BUILD_ROOT/%{_bindir}/newaliases \
- $RPM_BUILD_ROOT/%{_libdir}/sendmail \
- $RPM_BUILD_ROOT/%{_sbindir}/sendmail \
- $RPM_BUILD_ROOT/%{_mandir}/man1/mailq.1 \
- $RPM_BUILD_ROOT/%{_mandir}/man1/newaliases.1 \
- $RPM_BUILD_ROOT/%{_mandir}/man1/sendmail.1
-
+rm $RPM_BUILD_ROOT%{_bindir}/mailq \
+ $RPM_BUILD_ROOT%{_bindir}/newaliases \
+ $RPM_BUILD_ROOT%{_libdir}/sendmail \
+ $RPM_BUILD_ROOT%{_sbindir}/sendmail \
+ $RPM_BUILD_ROOT%{_mandir}/man1/mailq.1 \
+ $RPM_BUILD_ROOT%{_mandir}/man1/newaliases.1 \
+ $RPM_BUILD_ROOT%{_mandir}/man1/sendmail.1
%post
-%{_sbindir}/alternatives --install %{_sbindir}/sendmail mta %{_bindir}/esmtp 30 \
- --slave %{_bindir}/mailq mta-mailq %{_bindir}/esmtp \
- --slave %{_bindir}/newaliases mta-newaliases %{_bindir}/esmtp \
- --slave %{_libdir}/sendmail mta-sendmail %{_bindir}/esmtp \
- --slave %{_mandir}/man1/mailq.1.gz mta-mailqman %{_mandir}/man1/esmtp.1.gz \
- --slave %{_mandir}/man1/newaliases.1.gz mta-newaliasesman %{_mandir}/man1/esmtp.1.gz \
- --slave %{_mandir}/man8/sendmail.8.gz mta-sendmailman %{_mandir}/man1/esmtp.1.gz \
+# newaliases is fake, so don't install the links.
+%{_sbindir}/alternatives --install %{_sbindir}/sendmail mta %{_bindir}/esmtp-wrapper 30 \
+ --slave %{_prefix}/lib/sendmail mta-sendmail %{_bindir}/esmtp-wrapper \
+ --slave %{_mandir}/man8/sendmail.8.gz mta-sendmailman %{_mandir}/man1/esmtp.1.gz \
+ --slave %{_bindir}/mailq mta-mailq %{_bindir}/esmtp-wrapper \
+ --slave %{_mandir}/man1/mailq.1.gz mta-mailqman %{_mandir}/man1/esmtp.1.gz
+
+# --slave %{_bindir}/newaliases mta-newaliases %{_bindir}/esmtp \
+# --slave %{_mandir}/man1/newaliases.1.gz mta-newaliasesman %{_mandir}/man1/esmtp.1.gz \
%preun
if [ "$1" = 0 ]; then
- %{_sbindir}/alternatives --remove mta %{_bindir}/esmtp
+ %{_sbindir}/alternatives --remove mta %{_bindir}/esmtp-wrapper
fi
%clean
rm -rf $RPM_BUILD_ROOT
-#%files -f %{name}.lang
%files
%defattr(-,root,root,-)
-%doc AUTHORS README TODO ChangeLog sample.esmtprc mutt-esmtp
+%doc AUTHORS COPYING NEWS README TODO sample.esmtprc mutt-esmtp
+%{_bindir}/esmtp-wrapper
%{_bindir}/esmtp
%{_mandir}/man[^3]/esmtp*
%changelog
+* Tue Dec 18 2007 Patrice Dumas <pertusus at free.fr> 0.6.0-3
+- keep more timestamps
+- add a Requires(preun) for alternatives
+
+* Thu Dec 06 2007 Release Engineering <rel-eng at fedoraproject dot org> - 0.6.0-2
+ - Rebuild for deps
+
+* Wed Oct 10 2007 Patrice Dumas <pertusus at free.fr> 0.6.0-1
+- update to 0.6.0
+
+* Mon Sep 11 2006 Patrice Dumas <pertusus at free.fr> 0.5.1-13
+- rebuild for FC6
+
+* Thu Jun 22 2006 Patrice Dumas <pertusus at free.fr> 0.5.1-12
+- provide an alternative for /usr/lib/sendmail even if %%_lib isn't lib
+ fix 196277
+
+* Thu Feb 16 2006 Patrice Dumas <pertusus at free.fr> 0.5.1-11
+- rebuild for fc5
+
+* Sun Jan 8 2006 Patrice Dumas <pertusus at free.fr> 0.5.1-10
+- convert man pages to utf8 (Dmitry Butskoy report)
+
+* Wed Nov 16 2005 Patrice Dumas <pertusus at free.fr> 0.5.1-9
+- remove the workaround for libesmtp not requiring openssl (#166844 closed)
+
+* Sun Nov 13 2005 Patrice Dumas <pertusus at free.fr> 0.5.1-8
+- rebuild against new openssl
+
* Mon Aug 29 2005 Patrice Dumas <pertusus at free.fr> 0.5.1-7
- uncomment german translation
@@ -107,10 +129,10 @@
- comment out german translation
- cleanups (thanks Aurelien Bompard)
-* Sat Mar 12 2004 Patrice Dumas <pertusus at free.fr> 0:0.5.1-2
+* Sat Mar 12 2004 Patrice Dumas <pertusus at free.fr> 0.5.1-2
- Use alternatives
-* Sat Mar 12 2004 Patrice Dumas <pertusus at free.fr> 0:0.5.1-1
+* Sat Mar 12 2004 Patrice Dumas <pertusus at free.fr> 0.5.1-1
- Use fedora-newrpmspec to update the spec file
- Package sendmail replacements
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/esmtp/EL-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 29 Aug 2005 21:26:00 -0000 1.2
+++ sources 18 Dec 2007 22:35:23 -0000 1.3
@@ -1 +1 @@
-9f0b809e891a548910f099efc4315b02 esmtp-0.5.1.tar.bz2
+3f97c38f8e59978f1a25fe10bb68cdff esmtp-0.6.0.tar.bz2
More information about the fedora-extras-commits
mailing list