Clean up the requirements.

1 files changed, 50 insertions, 54 deletions

diff --git a/ejabberd.spec b/ejabberd.spec
index 4597f75..6662b78 100644
--- a/ejabberd.spec
+++ b/ejabberd.spec
@@ -12,7 +12,7 @@
 
 Name:           ejabberd
 Version:        16.01
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 License:        GPLv2+
@@ -63,40 +63,36 @@ Patch7: ejabberd-0007-Install-into-BINDIR-instead-of-SBINDIR.patch
 Patch10:ejabberd-0010-Enable-systemd-notification-if-available.patch
 
 #Patch11: ejabberd-0011-aarch64.patch
-# Patch12: 0012-Use-rds13_xmlrpc-instead-of-xmlrpc.patch
 Patch13: 0013-Do-not-manage-deps-during-build.patch
 Patch14: 0014-Remove-the-xmlrpc-dependency-as-it-s-only-used-for-t.patch
 
-BuildRequires:  expat-devel >= 1.95
-BuildRequires:  openssl-devel >= 1.0.0
-BuildRequires:  pam-devel
-BuildRequires:  libyaml-devel >= 0.1.4
+BuildRequires:  elixir >= 1.1.0
 BuildRequires:  erlang >= 17.1
+BuildRequires:  erlang-cache_tab >= 1.0.1
+BuildRequires:  erlang-jiffy >= 0.14.5
+BuildRequires:  erlang-lager >= 3.0.2
+BuildRequires:  erlang-meck >= 0.8.2
+BuildRequires:  erlang-oauth2 >= 0.6.1
+BuildRequires:  erlang-p1_iconv >= 0.9.0
+BuildRequires:  erlang-p1_mysql >= 1.0.0
+BuildRequires:  erlang-p1_pam >= 1.0.0
+BuildRequires:  erlang-p1_pgsql >= 1.0.0
+BuildRequires:  erlang-p1_sip >= 1.0.0-2
+BuildRequires:  erlang-p1_stringprep >= 1.0.0
+BuildRequires:  erlang-p1_stun >= 0.9.0
+BuildRequires:  erlang-p1_tls >= 1.0.0
+BuildRequires:  erlang-p1_utils >= 1.0.2
+BuildRequires:  erlang-p1_xml >= 1.1.1
+BuildRequires:  erlang-p1_yaml >= 1.0.0
+BuildRequires:  erlang-p1_zlib >= 1.0.0
 BuildRequires:  erlang-rebar
+BuildRequires:  erlang-riak_client
 BuildRequires:  erlang-rpm-macros
+BuildRequires:  expat-devel >= 1.95
 BuildRequires:  git
-# FIXME
-BuildRequires:  elixir
-BuildRequires:  erlang-jiffy
-BuildRequires:  erlang-lager
-BuildRequires:  erlang-meck
-BuildRequires:  erlang-oauth2
-BuildRequires:  erlang-p1_iconv
-BuildRequires:  erlang-p1_mysql
-BuildRequires:  erlang-p1_pam
-BuildRequires:  erlang-p1_pgsql
-BuildRequires:  erlang-p1_zlib
-BuildRequires:  erlang-riak_client
-# Fixmore
-BuildRequires:  erlang-cache_tab
-BuildRequires:  erlang-p1_tls
-BuildRequires:  erlang-p1_stringprep
-BuildRequires:  erlang-p1_xml
-BuildRequires:  erlang-p1_sip >= 1.0.0-2
-BuildRequires:  erlang-p1_stun
-BuildRequires:  erlang-p1_yaml
-BuildRequires:  erlang-p1_utils
-#BuildRequires:  erlang-rds13_xmlrpc
+BuildRequires:  libyaml-devel >= 0.1.4
+BuildRequires:  openssl-devel >= 1.0.0
+BuildRequires:  pam-devel
 
 BuildRequires:  hevea
 BuildRequires:  texlive-comment
@@ -115,35 +111,33 @@ Requires(postun): systemd
 Provides: user(%{name})
 Provides: group(%{name})
 
-Requires:       erlang
+# From rebar
+Requires:   elixir >= 1.1.0
+Requires:   erlang
+Requires:   erlang-cache_tab >= 1.0.1
+Requires:   erlang-jiffy >= 0.14.5
+Requires:   erlang-lager >= 3.0.2
+Requires:   erlang-meck >= 0.8.2
+Requires:   erlang-oauth2 >= 0.6.1
+Requires:   erlang-p1_iconv >= 0.9.0
+Requires:   erlang-p1_mysql >= 1.0.0
+Requires:   erlang-p1_pam >= 1.0.0
+Requires:   erlang-p1_pgsql >= 1.0.0
+Requires:   erlang-p1_sip >= 1.0.0-2
+Requires:   erlang-p1_stringprep >= 1.0.0
+Requires:   erlang-p1_stun >= 0.9.0
+Requires:   erlang-p1_tls >= 1.0.0
+Requires:   erlang-p1_utils >= 1.0.2
+Requires:   erlang-p1_xml >= 1.1.1
+Requires:   erlang-p1_yaml >= 1.0.0
+Requires:   erlang-p1_zlib >= 1.0.0
+Requires:   erlang-riak_client
 # FIXME see also patch #10
-#Requires:       erlang-sd_notify
+#Requires:   erlang-sd_notify
 # for /usr/bin/pkexec
-Requires:       polkit
+Requires:   polkit
 # for flock in ejabberdctl
 Requires:	util-linux
-# From rebar
-Requires:   elixir
-Requires:   erlang-jiffy
-Requires:   erlang-lager
-Requires:   erlang-meck
-Requires:   erlang-oauth2
-Requires:   erlang-p1_iconv
-Requires:   erlang-p1_mysql
-Requires:   erlang-p1_pam
-Requires:   erlang-p1_pgsql
-Requires:   erlang-p1_zlib
-Requires:   erlang-riak_client
-# Fix these
-Requires:   erlang-cache_tab
-Requires:   erlang-p1_tls
-Requires:   erlang-p1_stringprep
-Requires:   erlang-p1_xml
-Requires:   erlang-p1_sip >= 1.0.0-2
-Requires:   erlang-p1_stun
-Requires:   erlang-p1_yaml
-Requires:   erlang-p1_utils
-#Requires:   erlang-rds13_xmlrpc
 %{?__erlang_drv_version:Requires: %{__erlang_drv_version}}
 %{?__erlang_nif_version:Requires: %{__erlang_nif_version}}
 
@@ -181,7 +175,6 @@ Windows NT/2000/XP).
 
 #tar xvf %{S:1}
 #%patch11 -p1
-#%patch12 -p1
 #%patch13 -p1
 %patch14 -p1
 #touch deps/.got
@@ -368,6 +361,9 @@ fi)
 
 
 %changelog
+* Tue Feb 16 2016 Randy Barlow <rbarlow@redhat.com> - 16.01-2
+- Clean up the requirements, adding versions where they are known.
+
 * Tue Feb 16 2016 Randy Barlow <rbarlow@redhat.com> - 16.01-1
 - Raise the version to 16.01.