[erlang-js] Fix building releases using rebar
Peter Lemenkov
peter at fedoraproject.org
Fri Jul 20 10:23:37 UTC 2012
commit b33e92e016e61a4cfee40e58b7ddc46c06b84a5c
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Fri Jul 20 14:23:01 2012 +0400
Fix building releases using rebar
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
erlang-js.spec | 45 ++++++++++++++++++++++-----------------------
1 files changed, 22 insertions(+), 23 deletions(-)
---
diff --git a/erlang-js.spec b/erlang-js.spec
index 34dfd06..601da39 100644
--- a/erlang-js.spec
+++ b/erlang-js.spec
@@ -1,4 +1,4 @@
-%global realname js
+%global realname erlang_js
%global upstream basho
%global git_tag 16bc10d
%global patchnumber 0
@@ -8,15 +8,15 @@
}
-Name: erlang-%{realname}
+Name: erlang-js
Version: 1.0.2
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: A Friendly Erlang to Javascript Binding
Group: Development/Libraries
License: ASL 2.0
URL: https://github.com/basho/erlang_js
# wget --content-disposition https://github.com/basho/erlang_js/tarball/1.0.2
-Source0: %{upstream}-erlang_%{realname}-%{version}-%{patchnumber}-g%{git_tag}.tar.gz
+Source0: %{upstream}-%{realname}-%{version}-%{patchnumber}-g%{git_tag}.tar.gz
Patch1: erlang-js-0001-Fix-building-of-linked-in-driver.patch
Patch2: erlang-js-0002-build-fix-for-js-1.8.5.patch
Patch3: erlang-js-0003-Fix-deprecation-warning.patch
@@ -25,14 +25,13 @@ Patch5: erlang-js-0005-Use-standard-layout-for-rebar.patch
Patch6: erlang-js-0006-Dont-treat-warnings-as-errors.patch
Patch7: erlang-js-0007-Start-erlang_js-explicitly.patch
Patch9999: erlang-js-0002-Build-with-js-1.7.0.patch
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: erlang-rebar
BuildRequires: erlang-mochiweb
BuildRequires: js-devel
-Requires: erlang-erts >= R12B-5
-Requires: erlang-kernel >= R12B-5
-Requires: erlang-mochiweb
-Requires: erlang-stdlib >= R12B-5
+Requires: erlang-erts%{?_isa} >= R12B-5
+Requires: erlang-kernel%{?_isa} >= R12B-5
+Requires: erlang-mochiweb%{?_isa}
+Requires: erlang-stdlib%{?_isa} >= R12B-5
%description
@@ -40,7 +39,7 @@ A Friendly Erlang to Javascript Binding.
%prep
-%setup -q -n %{upstream}-erlang_%{realname}-0bf5965
+%setup -q -n %{upstream}-%{realname}-0bf5965
%patch1 -p1 -b .bundled_libs
%if 0%{?fedora}
%patch2 -p1 -b .building_with_js_1_8_0
@@ -59,17 +58,12 @@ rebar compile -v
%install
-rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_libdir}/erlang/lib/%{realname}-%{version}/ebin
mkdir -p $RPM_BUILD_ROOT%{_libdir}/erlang/lib/%{realname}-%{version}/priv
-install -m 644 ebin/erlang_%{realname}.app $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/*.beam $RPM_BUILD_ROOT%{_libdir}/erlang/lib/%{realname}-%{version}/ebin
install -m 644 priv/json2.js $RPM_BUILD_ROOT%{_libdir}/erlang/lib/%{realname}-%{version}/priv
-install -m 755 priv/erlang_js_drv.so $RPM_BUILD_ROOT%{_libdir}/erlang/lib/%{realname}-%{version}/priv
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+install -m 755 priv/%{realname}_drv.so $RPM_BUILD_ROOT%{_libdir}/erlang/lib/%{realname}-%{version}/priv
%check
@@ -77,21 +71,26 @@ rebar eunit -v
%files
-%defattr(-,root,root,-)
%doc LICENSE README.org
%dir %{_libdir}/erlang/lib/%{realname}-%{version}
%dir %{_libdir}/erlang/lib/%{realname}-%{version}/ebin
%dir %{_libdir}/erlang/lib/%{realname}-%{version}/priv
-%{_libdir}/erlang/lib/%{realname}-%{version}/ebin/erlang_%{realname}.app
-%{_libdir}/erlang/lib/%{realname}-%{version}/ebin/erlang_%{realname}.beam
-%{_libdir}/erlang/lib/%{realname}-%{version}/ebin/erlang_%{realname}_sup.beam
+%{_libdir}/erlang/lib/%{realname}-%{version}/ebin/%{realname}.app
%{_libdir}/erlang/lib/%{realname}-%{version}/ebin/%{realname}.beam
-%{_libdir}/erlang/lib/%{realname}-%{version}/ebin/%{realname}_*.beam
+%{_libdir}/erlang/lib/%{realname}-%{version}/ebin/%{realname}_sup.beam
+%{_libdir}/erlang/lib/%{realname}-%{version}/ebin/%{realname}.beam
+%{_libdir}/erlang/lib/%{realname}-%{version}/ebin/js.beam
+%{_libdir}/erlang/lib/%{realname}-%{version}/ebin/js_*.beam
%{_libdir}/erlang/lib/%{realname}-%{version}/priv/json2.js
-%{_libdir}/erlang/lib/%{realname}-%{version}/priv/erlang_js_drv.so
+%{_libdir}/erlang/lib/%{realname}-%{version}/priv/%{realname}_drv.so
%changelog
+* Fri Jul 20 2012 Peter Lemenkov <lemenkov at gmail.com> - 1.0.2-4
+- Fix building releases using rebar
+- Fix dependencides (add _isa)
+- Drop EL5-related stuff
+
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
More information about the scm-commits
mailing list