diff --git a/.gitignore b/.gitignore index 1856318..ebad96d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ *.src.rpm /elixir-lang-elixir-v0.5.0-0-g6052352.tar.gz /elixir-lang-elixir-v0.6.0-0-g01a575e.tar.gz +/elixir-lang-elixir-v0.7.0-0-g833e9e9.tar.gz diff --git a/elixir.spec b/elixir.spec index e5be15f..0c667cc 100644 --- a/elixir.spec +++ b/elixir.spec @@ -1,8 +1,8 @@ -%define gitcommit 01a575e -%define gitdate 20120801 +%define gitcommit 833e9e9 +%define gitdate 20121022 %define patchlevel 0 Name: elixir -Version: 0.6.0 +Version: 0.7.0 Release: 1.%{gitdate}git%{gitcommit}%{?dist} Summary: A modern approach to programming for the Erlang VM @@ -27,6 +27,9 @@ fault-tolerant, non-stop applications with hot code swapping. %prep %setup -q -n %{name}-lang-%{name}-%{gitcommit} +rm rebar +sed -i '/REBAR:=$(/d' Makefile +sed -i '1i REBAR:=$(shell which rebar || echo `pwd`/rebar)' Makefile sed -i -e "s/time //g" Makefile find -name '*.bat' -exec rm \{\} \; @@ -34,17 +37,11 @@ find -name '*.bat' -exec rm \{\} \; make %{?_smp_mflags} %check -# The need for this has fixed upstream and will be in the next release. -git config --global user.name "Fedora Build" - make test %install rm -rf %{buildroot} -# Removed packaged binary (rebar) which we already have as a build dep -rm rebar - mkdir -p %{buildroot}/%{_datadir}/%{name}/%{version} cp -ra bin lib %{buildroot}/%{_datadir}/%{name}/%{version} @@ -64,11 +61,11 @@ rm -rf %{buildroot} %changelog -* Wed Aug 1 2012 Ricky Elrod - 0.6.0-1.20120801git01a575e -- Update to upstream 0.6.0. +* Mon Oct 22 2012 Ricky Elrod - 0.7.0-1.20121022git833e9e9 +- Update to upstream 0.7.0. -* Wed Jul 18 2012 Fedora Release Engineering - 0.5.0-2.20120526git6052352 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild +* Wed Aug 1 2012 Ricky Elrod - 0.6.0-1.20120801git109919c +- Update to upstream 0.6.0. * Sat May 26 2012 Ricky Elrod - 0.5.0-1.20120526git6052352 - Initial build. diff --git a/sources b/sources index 49f09de..9e1918b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -171294c348136ab4a09c6bbe55e0d350 elixir-lang-elixir-v0.6.0-0-g01a575e.tar.gz +ef1da9e373af9fedeb50614d992a2895 elixir-lang-elixir-v0.7.0-0-g833e9e9.tar.gz