Raise the version to 16.01.

4 files changed, 78 insertions, 86 deletions

diff --git a/0013-Do-not-manage-deps-during-build.patch b/0013-Do-not-manage-deps-during-build.patch
index e81a784..f0f72b4 100644
--- a/0013-Do-not-manage-deps-during-build.patch
+++ b/0013-Do-not-manage-deps-during-build.patch
@@ -1,17 +1,17 @@
-From 6a5900c74692f7a56bdf55862b07f0c2bb8154c2 Mon Sep 17 00:00:00 2001
+From 38d84555d5df2e8dd976981e56f77b825e4bed9d Mon Sep 17 00:00:00 2001
 From: Randy Barlow <randy@electronsweatshop.com>
-Date: Sat, 13 Feb 2016 10:57:00 -0500
-Subject: [PATCH] Do not manage deps during build.
+Date: Mon, 15 Feb 2016 22:48:59 -0500
+Subject: [PATCH] Don't manage dependencies.
 
 ---
- Makefile.in | 16 +++-------------
- 1 file changed, 3 insertions(+), 13 deletions(-)
+ Makefile.in | 18 ++++--------------
+ 1 file changed, 4 insertions(+), 14 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index 8dd6bf5..55140b1 100644
+index 08cd837..500b895 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -77,19 +77,9 @@ else
+@@ -77,20 +77,10 @@ else
    INIT_USER=$(INSTALLUSER)
  endif
  
@@ -29,19 +29,19 @@ index 8dd6bf5..55140b1 100644
 -	$(REBAR) compile && :> deps/.built
 -
 -src: deps/.built
+-	$(REBAR) skip_deps=true compile
 +src:
- 	$(REBAR) skip_deps=true compile
++	$(REBAR) compile
  
  update:
-@@ -137,7 +127,7 @@ $(call TO_DEST,deps/p1_pam/priv/bin/epam): $(LIBDIR)/%: deps/% $(call TO_DEST,de
+ 	rm -rf deps/.got
+@@ -337,5 +327,5 @@ quicktest:
+ 	$(REBAR) skip_deps=true ct suites=elixir
  
- copy-files: $(call TO_DEST,$(DEPS_FILES) $(MAIN_FILES))
- 
--install: all copy-files
-+install: copy-files
- 	#
- 	# Configuration files
- 	$(INSTALL) -d -m 750 $(G_USER) $(ETCDIR)
+ .PHONY: src edoc dialyzer Makefile TAGS clean clean-rel distclean rel \
+-	install uninstall uninstall-binary uninstall-all translations deps test spec \
++	install uninstall uninstall-binary uninstall-all translations test spec \
+ 	quicktest erlang_plt deps_plt ejabberd_plt
 -- 
 2.7.1
 
diff --git a/0014-Remove-the-xmlrpc-dependency-as-it-s-only-used-for-t.patch b/0014-Remove-the-xmlrpc-dependency-as-it-s-only-used-for-t.patch
index 53542c4..8df9f6d 100644
--- a/0014-Remove-the-xmlrpc-dependency-as-it-s-only-used-for-t.patch
+++ b/0014-Remove-the-xmlrpc-dependency-as-it-s-only-used-for-t.patch
@@ -1,60 +1,46 @@
-From 2aaad0d30d7ee580d5678c48a928c9422844699e Mon Sep 17 00:00:00 2001
+From d5b4665affa50342bbb8de7d4b22372de5dbfc7c Mon Sep 17 00:00:00 2001
 From: Randy Barlow <randy@electronsweatshop.com>
-Date: Sat, 13 Feb 2016 21:01:58 -0500
-Subject: [PATCH] Remove the xmlrpc dependency as it's only used for tests.
+Date: Sun, 14 Feb 2016 17:11:31 -0500
+Subject: [PATCH] Remove dependency on xmlrpc.
 
 ---
- mix.exs             | 3 +--
- mix.lock            | 3 +--
- rebar.config.script | 3 +--
- 3 files changed, 3 insertions(+), 6 deletions(-)
+ mix.exs      | 3 +--
+ rebar.config | 1 -
+ 2 files changed, 1 insertion(+), 3 deletions(-)
 
 diff --git a/mix.exs b/mix.exs
-index fcc2973..4169c13 100644
+index b002e36..011bb0e 100644
 --- a/mix.exs
 +++ b/mix.exs
 @@ -20,7 +20,7 @@ defmodule Ejabberd.Mixfile do
-      included_applications: [:p1_logger, :p1_yaml, :p1_tls, :p1_xml,
-                              :p1_stringprep, :p1_zlib, :p1_cache_tab,
-                              :mnesia, :p1_utils, :p1_iconv, :esip, :p1_stun,
--                             :p1_mysql, :p1_pgsql, :eredis, :oauth2, :xmlrpc]]
-+                             :p1_mysql, :p1_pgsql, :eredis, :oauth2]]
+      included_applications: [:lager, :p1_utils, :cache_tab,
+                              :p1_tls, :p1_stringprep, :p1_xml,
+                              :p1_stun, :p1_yaml, :p1_zlib, :p1_iconv,
+-                             :esip, :jiffy, :oauth2, :xmlrpc, :eredis,
++                             :esip, :jiffy, :oauth2, :eredis,
+                              :p1_mysql, :p1_pgsql, :sqlite3]]
    end
  
-   defp erlc_options do
-@@ -45,7 +45,6 @@ defmodule Ejabberd.Mixfile do
-      {:p1_pgsql, git: "https://github.com/processone/pgsql"},
-      {:eredis, git: "https://github.com/wooga/eredis"},
-      {:oauth2, git: "https://github.com/prefiks/oauth2.git"},
--     {:xmlrpc, git: "https://github.com/rds13/xmlrpc.git"},
-      {:exrm, "~> 0.19.2"}]
-   end
- 
-diff --git a/mix.lock b/mix.lock
-index 001e006..7ef1884 100644
---- a/mix.lock
-+++ b/mix.lock
-@@ -20,5 +20,4 @@
-   "p1_yaml": {:git, "https://github.com/processone/p1_yaml", "79f756ba73a235c4d3836ec07b5f7f2b55f49638", []},
-   "p1_zlib": {:git, "https://github.com/processone/zlib", "e3d4222b7aae616d7ef2e7e2fa0bbf451516c602", []},
-   "providers": {:hex, :providers, "1.4.1"},
--  "relx": {:hex, :relx, "3.5.0"},
--  "xmlrpc": {:git, "https://github.com/rds13/xmlrpc.git", "42e6e96a0fe7106830274feed915125feb1056f3", []}}
-+  "relx": {:hex, :relx, "3.5.0"}}
-diff --git a/rebar.config.script b/rebar.config.script
-index 833595d..1aa21a2 100644
---- a/rebar.config.script
-+++ b/rebar.config.script
-@@ -63,8 +63,7 @@ Deps = [{p1_cache_tab, ".*", {git, "https://github.com/processone/cache_tab", "f
-         {p1_yaml, ".*", {git, "https://github.com/processone/p1_yaml", "79f756ba73a235c4d3836ec07b5f7f2b55f49638"}},
-         {p1_utils, ".*", {git, "https://github.com/processone/p1_utils", "d7800881e6702723ce58b7646b60c9e4cd25d563"}},
-         {jiffy, ".*", {git, "https://github.com/davisp/jiffy", "cfc61a2e952dc3182e0f9b1473467563699992e2"}},
--        {oauth2, ".*", {git, "https://github.com/prefiks/oauth2.git", "e6da9912e5d8f658e7e868f41a102d085bdbef59"}},
--        {xmlrpc, ".*", {git, "https://github.com/rds13/xmlrpc.git", "42e6e96a0fe7106830274feed915125feb1056f3"}}],
-+        {oauth2, ".*", {git, "https://github.com/prefiks/oauth2.git", "e6da9912e5d8f658e7e868f41a102d085bdbef59"}}],
- 
- CFLags = proplists:get_value(cflags, Cfg, ""),
- CPPFLags = proplists:get_value(cppflags, Cfg, ""),
+@@ -42,7 +42,6 @@ defmodule Ejabberd.Mixfile do
+      {:p1_yaml, git: "https://github.com/processone/p1_yaml", tag: "1.0.0"},
+      {:jiffy, git: "https://github.com/davisp/jiffy", tag: "0.14.5"},
+      {:oauth2, git: "https://github.com/kivra/oauth2", "8d129fbf8866930b4ffa6dd84e65bd2b32b9acb8"},
+-     {:xmlrpc, git: "https://github.com/rds13/xmlrpc.git", tag: "1.15"},
+      {:p1_mysql, git: "https://github.com/processone/mysql", tag: "1.0.0"},
+      {:p1_pgsql, git: "https://github.com/processone/pgsql", tag: "1.0.0"},
+      {:sqlite3, git: "https://github.com/alexeyr/erlang-sqlite3", "cbc3505f7a131254265d3ef56191b2581b8cc172"},
+diff --git a/rebar.config b/rebar.config
+index 30c0360..5fb5340 100644
+--- a/rebar.config
++++ b/rebar.config
+@@ -19,7 +19,6 @@
+         {p1_yaml, ".*", {git, "https://github.com/processone/p1_yaml", {tag, "1.0.0"}}},
+         {jiffy, ".*", {git, "https://github.com/davisp/jiffy", {tag, "0.14.5"}}},
+         {oauth2, ".*", {git, "https://github.com/kivra/oauth2", "8d129fbf8866930b4ffa6dd84e65bd2b32b9acb8"}},
+-        {xmlrpc, ".*", {git, "https://github.com/rds13/xmlrpc", {tag, "1.15"}}},
+         {if_var_true, mysql, {p1_mysql, ".*", {git, "https://github.com/processone/mysql", {tag, "1.0.0"}}}},
+         {if_var_true, pgsql, {p1_pgsql, ".*", {git, "https://github.com/processone/pgsql", {tag, "1.0.0"}}}},
+         {if_var_true, sqlite, {sqlite3, ".*", {git, "https://github.com/alexeyr/erlang-sqlite3", "cbc3505f7a131254265d3ef56191b2581b8cc172"}}},
 -- 
 2.7.1
 
diff --git a/ejabberd-0006-Enable-polkit-support.patch b/ejabberd-0006-Enable-polkit-support.patch
index 715c5a4..ae349f5 100644
--- a/ejabberd-0006-Enable-polkit-support.patch
+++ b/ejabberd-0006-Enable-polkit-support.patch
@@ -9,8 +9,8 @@ index 09b9947..0fd33fe 100755
 --- a/ejabberdctl.template
 +++ b/ejabberdctl.template
 @@ -1,4 +1,4 @@
--#!/bin/sh
+-#!/bin/bash
 +#!/usr/bin/pkexec /bin/sh
- 
+
  # define default configuration
  POLL=true
diff --git a/ejabberd.spec b/ejabberd.spec
index 75518c0..4597f75 100644
--- a/ejabberd.spec
+++ b/ejabberd.spec
@@ -11,7 +11,7 @@
 
 
 Name:           ejabberd
-Version:        15.11
+Version:        16.01
 Release:        1%{?dist}
 
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
@@ -182,7 +182,7 @@ Windows NT/2000/XP).
 #tar xvf %{S:1}
 #%patch11 -p1
 #%patch12 -p1
-%patch13 -p1
+#%patch13 -p1
 %patch14 -p1
 #touch deps/.got
 #touch deps/.built
@@ -193,11 +193,10 @@ autoreconf -ivf
 
 #./autogen.sh
 # Disabled: --enable-hipe --enable-roster-gateway-workaround --enable-transient_supervisors --enable-full-xml --enable-mssql --enable-tools --enable-riak --enable-http
-#LDFLAGS="$LDFLAGS -L%{_libdir}/erlang/lib/" 
-#echo $LDFLAGS
-%configure --enable-nif --enable-odbc --enable-mysql --enable-pgsql --enable-pam --enable-zlib --enable-iconv --enable-debug --enable-lager --libdir=%{_libdir}/erlang/lib/
-%rebar_compile
-#make src
+%configure --enable-odbc --enable-mysql --enable-pgsql --enable-pam --enable-zlib --enable-iconv --enable-debug --enable-lager --libdir=%{_libdir}/erlang/lib/ --with-erlang=%{_libdir}/erlang/
+mkdir deps
+make -t deps
+make src REBAR=%__rebar
 #pushd doc
 #%ifarch %{power64}
 #ulimit -a
@@ -214,7 +213,8 @@ autoreconf -ivf
 
 
 %install
-make install DESTDIR=%{buildroot}
+make install DESTDIR=%{buildroot} REBAR=%__rebar
+rm %{buildroot}/%{_docdir}/ejabberd/COPYING
 
 # fix example SSL certificate path to real one, which we created recently (see above)
 %{__perl} -pi -e 's!/path/to/ssl.pem!/etc/ejabberd/ejabberd.pem!g' %{buildroot}/etc/ejabberd/ejabberd.yml
@@ -244,6 +244,9 @@ install -p -m 0644 sql/pg.sql %{buildroot}%{_datadir}/%{name}
 install -D -p -m 0644 %{S:12} %{buildroot}%{_datadir}/polkit-1/actions/ejabberdctl.policy
 install -D -p -m 0644 %{S:13} %{buildroot}%{_datadir}/polkit-1/rules.d/51-ejabberdctl.rules
 
+# Move the files to the correctly versioned folder
+mv %{buildroot}/%{_erllibdir}/ejabberd-0.0 %{buildroot}/%{_erllibdir}/ejabberd-%{version}
+
 
 %pre
 getent group %{name} >/dev/null || groupadd -r %{name}
@@ -316,7 +319,7 @@ fi)
 
 
 %files
-%doc COPYING
+%license COPYING
 
 %attr(750,ejabberd,ejabberd) %dir %{_sysconfdir}/ejabberd
 %attr(640,ejabberd,ejabberd) %config(noreplace) %{_sysconfdir}/ejabberd/ejabberd.yml
@@ -333,19 +336,19 @@ fi)
 %{_datadir}/polkit-1/rules.d/51-ejabberdctl.rules
 %{_bindir}/ejabberdctl
 
-%dir %{_erllibdir}/%{name}
-%dir %{_erllibdir}/%{name}/ebin
-%dir %{_erllibdir}/%{name}/include
-%dir %{_erllibdir}/%{name}/priv
-%dir %{_erllibdir}/%{name}/priv/bin
-%dir %{_erllibdir}/%{name}/priv/msgs
-
-%{_erllibdir}/%{name}/ebin/*.app
-%{_erllibdir}/%{name}/ebin/*.beam
-%{_erllibdir}/%{name}/include/*.hrl
-%{_erllibdir}/%{name}/priv/bin/captcha.sh
+%dir %{_erllibdir}/%{name}-%{version}
+%dir %{_erllibdir}/%{name}-%{version}/ebin
+%dir %{_erllibdir}/%{name}-%{version}/include
+%dir %{_erllibdir}/%{name}-%{version}/priv
+%dir %{_erllibdir}/%{name}-%{version}/priv/bin
+%dir %{_erllibdir}/%{name}-%{version}/priv/msgs
 
-%{_erllibdir}/%{name}/priv/msgs/*.msg
+%{_erllibdir}/%{name}-%{version}/ebin/*.app
+%{_erllibdir}/%{name}-%{version}/ebin/*.beam
+%{_erllibdir}/%{name}-%{version}/include/*.hrl
+%{_erllibdir}/%{name}-%{version}/priv/bin/captcha.sh
+%{_erllibdir}/%{name}-%{version}/priv/msgs/*.msg
+%{_erllibdir}/%{name}-%{version}/priv/sql/lite.sql
 
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/lite.sql
@@ -365,6 +368,9 @@ fi)
 
 
 %changelog
+* Tue Feb 16 2016 Randy Barlow <rbarlow@redhat.com> - 16.01-1
+- Raise the version to 16.01.
+
 * Fri Feb 12 2016 Randy Barlow <rbarlow@redhat.com> - 15.11-1
 - Raise the version to 15.11.