rpms/erlang-oauth/EL-6 erlang-oauth-0001-Do-not-use-empty-strings-as-params_from_header_strin.patch, NONE, 1.1 erlang-oauth.spec, 1.2, 1.3 import.log, 1.2, 1.3
Peter Lemenkov
peter at fedoraproject.org
Fri May 28 06:19:26 UTC 2010
- Previous message: rpms/erlang-oauth/F-11 erlang-oauth-0001-Do-not-use-empty-strings-as-params_from_header_strin.patch, NONE, 1.1 erlang-oauth.spec, 1.2, 1.3 import.log, 1.2, 1.3
- Next message: rpms/erlang-oauth/EL-5 erlang-oauth-0001-Do-not-use-empty-strings-as-params_from_header_strin.patch, NONE, 1.1 erlang-oauth.spec, 1.2, 1.3 import.log, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: peter
Update of /cvs/pkgs/rpms/erlang-oauth/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv25777/EL-6
Modified Files:
erlang-oauth.spec import.log
Added Files:
erlang-oauth-0001-Do-not-use-empty-strings-as-params_from_header_strin.patch
Log Message:
Fixed CouchDB failure (see rhbz #597093).
erlang-oauth-0001-Do-not-use-empty-strings-as-params_from_header_strin.patch:
oauth_uri.erl | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- NEW FILE erlang-oauth-0001-Do-not-use-empty-strings-as-params_from_header_strin.patch ---
>From 144c96d00e0e46f3b822b3cdaa82b45ea26c13f3 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Fri, 28 May 2010 09:40:32 +0400
Subject: [PATCH] Do not use empty strings as params_from_header_string argument
---
src/oauth_uri.erl | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/oauth_uri.erl b/src/oauth_uri.erl
index c019427..5023f98 100644
--- a/src/oauth_uri.erl
+++ b/src/oauth_uri.erl
@@ -31,7 +31,7 @@ params_to_header_string(Params) ->
intercalate(", ", [concat([encode(K), "=\"", encode(V), "\""]) || {K, V} <- Params]).
params_from_header_string(String) ->
- [param_from_header_string(Param) || Param <- re:split(String, ",\\s*", [{return, list}])].
+ [param_from_header_string(Param) || Param <- re:split(String, ",\\s*", [{return, list}]), Param =/= ""].
param_from_header_string(Param) ->
[Key, QuotedValue] = string:tokens(Param, "="),
--
1.6.6.1
Index: erlang-oauth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/erlang-oauth/EL-6/erlang-oauth.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- erlang-oauth.spec 27 May 2010 10:39:48 -0000 1.2
+++ erlang-oauth.spec 28 May 2010 06:19:26 -0000 1.3
@@ -4,7 +4,7 @@
Name: erlang-%{realname}
Version: 0
-Release: 0.3.gite8aecf0%{?dist}
+Release: 0.4.gite8aecf0%{?dist}
Summary: An Erlang OAuth implementation
Group: Development/Languages
License: MIT
@@ -13,17 +13,18 @@ URL: http://github.com/tim/erlang-oauth
## cd %{name}
## git archive --format=tar --prefix=%{name}-%{version}/ e8aecf0 | bzip2 > ../%{name}-%{version}.git%{git_commit}.tar.bz2
Source0: %{name}-%{version}.gite8aecf0.tar.bz2
+Patch1: erlang-oauth-0001-Do-not-use-empty-strings-as-params_from_header_strin.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: erlang
-%if 0%{?el4}%{?el5}
-Requires: erlang
+%if 0%{?el4}%{?el5}%{?fc11}
+Requires: erlang >= R12B
%else
-Requires: erlang-crypto
-Requires: erlang-erts
-Requires: erlang-inets
-Requires: erlang-public_key
-Requires: erlang-stdlib
-Requires: erlang-xmerl
+Requires: erlang-crypto >= R12B
+Requires: erlang-erts >= R12B
+Requires: erlang-inets >= R12B
+Requires: erlang-public_key >= R12B
+Requires: erlang-stdlib >= R12B
+Requires: erlang-xmerl >= R12B
%endif
@@ -33,6 +34,7 @@ An Erlang OAuth implementation.
%prep
%setup -q
+%patch1 -p1 -b .not_empty
sed -i s,\"dev\",\"0\",g src/%{realname}.app
@@ -67,6 +69,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri May 28 2010 Peter Lemenkov <lemenkov at gmail.com> 0-0.4.gite8aecf0
+- Fixed CouchDB failure (see rhbz #597093)
+- Fixed reqirements for F-11
+
* Thu May 27 2010 Peter Lemenkov <lemenkov at gmail.com> 0-0.3.gite8aecf0
- Fixed explicit requires on EL-[45]
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/erlang-oauth/EL-6/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log 27 May 2010 10:39:48 -0000 1.2
+++ import.log 28 May 2010 06:19:26 -0000 1.3
@@ -1,2 +1,3 @@
erlang-oauth-0-0_2_gite8aecf0_fc12:EL-6:erlang-oauth-0-0.2.gite8aecf0.fc12.src.rpm:1274764791
erlang-oauth-0-0_3_gite8aecf0_fc12:EL-6:erlang-oauth-0-0.3.gite8aecf0.fc12.src.rpm:1274956760
+erlang-oauth-0-0_4_gite8aecf0_fc12:EL-6:erlang-oauth-0-0.4.gite8aecf0.fc12.src.rpm:1275027546
- Previous message: rpms/erlang-oauth/F-11 erlang-oauth-0001-Do-not-use-empty-strings-as-params_from_header_strin.patch, NONE, 1.1 erlang-oauth.spec, 1.2, 1.3 import.log, 1.2, 1.3
- Next message: rpms/erlang-oauth/EL-5 erlang-oauth-0001-Do-not-use-empty-strings-as-params_from_header_strin.patch, NONE, 1.1 erlang-oauth.spec, 1.2, 1.3 import.log, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list