Request 1744 (accepted)

Overview

Request 1744 (accepted)

Submit 0.2.5

Created by vanmeeuwen over 8 years ago
In state accepted

Submit erlang-eimap

Submit package Kolab:Winterfell / erlang-eimap to package Kolab:16 / erlang-eimap

erlang-eimap.spec Changed

@@ -5,8 +5,10 @@
 %global realname eimap
 %global debug_package %{nil}
 
+%define lock_version() %{1}%{?_isa} = %(rpm -q --queryformat "%{VERSION}" %{1})
+
 Name:           erlang-%{realname}
-Version:        0.2.4
+Version:        0.2.5
 Release:        0.20160111.git%{?dist}
 Summary:        Erlang IMAP client
 Group:          Development/Libraries
@@ -15,18 +17,14 @@
 %if 0%{?el7}%{?fedora}
 VCS:            scm:git:https://git.kolab.org/diffusion/EI/%{realname}.git
 %endif
-Source0:        erlang-eimap-0.2.4.tar.gz
-
-Patch0001:      0001-there-is-only-ever-one-response.-be-strict-about-tha.patch
-Patch0002:      0002-the-explicit-capabilities-command-is-multiline-so-it.patch
-Patch0003:      0003-don-t-munge-the-incoming-response.-leave-that-to-the.patch
+Source0:        erlang-eimap-0.2.5.tar.gz
 
 BuildRequires:	erlang-goldrush >= 0.1.7
 BuildRequires:	erlang-lager >= 2.2.0
 BuildRequires:	erlang-rebar >= 2.5.1
 
-Requires:       erlang-erts%{?_isa} >= R13B
-Requires:       erlang-stdlib%{?_isa} >= R13B
+Requires:       %lock_version erlang-erts
+Requires:       %lock_version erlang-stdlib
 
 %description
 IMAP client library for Erlang
@@ -34,10 +32,6 @@
 %prep
 %setup -q -n eimap-%{version}
 
-%patch0001 -p1
-%patch0002 -p1
-%patch0003 -p1
-
 %build
 rebar compile -v
 
@@ -62,9 +56,14 @@
 %{_libdir}/erlang/lib/%{realname}-%{version}/ebin/*.beam
 
 %changelog
+* Tue Jul  5 2016 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.2.5-1
+- Packaging of 0.2.5
+
 * Wed Jun 08 2016 Aaron Seigo <seigo@kolabsystems.com> - 0.2.4-1
 - Packaging of 0.2.4
+
 * Tue Jun 07 2016 Aaron Seigo <seigo@kolabsystems.com> - 0.2.2-1
 - Packaging of 0.2.2
+
 * Mon Dec 21 2015 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.1.2-1
 - First package

0001-there-is-only-ever-one-response.-be-strict-about-tha.patch Deleted

@@ -1,27 +0,0 @@
-From 297c7097833f10c70b4b3f928dbc6166282b947b Mon Sep 17 00:00:00 2001
-From: Aaron Seigo <aseigo@kde.org>
-Date: Mon, 20 Jun 2016 16:49:55 +0200
-Subject: [PATCH 1/3] there is only ever one response. be strict about that.
-
----
- src/commands/eimap_command_capability.erl | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/commands/eimap_command_capability.erl b/src/commands/eimap_command_capability.erl
-index 8f9d12e..a1b50c9 100644
---- a/src/commands/eimap_command_capability.erl
-+++ b/src/commands/eimap_command_capability.erl
-@@ -25,8 +25,8 @@
- new_command(parse_serverid) -> { <<"CAPABILITY">>, single_line_response };
- new_command(_Args) -> { <<"CAPABILITY">>, multiline_response }.
- 
--process_line(<<"* CAPABILITY ", Data/binary>>, Acc) ->
--    [Data|Acc];
-+process_line(<<"* CAPABILITY ", Data/binary>>, _Acc) ->
-+    [Data];
- process_line(_Data, Acc) -> Acc.
- 
- formulate_response(ok, Response) -> { fini, Response };
--- 
-2.5.5
-

0002-the-explicit-capabilities-command-is-multiline-so-it.patch Deleted

@@ -1,26 +0,0 @@
-From ee6185b256058ee5884d01ac16faf30585480fbb Mon Sep 17 00:00:00 2001
-From: Aaron Seigo <aseigo@kde.org>
-Date: Mon, 20 Jun 2016 16:55:01 +0200
-Subject: [PATCH 2/3] the explicit capabilities command is multiline, so it
- produces a list response
-
----
- src/eimap.erl | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/eimap.erl b/src/eimap.erl
-index 76f02f2..ebf3a02 100644
---- a/src/eimap.erl
-+++ b/src/eimap.erl
-@@ -294,7 +294,7 @@ handle_info({ { connected, Receiver, ResponseToken }, { Capabilities, ServerID }
-             send_hello_string(Capabilities, ServerID, Receiver, ResponseToken, Passthrough, PassthroughReceiver)
-     end,
-     { next_state, idle, State#state{ current_command = undefined, server_id = ServerID } };
--handle_info({ { posttls_capabilities, Receiver, ResponseToken }, Capabilities }, _StateName, #state{ server_id = ServerID, passthrough = Passthrough, passthrough_recv = PassthroughReceiver } = State) ->
-+handle_info({ { posttls_capabilities, Receiver, ResponseToken }, [Capabilities] }, _StateName, #state{ server_id = ServerID, passthrough = Passthrough, passthrough_recv = PassthroughReceiver } = State) ->
-     OurCapabilities =
-         case binary:match(Capabilities, <<"STARTTLS">>) of
-             nomatch -> <<Capabilities/binary, " STARTTLS">>;
--- 
-2.5.5
-

0003-don-t-munge-the-incoming-response.-leave-that-to-the.patch Deleted

@@ -1,31 +0,0 @@
-From bc9d05a44c7ebbfb7bbbcb1006b23d2bb76d8101 Mon Sep 17 00:00:00 2001
-From: Aaron Seigo <aseigo@kde.org>
-Date: Mon, 20 Jun 2016 16:55:28 +0200
-Subject: [PATCH 3/3] don't munge the incoming response. leave that to the
- application.
-
----
- src/eimap.erl | 7 +------
- 1 file changed, 1 insertion(+), 6 deletions(-)
-
-diff --git a/src/eimap.erl b/src/eimap.erl
-index ebf3a02..b331d1d 100644
---- a/src/eimap.erl
-+++ b/src/eimap.erl
-@@ -295,12 +295,7 @@ handle_info({ { connected, Receiver, ResponseToken }, { Capabilities, ServerID }
-     end,
-     { next_state, idle, State#state{ current_command = undefined, server_id = ServerID } };
- handle_info({ { posttls_capabilities, Receiver, ResponseToken }, [Capabilities] }, _StateName, #state{ server_id = ServerID, passthrough = Passthrough, passthrough_recv = PassthroughReceiver } = State) ->
--    OurCapabilities =
--        case binary:match(Capabilities, <<"STARTTLS">>) of
--            nomatch -> <<Capabilities/binary, " STARTTLS">>;
--            _ -> Capabilities
--        end,
--    send_hello_string(OurCapabilities, ServerID, Receiver, ResponseToken, Passthrough, PassthroughReceiver),
-+    send_hello_string(Capabilities, ServerID, Receiver, ResponseToken, Passthrough, PassthroughReceiver),
-     { next_state, idle, State#state{ current_command = none } };
- handle_info({ { selected, MBox }, ok }, StateName, State) ->
-     %%lager:info("~p Selected mbox ~p", [self(), MBox]),
--- 
-2.5.5
-

debian.changelog Changed

debian.series Added

erlang-eimap-0.2.4.tar.gz/src/commands/eimap_command_capability.erl -> erlang-eimap-0.2.5.tar.gz/src/commands/eimap_command_capability.erl Changed

erlang-eimap-0.2.4.tar.gz/src/eimap.app.src -> erlang-eimap-0.2.5.tar.gz/src/eimap.app.src Changed

erlang-eimap-0.2.4.tar.gz/src/eimap.erl -> erlang-eimap-0.2.5.tar.gz/src/eimap.erl Changed

@@ -294,13 +294,8 @@
             send_hello_string(Capabilities, ServerID, Receiver, ResponseToken, Passthrough, PassthroughReceiver)
     end,
     { next_state, idle, State#state{ current_command = undefined, server_id = ServerID } };
-handle_info({ { posttls_capabilities, Receiver, ResponseToken }, Capabilities }, _StateName, #state{ server_id = ServerID, passthrough = Passthrough, passthrough_recv = PassthroughReceiver } = State) ->
-    OurCapabilities =
-        case binary:match(Capabilities, <<"STARTTLS">>) of
-            nomatch -> <<Capabilities/binary, " STARTTLS">>;
-            _ -> Capabilities
-        end,
-    send_hello_string(OurCapabilities, ServerID, Receiver, ResponseToken, Passthrough, PassthroughReceiver),
+handle_info({ { posttls_capabilities, Receiver, ResponseToken }, [Capabilities] }, _StateName, #state{ server_id = ServerID, passthrough = Passthrough, passthrough_recv = PassthroughReceiver } = State) ->
+    send_hello_string(Capabilities, ServerID, Receiver, ResponseToken, Passthrough, PassthroughReceiver),
     { next_state, idle, State#state{ current_command = none } };
 handle_info({ { selected, MBox }, ok }, StateName, State) ->
     %%lager:info("~p Selected mbox ~p", [self(), MBox]),

erlang-eimap.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 1744 0

Request History

vanmeeuwen created request over 8 years ago

Submit 0.2.5

vanmeeuwen accepted review over 8 years ago

vanmeeuwen approved review over 8 years ago

vanmeeuwen accepted review over 8 years ago

vanmeeuwen accepted request over 8 years ago