[dbmail] update to 3.0.0 rc2, apply compile fix from upstream git, rebuild to resolve broken deps
Tom Callaway
spot at fedoraproject.org
Mon Apr 25 16:59:57 UTC 2011
commit 3d612de538472c031891ebeab2c264b1a3347b44
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date: Mon Apr 25 12:59:48 2011 -0400
update to 3.0.0 rc2, apply compile fix from upstream git, rebuild to resolve broken deps
.gitignore | 1 +
dbmail-3.0.0-rc2-cleanups.patch | 30 ++++++++++++++++++++++++++++++
dbmail.spec | 13 ++++++++++---
sources | 2 +-
4 files changed, 42 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a9c99f8..b267469 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/dbmail-2.2.17.tar.bz2
/dbmail-3.0.0-rc1.tar.gz
+/dbmail-3.0.0-rc2.tar.gz
diff --git a/dbmail-3.0.0-rc2-cleanups.patch b/dbmail-3.0.0-rc2-cleanups.patch
new file mode 100644
index 0000000..46310fb
--- /dev/null
+++ b/dbmail-3.0.0-rc2-cleanups.patch
@@ -0,0 +1,30 @@
+diff -up dbmail_3.0.0-rc2/src/dm_http.c.cleanups dbmail_3.0.0-rc2/src/dm_http.c
+--- dbmail_3.0.0-rc2/src/dm_http.c.cleanups 2011-04-25 12:52:33.846353499 -0400
++++ dbmail_3.0.0-rc2/src/dm_http.c 2011-04-25 12:53:16.840822628 -0400
+@@ -193,7 +193,7 @@ void Http_getUsers(T R)
+ evbuffer_add_printf(buf, "\n}}\n");
+ }
+
+- if (buf->totallen)
++ if (EVBUFFER_LENGTH(buf))
+ Request_send(R, HTTP_OK, "OK", buf);
+ else
+ Request_error(R, HTTP_SERVUNAVAIL, "Server error");
+@@ -279,7 +279,7 @@ void Http_getMailboxes(T R)
+ MailboxState_free(&b);
+ }
+
+- if (buf->totallen)
++ if (EVBUFFER_LENGTH(buf))
+ Request_send(R, HTTP_OK, "OK", buf);
+ else
+ Request_error(R, HTTP_SERVUNAVAIL, "Server error");
+@@ -375,7 +375,7 @@ void Http_getMessages(T R)
+ }
+ }
+
+- if (buf->totallen)
++ if (EVBUFFER_LENGTH(buf))
+ Request_send(R, HTTP_OK, "OK", buf);
+ else
+ Request_error(R, HTTP_SERVUNAVAIL, "Server error");
diff --git a/dbmail.spec b/dbmail.spec
index 6b42908..e5aaf15 100644
--- a/dbmail.spec
+++ b/dbmail.spec
@@ -2,14 +2,14 @@
Name: dbmail
Version: 3.0.0
-Release: 0.4.rc1%{?dist}
+Release: 0.5.rc2%{?dist}
Summary: A database backed mail storage system
Group: System Environment/Daemons
# db_getopot.c is licensed MIT
License: GPLv2+ and MIT
URL: http://www.dbmail.org
-Source0: http://www.dbmail.org/download/3.0/dbmail-%{version}-rc1.tar.gz
+Source0: http://www.dbmail.org/download/3.0/dbmail-%{version}-rc2.tar.gz
Source1: dbmail-imapd
Source2: dbmail-pop3d
Source3: dbmail-lmtpd
@@ -22,6 +22,8 @@ Source8: dbmail.sysconfig
Patch0: dbmail-3.0.0-fix-deprecated-gmime.patch
Patch1: dbmail-3.0.0-xmlto-skip-validation.patch
Patch2: dbmail-3.0.0-glib.patch
+# From http://git.dbmail.eu/paul/dbmail/commit/?id=6af21775b8c560dd9d65cb2465299a9feae34649
+Patch3: dbmail-3.0.0-rc2-cleanups.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -64,7 +66,7 @@ Please see /usr/share/doc/dbmail-*/README.fedora for specific information on
installation and configuration in Fedora.
%prep
-%setup -q -n %{name}-%{version}-rc1
+%setup -q -n %{name}_%{version}-rc2
%patch0 -p1 -b .fix-deprecated-gmime
%patch1 -p1 -b .xmlto-skip-validation
@@ -73,6 +75,7 @@ installation and configuration in Fedora.
# glib for now
%patch2 -p1 -b .glib
%endif
+%patch3 -p1 -b .cleanups
# we don't need README.solaris and we don't want it caught up in the %%doc
# README* wildcard - but we do want our shiny new README.fedora file to be
@@ -194,6 +197,10 @@ dbmail.
%changelog
+* Mon Apr 25 2011 Tom Callaway <spot at fedoraproject.org> - 3.0.0-0.5.rc2
+- update to rc2
+- apply compile fix from upstream git (patch3)
+
* Mon Feb 21 2011 Bernard Johnson <bjohnson at symetrix.com> - 3.0.0-0.4.rc1
- try rebuild against libevent ABI v2
diff --git a/sources b/sources
index 38c49d5..a2acac7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-65b6545790a48a2b25f22b5794e91638 dbmail-3.0.0-rc1.tar.gz
+c4fda2da173ddeda25bcf9e2e57abd1e dbmail-3.0.0-rc2.tar.gz
More information about the scm-commits
mailing list