[erlang-esdl] Ver. 1.3.1 (bugfix release)

[Peter Lemenkov]

commit 070d9cf3cefff79338ca6d4f196ba126627c2c13
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Thu Sep 5 18:50:55 2013 +0400

    Ver. 1.3.1 (bugfix release)
    
    Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>

 .gitignore                                        |    1 +
 erlang-esdl-0001-Use-fedora-specific-CFLAGS.patch |   27 ----------
 erlang-esdl.spec                                  |   55 +++++++++------------
 sources                                           |    2 +-
 4 files changed, 26 insertions(+), 59 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8c68203..d162f82 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 esdl-1.0.1.src.tar.gz
 /esdl-1.2.src.tar.gz
 /dgud-esdl-esdl-1.3-0-g8b922fb.tar.gz
+/esdl-esdl-1.3.1.tar.gz
diff --git a/erlang-esdl.spec b/erlang-esdl.spec
index 32ce91c..b93cc7f 100644
--- a/erlang-esdl.spec
+++ b/erlang-esdl.spec
@@ -1,7 +1,4 @@
 %global realname esdl
-%global upstream dgud
-%global git_tag 8b922fb
-%global patchnumber 0
 %{?filter_setup:
 %filter_provides_in %{_libdir}/erlang/lib/.*\.so$
 %filter_setup
@@ -11,22 +8,23 @@
 
 
 Name:           erlang-%{realname}
-Version:        1.3
-Release:        3%{?dist}
+Version:        1.3.1
+Release:        1%{?dist}
 Summary:        Erlang OpenGL/SDL API and utilities
 Group:          Development/Libraries
 License:        MIT
 URL:            http://esdl.sourceforge.net
-# wget --content-disposition https://github.com/dgud/esdl/tarball/esdl-1.3
-Source0:	%{upstream}-%{realname}-esdl-%{version}-%{patchnumber}-g%{git_tag}.tar.gz
-Patch1:		erlang-esdl-0001-Use-fedora-specific-CFLAGS.patch
+%if 0%{?el7}%{?fedora}
+VCS:		scm:git:https://github.com/dgud/esdl.git
+%endif
+Source0:	https://github.com/dgud/esdl/archive/%{realname}-%{version}/%{realname}-%{realname}-%{version}.tar.gz
 BuildRequires:  SDL-devel
-BuildRequires:	erlang
+BuildRequires:	erlang-rebar
 BuildRequires:	dos2unix
 Requires:	erlang-erts%{?_isa}
 Requires:	erlang-kernel%{?_isa}
 Requires:	erlang-stdlib%{?_isa}
-# Dynamically loads erl_gl.so in sdl_video:setVideoMode/4
+# Dynamically loads erl_gl.so from erlang-wx package in sdl_video:setVideoMode/4
 Requires:	erlang-wx%{?_isa}
 Provides:	esdl = %{version}-%{release}
 Obsoletes:	%{name}-devel < 1.0.1-2
@@ -38,34 +36,25 @@ A library that gives you access to SDL and OpenGL functionality in
 your Erlang program.
 
 
-%define erlangdir %{_libdir}/erlang
-
 %prep
-%setup -q -n %{upstream}-%{realname}-e30f6f8
-%patch1 -p1 -b .cflags
-chmod 0644 Readme license.terms
-find -type f -name '*.[eh]rl' -exec chmod 0644 {} \;
-find -type f -name '*.[ch]' -exec chmod 0644 {} \;
-find -type f -name '*.[eh]rl' | xargs dos2unix
-find -type f -name '*.[ch]' | xargs dos2unix
-dos2unix Readme
+%setup -q -n %{realname}-%{realname}-%{version}
+chmod 0644 Readme
+find -type f -name '*.hrl' | xargs dos2unix
+find -type f -name '*.[ch]' | xargs chmod 0644
+sed -i -e "s,git,\"%{version}\",g" src/sdl.app.src
 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags}
+CFLAGS="%{optflags}" rebar compile -v
 
 
 %install
-mkdir -p %{buildroot}%{_libdir}/erlang/lib
-make INSTALLDIR=%{buildroot}%{_libdir}/erlang/lib/esdl-%{version} install
-find . -name '*.html' | xargs chmod 0644
-find %{buildroot}%{_libdir}/erlang/lib -name 'Readme*' | xargs rm -f
-find %{buildroot}%{_libdir}/erlang/lib -name 'license*' | xargs rm -f
-find %{buildroot}%{_libdir}/erlang/lib -name '*.beam' | xargs chmod 0644
-find %{buildroot}%{_libdir}/erlang/lib -name doc | xargs rm -fr
-rm -f %{buildroot}%{_libdir}/erlang/lib/esdl-%{version}/vsn.mk
-rm -rf %{buildroot}%{_libdir}/erlang/lib/esdl-%{version}/c_src
-rm -rf %{buildroot}%{_libdir}/erlang/lib/esdl-%{version}/src/*.erl
+mkdir -p %{buildroot}%{_libdir}/erlang/lib/%{realname}-%{version}/{ebin,include,priv,src}
+install -p -m 0644 ebin/sdl.app %{buildroot}%{_libdir}/erlang/lib/%{realname}-%{version}/ebin/
+install -p -m 0644 ebin/sdl*.beam %{buildroot}%{_libdir}/erlang/lib/%{realname}-%{version}/ebin
+install -p -m 0644 include/sdl*.hrl %{buildroot}%{_libdir}/erlang/lib/%{realname}-%{version}/include
+install -p -m 0755 priv/sdl_driver.so %{buildroot}%{_libdir}/erlang/lib/%{realname}-%{version}/priv/
+install -p -m 0644 src/*.hrl %{buildroot}%{_libdir}/erlang/lib/%{realname}-%{version}/src
 
 
 %files
@@ -78,6 +67,10 @@ rm -rf %{buildroot}%{_libdir}/erlang/lib/esdl-%{version}/src/*.erl
 
 
 %changelog
+* Thu Sep 05 2013 Peter Lemenkov <lemenkov at gmail.com> - 1.3.1-1
+- Ver. 1.3.1 (bugfix release)
+- Switch building to rebar
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 7f32cc6..a0bfd94 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-74d6b4c283aff75df35928416bc7d183  dgud-esdl-esdl-1.3-0-g8b922fb.tar.gz
+ecc528a9bfe310d2b6f85e29c2a25d9b  esdl-esdl-1.3.1.tar.gz