[erlang-emmap] Upstreamed patch, few fixes, and added emmap:read_line/1 function

[Peter Lemenkov]

commit 34ce224e76933398779866bbd4fd0bf0475ff60f
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Fri Dec 14 16:26:56 2012 +0400

    Upstreamed patch, few fixes, and added emmap:read_line/1 function
    
    Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>

 .gitignore                                         |    1 +
 erlang-emmap-0001-No-MAP_NOCACHE-on-Linux.patch    |   29 --------------------
 ...1-Skip-dependency-checking-in-Fedora-EPEL.patch |   10 +++---
 erlang-emmap.spec                                  |   18 ++++++------
 krestenkrab-emmap-8725d46.tar.gz                   |  Bin 110212 -> 0 bytes
 sources                                            |    2 +-
 6 files changed, 16 insertions(+), 44 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..d5ad74b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/krestenkrab-emmap-05ae1bb.tar.gz
diff --git a/erlang-emmap-0002-Skip-dependency-checking-in-Fedora-EPEL.patch b/erlang-emmap-0001-Skip-dependency-checking-in-Fedora-EPEL.patch
similarity index 75%
rename from erlang-emmap-0002-Skip-dependency-checking-in-Fedora-EPEL.patch
rename to erlang-emmap-0001-Skip-dependency-checking-in-Fedora-EPEL.patch
index f4a130c..dba0cf4 100644
--- a/erlang-emmap-0002-Skip-dependency-checking-in-Fedora-EPEL.patch
+++ b/erlang-emmap-0001-Skip-dependency-checking-in-Fedora-EPEL.patch
@@ -1,7 +1,7 @@
-From d5868b943254601774371e2b91075e0fcefd3851 Mon Sep 17 00:00:00 2001
+From 490f355151e15efb6882004b398cf7dd892d8ee1 Mon Sep 17 00:00:00 2001
 From: Peter Lemenkov <lemenkov at gmail.com>
 Date: Tue, 13 Nov 2012 15:36:38 +0400
-Subject: [PATCH 2/2] Skip dependency checking in Fedora/EPEL
+Subject: [PATCH 1/1] Skip dependency checking in Fedora/EPEL
 
 Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
 ---
@@ -9,10 +9,10 @@ Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
  1 file changed, 2 deletions(-)
 
 diff --git a/rebar.config b/rebar.config
-index 9c09b72..eb362f6 100644
+index b734eb0..5e6cdb5 100644
 --- a/rebar.config
 +++ b/rebar.config
-@@ -9,8 +9,6 @@
+@@ -8,8 +8,6 @@
                "CFLAGS", "$CFLAGS -DNDEBUG"}
              ]}.
  
@@ -22,5 +22,5 @@ index 9c09b72..eb362f6 100644
               {source_path, ["src", "test"]},
               {stylesheet, ""},
 -- 
-1.7.12.1
+1.8.0.1
 
diff --git a/erlang-emmap.spec b/erlang-emmap.spec
index 060dd70..2257bbf 100644
--- a/erlang-emmap.spec
+++ b/erlang-emmap.spec
@@ -1,6 +1,6 @@
 %global realname emmap
 %global upstream krestenkrab
-%global git_tag 8725d46
+%global git_tag 05ae1bb
 %global patchnumber 0
 %{?filter_setup:
 %filter_provides_in %{_libdir}/erlang/lib/.*\.so$
@@ -10,17 +10,15 @@
 
 Name:		erlang-%{realname}
 Version:	0
-Release:	0.1.git%{git_tag}%{?dist}
+Release:	0.2.git%{git_tag}%{?dist}
 Summary:	Erlang mmap interface
 Group:		Development/Languages
 License:	ASL 2.0
 URL:		https://github.com/krestenkrab/emmap
-# wget --content-disposition https://github.com/krestenkrab/emmap/tarball/8725d46
+# wget https://github.com/krestenkrab/emmap/archive/05ae1bb.tar.gz -O krestenkrab-emmap-05ae1bb.tar.gz
 Source0:	%{upstream}-%{realname}-%{git_tag}.tar.gz
-# Sent upstream https://github.com/krestenkrab/emmap/pull/2
-Patch1:		erlang-emmap-0001-No-MAP_NOCACHE-on-Linux.patch
 # Fedora/EPEL-specific
-Patch2:		erlang-emmap-0002-Skip-dependency-checking-in-Fedora-EPEL.patch
+Patch1:		erlang-emmap-0001-Skip-dependency-checking-in-Fedora-EPEL.patch
 BuildRequires:	erlang-rebar
 # Error:erlang(erlang:load_nif/2) in R12B and older
 Requires:	erlang-erts%{?_isa} >= R13B
@@ -34,9 +32,8 @@ the Erlang memory space.
 
 
 %prep
-%setup -q -n %{upstream}-%{realname}-%{git_tag}
-%patch1 -p1 -b .linux
-%patch2 -p1 -b .nodeps
+%setup -q -n %{realname}-05ae1bbc8b9b584473483023643fdc3f329a7698
+%patch1 -p1 -b .nodeps
 
 
 %build
@@ -65,5 +62,8 @@ rebar eunit -v
 
 
 %changelog
+* Fri Dec 14 2012 Peter Lemenkov <lemenkov at gmail.com> - 0-0.2.git05ae1bb
+- Upstreamed patch, few fixes, and added emmap:read_line/1 function
+
 * Tue Nov 13 2012 Peter Lemenkov <lemenkov at gmail.com> - 0-0.1.git8725d46
 - Initial build
diff --git a/sources b/sources
index 2493380..c7449ef 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-293cb625db449fb83ea1a649eabd546f  krestenkrab-emmap-8725d46.tar.gz
+b4d5674bf86600df7b71922a25a7fdda  krestenkrab-emmap-05ae1bb.tar.gz