[erlang-amf] Updated to the next git tag and dropped upstreamed patch
Peter Lemenkov
peter at fedoraproject.org
Mon May 7 19:19:10 UTC 2012
commit 411732f53980f9ef8fa1c821035d0da4628e564d
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Mon May 7 23:19:01 2012 +0400
Updated to the next git tag and dropped upstreamed patch
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
.gitignore | 1 +
...amf-0001-Add-missing-amf3-decode-3-export.patch | 29 --------------------
...-amf-0001-Missing-BIFs-in-Erlang-OTP-R12B.patch | 22 +++++++-------
erlang-amf.spec | 23 +++++++++-------
sources | 2 +-
5 files changed, 26 insertions(+), 51 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ae32143..957b90a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/mujaheed-erlang-amf-2732914.tar.gz
+/mujaheed-erlang-amf-b36dfb6.tar.gz
diff --git a/erlang-amf-0002-Missing-BIFs-in-Erlang-OTP-R12B.patch b/erlang-amf-0001-Missing-BIFs-in-Erlang-OTP-R12B.patch
similarity index 84%
rename from erlang-amf-0002-Missing-BIFs-in-Erlang-OTP-R12B.patch
rename to erlang-amf-0001-Missing-BIFs-in-Erlang-OTP-R12B.patch
index 3257869..23dd052 100644
--- a/erlang-amf-0002-Missing-BIFs-in-Erlang-OTP-R12B.patch
+++ b/erlang-amf-0001-Missing-BIFs-in-Erlang-OTP-R12B.patch
@@ -1,7 +1,7 @@
-From 12397fed94bf07b5e35a75654a7fff5b6350c61b Mon Sep 17 00:00:00 2001
+From c2ad06c1cf42c6fbabd74c8de10b6871fa6a9dd9 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Sun, 31 Oct 2010 16:41:26 +0300
-Subject: [PATCH 2/2] Missing BIFs in Erlang/OTP R12B
+Subject: [PATCH 1/1] Missing BIFs in Erlang/OTP R12B
Erlang/OTP R12B has two necessary BIFs absent - atom_to_binary and
binary_to_atom. I constructed them from available BIFs.
@@ -13,10 +13,10 @@ Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/amf0.erl b/src/amf0.erl
-index c7bd644..ed0d7fe 100644
+index 33145c3..fb0a4c6 100644
--- a/src/amf0.erl
+++ b/src/amf0.erl
-@@ -58,7 +58,7 @@ decode(<<?OBJECT, Data/binary>>, Objects) ->
+@@ -65,7 +65,7 @@ decode(<<?OBJECT, Data/binary>>, Objects) ->
Key = gb_trees:size(Objects),
Objects1 = gb_trees:insert(Key, {ref, Key}, Objects),
{Members0, Objects2, Rest} = decode_members(Data, [], Objects1),
@@ -25,7 +25,7 @@ index c7bd644..ed0d7fe 100644
Object = {object, Members1},
Objects3 = gb_trees:update(Key, Object, Objects2),
{Object, Rest, Objects3};
-@@ -92,7 +92,7 @@ decode(<<?TYPEDOBJECT, L:16, Class:L/binary, Data/binary>>, Objects) ->
+@@ -99,7 +99,7 @@ decode(<<?TYPEDOBJECT, L:16, Class:L/binary, Data/binary>>, Objects) ->
Key = gb_trees:size(Objects),
Objects1 = gb_trees:insert(Key, {ref, Key}, Objects),
{Members0, Objects2, Rest} = decode_members(Data, [], Objects1),
@@ -34,7 +34,7 @@ index c7bd644..ed0d7fe 100644
Object = {object, Class, Members1},
Objects3 = gb_trees:update(Key, Object, Objects2),
{Object, Rest, Objects3};
-@@ -161,7 +161,7 @@ encode({object, Members} = Object, Objects) ->
+@@ -184,7 +184,7 @@ encode({object, Members} = Object, Objects) ->
inline ->
Key = gb_trees:size(Objects),
Objects1 = gb_trees:insert(Key, Object, Objects),
@@ -43,7 +43,7 @@ index c7bd644..ed0d7fe 100644
{Bin, Objects2} = encode_members(Members1, <<>>, Objects1),
{<<?OBJECT, Bin/binary>>, Objects2}
end;
-@@ -172,7 +172,7 @@ encode({object, Class, Members} = Object, Objects) ->
+@@ -195,7 +195,7 @@ encode({object, Class, Members} = Object, Objects) ->
inline ->
Key = gb_trees:size(Objects),
Objects1 = gb_trees:insert(Key, Object, Objects),
@@ -53,10 +53,10 @@ index c7bd644..ed0d7fe 100644
Bin1 = <<?TYPEDOBJECT, (size(Class)):16, Class/binary,Bin/binary>>,
{Bin1, Objects2}
diff --git a/src/amf3.erl b/src/amf3.erl
-index ad0d1cb..27aad2a 100644
+index bfae74e..711daf6 100644
--- a/src/amf3.erl
+++ b/src/amf3.erl
-@@ -236,7 +236,7 @@ decode_strings_as_atoms(0, Rest, Strings, Acc) ->
+@@ -251,7 +251,7 @@ decode_strings_as_atoms(0, Rest, Strings, Acc) ->
{lists:reverse(Acc), Rest, Strings};
decode_strings_as_atoms(N, Data, Strings, Acc) ->
{String, Rest, Strings1} = decode_string(Data, Strings),
@@ -65,7 +65,7 @@ index ad0d1cb..27aad2a 100644
decode_strings_as_atoms(N - 1, Rest, Strings1, [Atom | Acc]).
%% @doc Decodes an Object.
-@@ -540,7 +540,7 @@ encode_atoms_as_strings(Atoms, Strings) ->
+@@ -563,7 +563,7 @@ encode_atoms_as_strings(Atoms, Strings) ->
encode_atoms_as_strings([], Acc, Strings) ->
{Acc, Strings};
encode_atoms_as_strings([Atom | Rest], Acc, Strings) ->
@@ -75,5 +75,5 @@ index ad0d1cb..27aad2a 100644
%% @doc Inserts String into the reference table unless String is empty.
--
-1.7.2.3
+1.7.10.1
diff --git a/erlang-amf.spec b/erlang-amf.spec
index ccdb610..7c6783b 100644
--- a/erlang-amf.spec
+++ b/erlang-amf.spec
@@ -1,18 +1,19 @@
-%global realname amf
%global debug_package %{nil}
+%global realname amf
+%global git_tag b36dfb6
+%global patchnumber 0
Name: erlang-%{realname}
Version: 0
-Release: 0.5.20100908git27329144%{?dist}
+Release: 0.6.20110224git%{git_tag}%{?dist}
Summary: Erlang Action Message Format Library
Group: Development/Libraries
License: BSD
URL: http://github.com/mujaheed/erlang-amf
-# wget http://github.com/mujaheed/erlang-amf/tarball/27329144
-Source0: mujaheed-erlang-amf-2732914.tar.gz
-Patch1: erlang-amf-0001-Add-missing-amf3-decode-3-export.patch
-Patch2: erlang-amf-0002-Missing-BIFs-in-Erlang-OTP-R12B.patch
+# wget --no-check-certificate --content-disposition https://github.com/mujaheed/erlang-amf/tarball/b36dfb6
+Source0: mujaheed-%{name}-%{git_tag}.tar.gz
+Patch1: erlang-amf-0001-Missing-BIFs-in-Erlang-OTP-R12B.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: erlang-edoc
BuildRequires: erlang-erts
@@ -27,11 +28,10 @@ Erlang Action Message Format Library.
%prep
-%setup -q -n mujaheed-erlang-amf-2732914
-%patch1 -p1 -b .add_exports
+%setup -q -n mujaheed-%{name}-%{git_tag}
%if 0%{?el5}
# Erlang/OTP R12B5
-%patch2 -p1 -b .add_missing_bifs
+%patch1 -p1 -b .add_missing_bifs
%endif
@@ -62,7 +62,7 @@ make %{?_smp_mflags} test
%files
%defattr(-,root,root,-)
-%doc COPYRIGHT README doc
+%doc LICENSE README doc
%dir %{_libdir}/erlang/lib/%{realname}-%{version}
%dir %{_libdir}/erlang/lib/%{realname}-%{version}/ebin
%dir %{_libdir}/erlang/lib/%{realname}-%{version}/include
@@ -72,6 +72,9 @@ make %{?_smp_mflags} test
%changelog
+* Mon May 07 2012 Peter Lemenkov <lemenkov at gmail.com> - 0-0.6.20110224gitb36dfb6
+- Updated to the next git tag and dropped upstreamed patch
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0-0.5.20100908git27329144
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/sources b/sources
index 07c9407..18cd9b4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-168ce4e25fac6c77e8a5dde262a7c6df mujaheed-erlang-amf-2732914.tar.gz
+6e9698b4349453b9c3d009fc1faf6ebd mujaheed-erlang-amf-b36dfb6.tar.gz
More information about the scm-commits
mailing list