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

Fix build for 17.0

OBS-URL: https://build.opensuse.org/request/show/237616
OBS-URL: https://build.opensuse.org/package/show/devel:languages:erlang/erlang-erlware_commons?expand=0&rev=2

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

@@ -1,14 +0,0 @@
---- rebar.config	2013-04-29 13:27:16.701440568 +0200
-+++ rebar.config.patched	2013-04-29 13:31:49.798444814 +0200
-@@ -1,9 +1,8 @@
- %% -*- mode: Erlang; fill-column: 80; comment-column: 75; -*-
- 
- %% Dependencies ================================================================
--{deps, [{rebar_vsn_plugin, ".*",
--         {git, "https://github.com/erlware/rebar_vsn_plugin.git",
--          {branch, "master"}}}]}.
-+{deps, [
-+]}.
- 
- {erl_first_files, ["ec_dictionary"]}.
- 

_service

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

erlang-erlware_commons.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue Jun 17 07:29:38 UTC 2014 - matwey.kornilov@gmail.com
+
+- Fix build for 17.0
+
+-------------------------------------------------------------------
+Wed Apr 16 13:21:46 UTC 2014 - matwey.kornilov@gmail.com
+
+- Version 0.11.0
+
 -------------------------------------------------------------------
 Mon Apr 29 11:41:40 UTC 2013 - nkrinner@suse.com
 

erlang-erlware_commons.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package erlang-erlware_commons
 #
-# 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,42 +15,53 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-Name:           erlang-erlware_commons
+
-Version:        0.0.0+git.1366827121.0fbd457
+%define app_name erlware_commons
-%define mod_ver %(echo "%{version}" | cut -d "+" -f1)
+Name:           erlang-%{app_name}
+Version:        0.11.0+git20140524.c2d67e6
 Release:        0
-License:        MIT
+%define app_ver %(echo "%{version}" | cut -d "+" -f1)
 Summary:        A project focused on all aspects of reusable Erlang components
-Url:            https://github.com/erlware/erlware_commons
+License:        MIT
 Group:          Development/Libraries/Other
-Source:         erlware_commons-%{version}.tar.gz
+Url:            https://github.com/erlware/erlware_commons
-Patch01:        PATCH01-remove-dependencies-from-rebar.config-file.patch
+Source:         %{app_name}-%{version}.tar.bz2
-BuildRequires:  erlang-rebar
 Requires:       erlang
+BuildRequires:  erlang
+BuildRequires:  erlang-neotoma
+BuildRequires:  erlang-proper
+BuildRequires:  erlang-rebar
 BuildRequires:  erlang-rebar_vsn_plugin
-Requires:       erlang-rebar_vsn_plugin
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 Erlware Commons is an Erlware project focused on all aspects of reusable Erlang components.
 
-
 %prep
-%setup -n erlware_commons-%{version}
+%setup -q -n %{app_name}-%{version}
-%patch01
 
 %build
-%rebar compile escriptize
+make
+make doc
 
 %install
-for dir in ebin priv ; do
+for dir in ebin include priv ; do
-  install -d %{buildroot}%{erlang_libdir}/erlware_commons-%{mod_ver}/${dir}
+	mkdir -p %{buildroot}%{erlang_libdir}/%{app_name}-%{app_ver}/${dir}
-  cp -r ${dir}/* %{buildroot}%{erlang_libdir}/erlware_commons-%{mod_ver}/${dir}/
+	cp -r ${dir}/* %{buildroot}%{erlang_libdir}/%{app_name}-%{app_ver}/${dir}/
 done
 
+%check
+make test
+
 %files
 %defattr(-,root,root)
-%dir %{erlang_libdir}/erlware_commons-%{mod_ver}
+%doc doc
-%{erlang_libdir}/erlware_commons-%{mod_ver}/ebin
+%dir %{erlang_libdir}/%{app_name}-%{app_ver}
-%{erlang_libdir}/erlware_commons-%{mod_ver}/priv
+%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
+%{erlang_libdir}/%{app_name}-%{app_ver}/priv
 
+%changelog

erlware_commons-0.0.0+git.1366827121.0fbd457.tar.gz

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

erlware_commons-0.11.0+git20140524.c2d67e6.tar.bz2

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