rpms/erlang-oauth/EL-6 erlang-oauth-0002-Use-0-as-version-instead-of-dev.patch, NONE, 1.1 erlang-oauth-0001-Do-not-use-empty-strings-as-params_from_header_strin.patch, 1.1, 1.2 erlang-oauth.spec, 1.3, 1.4 import.log, 1.3, 1.4

Peter Lemenkov peter at fedoraproject.org
Mon Jul 12 09:40:46 UTC 2010


Author: peter

Update of /cvs/pkgs/rpms/erlang-oauth/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv18401/EL-6

Modified Files:
	erlang-oauth-0001-Do-not-use-empty-strings-as-params_from_header_strin.patch 
	erlang-oauth.spec import.log 
Added Files:
	erlang-oauth-0002-Use-0-as-version-instead-of-dev.patch 
Log Message:
Added missing requirement - erlang-kernel

erlang-oauth-0002-Use-0-as-version-instead-of-dev.patch:
 oauth.app |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE erlang-oauth-0002-Use-0-as-version-instead-of-dev.patch ---
>From 7221beb0db12b7eca7ee410336a111c743aae7c0 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Mon, 12 Jul 2010 13:27:50 +0400
Subject: [PATCH 2/2] Use 0 as version instead of 'dev'

Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
 src/oauth.app |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/oauth.app b/src/oauth.app
index 6357b9b..8c06e53 100644
--- a/src/oauth.app
+++ b/src/oauth.app
@@ -1,6 +1,6 @@
 {application, oauth, [
   {description, "Erlang OAuth implementation"},
-  {vsn, "dev"},
+  {vsn, "0"},
   {modules, [
     oauth,
     oauth_hmac_sha1,
-- 
1.7.1.1


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(-)

Index: erlang-oauth-0001-Do-not-use-empty-strings-as-params_from_header_strin.patch
===================================================================
RCS file: /cvs/pkgs/rpms/erlang-oauth/EL-6/erlang-oauth-0001-Do-not-use-empty-strings-as-params_from_header_strin.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- erlang-oauth-0001-Do-not-use-empty-strings-as-params_from_header_strin.patch	28 May 2010 06:19:26 -0000	1.1
+++ erlang-oauth-0001-Do-not-use-empty-strings-as-params_from_header_strin.patch	12 Jul 2010 09:40:46 -0000	1.2
@@ -1,7 +1,7 @@
-From 144c96d00e0e46f3b822b3cdaa82b45ea26c13f3 Mon Sep 17 00:00:00 2001
+From ffecd54c8794e7317252050330f95cce3a6b6478 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
+Subject: [PATCH 1/2] Do not use empty strings as params_from_header_string argument
 
 ---
  src/oauth_uri.erl |    2 +-
@@ -21,5 +21,5 @@ index c019427..5023f98 100644
  param_from_header_string(Param) ->
    [Key, QuotedValue] = string:tokens(Param, "="),
 -- 
-1.6.6.1
+1.7.1.1
 


Index: erlang-oauth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/erlang-oauth/EL-6/erlang-oauth.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- erlang-oauth.spec	28 May 2010 06:19:26 -0000	1.3
+++ erlang-oauth.spec	12 Jul 2010 09:40:46 -0000	1.4
@@ -4,7 +4,7 @@
 
 Name:		erlang-%{realname}
 Version:	0
-Release:	0.4.gite8aecf0%{?dist}
+Release:	0.5.gite8aecf0%{?dist}
 Summary:	An Erlang OAuth implementation
 Group:		Development/Languages
 License:	MIT
@@ -14,18 +14,16 @@ URL:		http://github.com/tim/erlang-oauth
 ## 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
+Patch2:		erlang-oauth-0002-Use-0-as-version-instead-of-dev.patch
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:	erlang
-%if 0%{?el4}%{?el5}%{?fc11}
-Requires: erlang >= R12B
-%else
 Requires: erlang-crypto >= R12B
 Requires: erlang-erts >= R12B
 Requires: erlang-inets >= R12B
+Requires: erlang-kernel >= R12B
 Requires: erlang-public_key >= R12B
 Requires: erlang-stdlib >= R12B
 Requires: erlang-xmerl >= R12B
-%endif
 
 
 %description
@@ -35,7 +33,7 @@ An Erlang OAuth implementation.
 %prep
 %setup -q
 %patch1 -p1 -b .not_empty
-sed -i s,\"dev\",\"0\",g src/%{realname}.app
+%patch2 -p1 -b .version
 
 
 %build
@@ -69,6 +67,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jul 12 2010 Peter Lemenkov <lemenkov at gmail.com> 0-0.5.gite8aecf0
+- Rebuild with new Erlang R14A
+- Simplified spec-file
+- Added missing requirement - erlang-kernel
+
 * 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


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/erlang-oauth/EL-6/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	28 May 2010 06:19:26 -0000	1.3
+++ import.log	12 Jul 2010 09:40:46 -0000	1.4
@@ -1,3 +1,4 @@
 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
+erlang-oauth-0-0_5_gite8aecf0_fc12:EL-6:erlang-oauth-0-0.5.gite8aecf0.fc12.src.rpm:1278927621



More information about the scm-commits mailing list