diff --git a/_service b/_service
index ee5df90..9a08336 100644
--- a/_service
+++ b/_service
@@ -2,23 +2,12 @@
git
git://github.com/elixir-lang/elixir
@PARENT_TAG@
- v0.12.4
+ v1.0.4
+ enable
-
- git
- git://github.com/elixir-lang/ex_doc
- master
-
-
+
elixir-*.tar
bz2
-
-
- ex_doc-*.tar
- bz2
-
-
-
diff --git a/_servicedata b/_servicedata
new file mode 100644
index 0000000..85b1abb
--- /dev/null
+++ b/_servicedata
@@ -0,0 +1,4 @@
+
+
+ git://github.com/elixir-lang/elixir
+ e02d7bf913f3e5ea8c9e49648e69324ec5c65919
\ No newline at end of file
diff --git a/elixir-doc.spec b/elixir-doc.spec
new file mode 100644
index 0000000..2acb36d
--- /dev/null
+++ b/elixir-doc.spec
@@ -0,0 +1,55 @@
+#
+# spec file for package elixir-doc
+#
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
+
+Name: elixir-doc
+Version: 1.0.4
+Release: 0
+Summary: Documentation for elixir
+License: Apache-2.0 and ErlPL-1.1
+Group: Documentation/Other
+Url: http://elixir-lang.org
+Source0: elixir-v%{version}.tar.bz2
+BuildRequires: elixir
+BuildRequires: elixir-ex_doc
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildArch: noarch
+Requires: elixir = %{version}
+
+%description
+Documentation for Elexir language.
+
+%prep
+%setup -q -n elixir-v%{version}
+
+%build
+# Elixir wants UTF-8 locale, force it
+export LANG=en_US.UTF-8
+ex_doc "Elixir" "%{version}" "lib/elixir/ebin" -m "Kernel" -u "https://github.com/elixir-lang/elixir" -o doc/elixir -p http://elixir-lang.org/docs.html
+ex_doc "EEx" "%{version}" "lib/eex/ebin" -m "EEx" -u "https://github.com/elixir-lang/elixir" -o doc/eex -p http://elixir-lang.org/docs.html
+ex_doc "Mix" "%{version}" "lib/mix/ebin" -m "Mix" -u "https://github.com/elixir-lang/elixir" -o doc/mix -p http://elixir-lang.org/docs.html
+ex_doc "IEx" "%{version}" "lib/iex/ebin" -m "IEx" -u "https://github.com/elixir-lang/elixir" -o doc/iex -p http://elixir-lang.org/docs.html
+ex_doc "ExUnit" "%{version}" "lib/ex_unit/ebin" -m "ExUint" -u "https://github.com/elixir-lang/elixir" -o doc/ex_unit -p http://elixir-lang.org/docs.html
+ex_doc "Logger" "%{version}" "lib/logger/ebin" -m "Logger" -u "https://github.com/elixir-lang/elixir" -o doc/logger -p http://elixir-lang.org/docs.html
+
+%install
+
+%files
+%defattr(-,root,root)
+%doc doc
+
+%changelog
diff --git a/elixir-v0.12.4.tar.bz2 b/elixir-v0.12.4.tar.bz2
deleted file mode 100644
index 696236c..0000000
--- a/elixir-v0.12.4.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c47c2aa9e1bc45c7d7e2702317f21efbb0614e39aaa931524dd0fcdc68f7fadf
-size 773943
diff --git a/elixir-v1.0.4.tar.bz2 b/elixir-v1.0.4.tar.bz2
new file mode 100644
index 0000000..afad9be
--- /dev/null
+++ b/elixir-v1.0.4.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6e74627019b62ce83c4073be2d9fda77dbed6e40912ac378393247afbbff298f
+size 901728
diff --git a/elixir.changes b/elixir.changes
index 98c076d..a130240 100644
--- a/elixir.changes
+++ b/elixir.changes
@@ -1,3 +1,33 @@
+-------------------------------------------------------------------
+Mon May 11 15:57:55 UTC 2015 - matwey.kornilov@gmail.com
+
+- Fix a typo in elixir-doc.spec
+
+-------------------------------------------------------------------
+Sat May 9 09:49:10 UTC 2015 - matwey.kornilov@gmail.com
+
+- Drop docs into separate package
+
+-------------------------------------------------------------------
+Sat May 09 09:27:59 UTC 2015 - matwey.kornilov@gmail.com
+
+- Update to version v1.0.4:
+ + Do not propagate protocol consolidation to children
+ + Clean up ExUnit.Assertions docs
+ + Avoid missing behaviour warnings when compiling erlang files
+ + Add compatibilty with OTP 18 typespec changes
+ + Fixes for Erlang 18.0-rc1
+ + Update CHANGELOG
+ + Fix doc formatting in ExUnit.Formatter
+ + Wait until test process is down in ExUnit runner
+ + Tag async tests as such
+ + Release v1.0.4
+
+-------------------------------------------------------------------
+Fri Jun 20 14:31:10 UTC 2014 - matwey.kornilov@gmail.com
+
+- Update to 0.14.1
+
-------------------------------------------------------------------
Mon Feb 17 22:01:03 UTC 2014 - develop7@develop7.info
diff --git a/elixir.spec b/elixir.spec
index 912700f..b0bbe2b 100644
--- a/elixir.spec
+++ b/elixir.spec
@@ -1,7 +1,7 @@
#
-# spec file for package
+# spec file for package elixir
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX 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,22 +15,26 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
Name: elixir
-Version: 0.12.4
-Release: 1
-License: Apache-2.0 and ErlPL-1.1
+Version: 1.0.4
+Release: 0
Summary: Functional meta-programming aware language built on top of the Erlang
-Url: http://elixir-lang.org
+License: Apache-2.0 and ErlPL-1.1
Group: Development/Languages/Other
+Url: http://elixir-lang.org
Source0: elixir-v%{version}.tar.bz2
-Source1: ex_doc-master.tar.bz2
Source2: macros.elixir
-BuildRequires: erlang make gcc
+BuildRequires: erlang
+BuildRequires: gcc
+BuildRequires: make
# required by Mix.SCM.Git see also (https://github.com/elixir-lang/elixir/issues/1386)
Requires: git >= 1.7
+BuildRequires: erlang >= 17.0
BuildRequires: git >= 1.7
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
+Requires: erlang
%description
Elixir is a functional meta-programming aware language built on top of the Erlang VM. It is a dynamic language with flexible syntax with macros support that leverages Erlang's abilities to build concurrent, distributed, fault-tolerant applications with hot code upgrades.
@@ -39,26 +43,16 @@ Elixir also provides first-class support for pattern matching, polymorphism via
Finally, Elixir and Erlang share the same bytecode and data types. This means you can invoke Erlang code from Elixir (and vice-versa) without any conversion or performance hit. This allows a developer to mix the expressiveness of Elixir with the robustness and performance of Erlang.
-%package doc
-Summary: Documentation for elexir
-Group: Documentation/Other
-Requires: elexir
-
-%description doc
-Documentation for Elexir language.
-
%define elixirdir %{_prefix}/lib/elixir
%prep
-%setup -q -b 1 -n %{name}-v%{version}
+%setup -q -n %{name}-v%{version}
%build
+# Elixir wants UTF-8 locale, force it
+export LANG=en_US.UTF-8
# Make Elixir
make
-# Make docs
-ln -s ex_doc-master ../ex_doc
-PATH=$PATH:$PWD/bin make -C ../ex_doc
-make docs
%install
make install DESTDIR=%{buildroot} PREFIX=%{_prefix}
@@ -70,10 +64,12 @@ done
install -D -m 0644 %{S:2} %{buildroot}%{_sysconfdir}/rpm/macros.elixir
%check
+export LANG=en_US.UTF-8
make test
%files
%defattr(-,root,root)
+%doc CHANGELOG.md README.md LICENSE LEGAL
%dir %{elixirdir}
%dir %{elixirdir}/bin
%dir %{elixirdir}/lib
@@ -88,8 +84,4 @@ make test
%{elixirdir}/lib/*
%config %{_sysconfdir}/rpm/macros.elixir
-%files doc
-%defattr(-,root,root)
-%doc CHANGELOG.md README.md LICENSE LEGAL docs
-
%changelog
diff --git a/ex_doc-master.tar.bz2 b/ex_doc-master.tar.bz2
deleted file mode 100644
index 819bcb5..0000000
--- a/ex_doc-master.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:10e5a7d6b3bfe596679542d7cea9796e341111f77cf79cc77d5d39c5c0c6db46
-size 84772