Accepting request 237621 from home:matwey:branches:devel:languages:erlang

Fix build for 17.0

OBS-URL: https://build.opensuse.org/request/show/237621
OBS-URL: https://build.opensuse.org/package/show/devel:languages:erlang/erlang-sqerl?expand=0&rev=3

PATCH01-remove-dependencies-from-rebar.config-file.patch

@@ -1,20 +0,0 @@
---- rebar.config	2013-04-25 21:29:06.962716716 +0200
-+++ rebar.config.patched	2013-04-26 11:45:07.599460737 +0200
-@@ -4,16 +4,7 @@
- {erl_first_files, ["src/sqerl_client.erl"]}.
- 
- {deps, [%% we have a patch to emysql pending merging
--        {emysql, ".*", {git, "git://github.com/opscode/Emysql.git", {tag, "0.2.13.14"}}},
--
--        %% This is until a patch of ours gets merged into the main epgsql repo
--        {epgsql, ".*",
--         {git, "git://github.com/opscode/epgsql.git", "master"}},
--
--        {automeck, ".*",
--         {git, "git://github.com/opscode/automeck.git", {branch, "master"}}},
--        {pooler, ".*",
--         {git, "git://github.com/seth/pooler.git", {tag, "0.0.2"}}}]}.
-+]}.
- 
- {eunit_opts,
-  [verbose,

_service

@@ -1,17 +1,13 @@
 <services>
-  <service name="tar_scm" mode="disabled">
-    <param name="url">git://github.com/opscode/sqerl.git</param>
-    <param name="scm">git</param>
-    <param name="versionformat">0.0.0+git.%ct.%h</param>
-  </service>
-
-  <service name="recompress" mode="disabled">
-    <param name="file">sqerl-*.tar</param>
-    <param name="compression">gz</param>
-  </service>
-
-  <service name="set_version" mode="disabled">
-    <param name="basename">sqerl</param>
-  </service>
+	<service name="tar_scm" mode="disabled">
+		<param name="url">https://github.com/opscode/sqerl/</param>
+		<param name="versionformat">0.0.0+git%cd.%h</param>
+		<param name="scm">git</param>
+	</service>
+	<service name="recompress" mode="disabled">
+		<param name="compression">bz2</param>
+		<param name="file">*.tar</param>
+	</service>
+	<service name="set_version" mode="disabled">
+	</service>
 </services>
-

erlang-sqerl.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jun 17 07:36:10 UTC 2014 - matwey.kornilov@gmail.com
+
+- Fix build for 17.0
+
 -------------------------------------------------------------------
 Fri Apr 26 10:46:24 UTC 2013 - nkrinner@suse.com
 

erlang-sqerl.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package erlang-sqerl
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,47 +15,58 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-Name:           erlang-sqerl
-Version:        0.0.0+git.1355807680.967068b
-%define mod_ver %(echo "%{version}" | cut -d "+" -f1)
+
+%define app_name sqerl
+Name:           erlang-%{app_name}
+Version:        0.0.0+git20140607.5ce1237
 Release:        0
-License:        Apache-2.0
+%define app_ver %(echo "%{version}" | cut -d "+" -f1)
 Summary:        General purpose RDBMS abstraction layer
-Url:            http://github.com/opscode/sqerl/
+License:        Apache-2.0
 Group:          Development/Libraries/Other
-Source:         sqerl-%{version}.tar.gz
-Patch01:        PATCH01-remove-dependencies-from-rebar.config-file.patch
-BuildRequires:  erlang-rebar
+Url:            http://github.com/opscode/sqerl/
+Source:         %{app_name}-%{version}.tar.bz2
 Requires:       erlang
+BuildRequires:  erlang
 BuildRequires:  erlang-emysql
+BuildRequires:  erlang-rebar
 Requires:       erlang-emysql
 BuildRequires:  erlang-epgsql
 Requires:       erlang-epgsql
 BuildRequires:  erlang-automeck
 Requires:       erlang-automeck
+BuildRequires:  erlang-envy
+Requires:       erlang-envy
 BuildRequires:  erlang-pooler
 Requires:       erlang-pooler
+# for eunit
+BuildRequires:  erlang-parse_trans
+BuildRequires:  postgresql
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 General purpose RDBMS abstraction layer.
 
 %prep
-%setup -n sqerl-%{version}
-%patch01
+%setup -q -n %{app_name}-%{version}
 
 %build
-%rebar compile escriptize
+%rebar compile
 
 %install
 for dir in ebin include ; do
-  install -d %{buildroot}%{erlang_libdir}/sqerl-%{mod_ver}/${dir}
-  cp -r ${dir}/* %{buildroot}%{erlang_libdir}/sqerl-%{mod_ver}/${dir}/
+	mkdir -p %{buildroot}%{erlang_libdir}/%{app_name}-%{app_ver}/${dir}
+	cp -r ${dir}/* %{buildroot}%{erlang_libdir}/%{app_name}-%{app_ver}/${dir}/
 done
 
 %files
 %defattr(-,root,root)
-%dir %{erlang_libdir}/sqerl-%{mod_ver}
-%{erlang_libdir}/sqerl-%{mod_ver}/ebin
-%{erlang_libdir}/sqerl-%{mod_ver}/include
+%doc README.md LICENSE doc
+%dir %{erlang_libdir}/%{app_name}-%{app_ver}
+%dir %{erlang_libdir}/%{app_name}-%{app_ver}/ebin
+%{erlang_libdir}/%{app_name}-%{app_ver}/ebin/%{app_name}.app
+%{erlang_libdir}/%{app_name}-%{app_ver}/ebin/*.beam
+%dir %{erlang_libdir}/%{app_name}-%{app_ver}/include
+%{erlang_libdir}/%{app_name}-%{app_ver}/include/*.hrl
 
+%changelog

sqerl-0.0.0+git.1355807680.967068b.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dfc7ccd5eacab6d617ace46db72f6e89069c6d2aaf70fb1ef0f6c488b4f5d941
-size 38685

sqerl-0.0.0+git20140607.5ce1237.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d8daeafbdd6eff523ae172c24b63b832a0c99ea8648351bdf65882846dc557d6
+size 51323