[erlang-protobuffs] Ver. 0.7.0

[Peter Lemenkov]

commit c368889c4579ff7850feaceab9e69b820b1b8c5f
Author: Fedora Build <lemenkov at gmail.com>
Date:   Fri Sep 7 19:01:25 2012 +0400

    Ver. 0.7.0
    
    Signed-off-by: Fedora Build <lemenkov at gmail.com>

 .gitignore                                         |    1 +
 ...s-to-see-if-leaving-the-encoded-protocol-.patch |   79 --------------------
 ...-0002-Added-debug-info-to-generated-beams.patch |   25 ------
 ...buffs-how-to-skip-directives-it-doesn-t-u.patch |   26 -------
 erlang-protobuffs.spec                             |   73 ++++++++++--------
 sources                                            |    2 +-
 6 files changed, 44 insertions(+), 162 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ec9e491..c147b33 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /ngerakines-erlang_protobuffs-58ff962.tar.gz
+/basho-erlang_protobuffs-0.7.0-0-g4fbc5f6.tar.gz
diff --git a/erlang-protobuffs.spec b/erlang-protobuffs.spec
index 0b34ef1..d367333 100644
--- a/erlang-protobuffs.spec
+++ b/erlang-protobuffs.spec
@@ -1,30 +1,31 @@
 %global realname protobuffs
+%global upstream basho
 %global debug_package %{nil}
-%global git_tag 58ff962
+%global git_tag 4fbc5f6
+%global patchnumber 0
 
 
 Name:		erlang-%{realname}
-Version:	0
-Release:	0.6.20100930git%{git_tag}%{?dist}
+Version:	0.7.0
+Release:	1%{?dist}
 Summary:	A set of Protocol Buffers tools and modules for Erlang applications
 Group:		Development/Libraries
 License:	MIT
 URL:		http://github.com/ngerakines/erlang_protobuffs
-# wget http://github.com/ngerakines/erlang_protobuffs/tarball/58ff962
-Source0:	ngerakines-erlang_%{realname}-%{git_tag}.tar.gz
-# All patches below were taken from Basho's fork
-Patch1:		erlang-protobuffs-0001-Test-changes-to-see-if-leaving-the-encoded-protocol-.patch
-Patch2:		erlang-protobuffs-0002-Added-debug-info-to-generated-beams.patch
-Patch3:		erlang-protobuffs-0003-Teach-protobuffs-how-to-skip-directives-it-doesn-t-u.patch
+# wget --content-disposition https://github.com/basho/erlang_protobuffs/tarball/0.7.0
+Source0:	%{upstream}-erlang_%{realname}-%{version}-%{patchnumber}-g%{git_tag}.tar.gz
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-BuildRequires:	erlang-erts
-BuildRequires:	erlang-etap
-# For /usr/bin/prove
-BuildRequires:	perl(Test::Harness)
-Requires:	erlang-compiler
-Requires:	erlang-erts >= R12B-5
-Requires:	erlang-kernel
-Requires:	erlang-stdlib >= R12B-5
+BuildRequires:	erlang-meck
+BuildRequires:	erlang-rebar
+Requires:	erlang-compiler%{?_isa}
+# Error:erlang(lists:keyfind/3) in R12B and below
+Requires:	erlang-erts%{?_isa} >= R13B
+Requires:	erlang-kernel%{?_isa}
+# Error:erlang(erl_scan:token_info/2) in R12B and below
+# Error:erlang(io_lib:write_unicode_string/1) in R12B and below
+# Error:erlang(unicode:characters_to_binary/1) in R12B and below
+Requires:	erlang-stdlib%{?_isa} >= R13B
+Requires:	erlang-syntax_tools%{?_isa}
 
 
 %description
@@ -32,25 +33,26 @@ A set of Protocol Buffers tools and modules for Erlang applications.
 
 
 %prep
-%setup -q -n ngerakines-erlang_%{realname}-%{git_tag}
-%patch1 -p1 -b .p1
-%patch2 -p1 -b .p2
-%patch3 -p1 -b .p3
-mkdir ebin
-sed -i -e "s,\.\.\/src,\.\.\/ebin,g" tests/*.t
+%setup -q -n %{upstream}-erlang_%{realname}-46650bb
+sed -i -e "/{meck/d" rebar.config
 
 
 %build
-erlc +debug_info -o ebin src/*erl
+rebar compile -v
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -D -m 644 ebin/%{realname}.beam $RPM_BUILD_ROOT%{_libdir}/erlang/lib/%{realname}-%{version}/ebin/%{realname}.beam
+install -d $RPM_BUILD_ROOT%{_libdir}/erlang/lib/%{realname}-%{version}/ebin/
+install -m 644 ebin/pokemon_pb.beam $RPM_BUILD_ROOT%{_libdir}/erlang/lib/%{realname}-%{version}/ebin/
+install -m 644 ebin/%{realname}.app $RPM_BUILD_ROOT%{_libdir}/erlang/lib/%{realname}-%{version}/ebin/
 install -m 644 ebin/%{realname}.beam $RPM_BUILD_ROOT%{_libdir}/erlang/lib/%{realname}-%{version}/ebin/
 install -m 644 ebin/%{realname}_compile.beam $RPM_BUILD_ROOT%{_libdir}/erlang/lib/%{realname}-%{version}/ebin/
+install -m 644 ebin/%{realname}_file.beam $RPM_BUILD_ROOT%{_libdir}/erlang/lib/%{realname}-%{version}/ebin/
 install -m 644 ebin/%{realname}_parser.beam $RPM_BUILD_ROOT%{_libdir}/erlang/lib/%{realname}-%{version}/ebin/
-install -m 644 ebin/pokemon_pb.beam $RPM_BUILD_ROOT%{_libdir}/erlang/lib/%{realname}-%{version}/ebin/
+install -m 644 ebin/%{realname}_scanner.beam $RPM_BUILD_ROOT%{_libdir}/erlang/lib/%{realname}-%{version}/ebin/
+# Install Erlang protobuf compiler script
+install -D -p -m 755 bin/protoc-erl $RPM_BUILD_ROOT%{_bindir}/protoc-erl
 
 
 %clean
@@ -58,21 +60,30 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %check
-cd ./tests && ./runtests.sh
+rebar eunit -v
+rebar ct -v
 
 
 %files
-%defattr(-,root,root,-)
-%doc AUTHORS
-%dir %{_libdir}/erlang/lib/%{realname}-%{version}
-%dir %{_libdir}/erlang/lib/%{realname}-%{version}/ebin
+%doc AUTHORS README.markdown
+%dir %{_libdir}/erlang/lib/%{realname}-%{version}/
+%dir %{_libdir}/erlang/lib/%{realname}-%{version}/ebin/
+%{_bindir}/protoc-erl
 %{_libdir}/erlang/lib/%{realname}-%{version}/ebin/pokemon_pb.beam
+%{_libdir}/erlang/lib/%{realname}-%{version}/ebin/%{realname}.app
 %{_libdir}/erlang/lib/%{realname}-%{version}/ebin/%{realname}.beam
 %{_libdir}/erlang/lib/%{realname}-%{version}/ebin/%{realname}_compile.beam
+%{_libdir}/erlang/lib/%{realname}-%{version}/ebin/%{realname}_file.beam
 %{_libdir}/erlang/lib/%{realname}-%{version}/ebin/%{realname}_parser.beam
+%{_libdir}/erlang/lib/%{realname}-%{version}/ebin/%{realname}_scanner.beam
 
 
 %changelog
+* Wed Sep 05 2012 Peter Lemenkov <lemenkov at gmail.com> - 0.7.0-1
+- Upstream is switched to Basho
+- Ver. 0.7.0
+- Dropped all Basho's patches
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0-0.6.20100930git58ff962
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index b45d02a..b98440c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ef08e31d3b08548d820e9508de57a31d  ngerakines-erlang_protobuffs-58ff962.tar.gz
+52863dd7ea401ff8819eb2eed8e14374  basho-erlang_protobuffs-0.7.0-0-g4fbc5f6.tar.gz