From 4b4aa31f6c39d54ba836e0dd885463d9a189abe4 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: May 28 2010 06:21:24 +0000 Subject: Fixed CouchDB failure (see rhbz #597093). --- diff --git a/erlang-oauth-0001-Do-not-use-empty-strings-as-params_from_header_strin.patch b/erlang-oauth-0001-Do-not-use-empty-strings-as-params_from_header_strin.patch new file mode 100644 index 0000000..21938d5 --- /dev/null +++ b/erlang-oauth-0001-Do-not-use-empty-strings-as-params_from_header_strin.patch @@ -0,0 +1,25 @@ +From 144c96d00e0e46f3b822b3cdaa82b45ea26c13f3 Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +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 + diff --git a/erlang-oauth.spec b/erlang-oauth.spec index 4561185..4312e4c 100644 --- a/erlang-oauth.spec +++ b/erlang-oauth.spec @@ -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 0-0.4.gite8aecf0 +- Fixed CouchDB failure (see rhbz #597093) +- Fixed reqirements for F-11 + * Thu May 27 2010 Peter Lemenkov 0-0.3.gite8aecf0 - Fixed explicit requires on EL-[45] diff --git a/import.log b/import.log index f97f9c5..7fa45a6 100644 --- a/import.log +++ b/import.log @@ -1,2 +1,3 @@ erlang-oauth-0-0_2_gite8aecf0_fc12:EL-4:erlang-oauth-0-0.2.gite8aecf0.fc12.src.rpm:1274765193 erlang-oauth-0-0_3_gite8aecf0_fc12:EL-4:erlang-oauth-0-0.3.gite8aecf0.fc12.src.rpm:1274956842 +erlang-oauth-0-0_4_gite8aecf0_fc12:EL-4:erlang-oauth-0-0.4.gite8aecf0.fc12.src.rpm:1275027660