Update to 16.03.

3 files changed, 60 insertions, 88 deletions

diff --git a/.gitignore b/.gitignore
index ef98942..7776466 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ ejabberd-2.1.5.tar.gz
 /15.11.tar.gz
 /16.01.tar.gz
 /16.02.tar.gz
+/16.03.tar.gz
diff --git a/ejabberd.spec b/ejabberd.spec
index e272895..21f6d46 100644
--- a/ejabberd.spec
+++ b/ejabberd.spec
@@ -1,13 +1,10 @@
 %global _hardened_build 1
 %global debug_package %{nil}
 
-%{expand: %(NIF_VER=`rpm -q erlang-erts --provides | grep --color=no erl_nif_version` ; if [ "$NIF_VER" != "" ]; then echo %%global __erlang_nif_version $NIF_VER ; fi)}
-%{expand: %(DRV_VER=`rpm -q erlang-erts --provides | grep --color=no erl_drv_version` ; if [ "$DRV_VER" != "" ]; then echo %%global __erlang_drv_version $DRV_VER ; fi)}
-
 
 Name:           ejabberd
-Version:        16.02
-Release:        2%{?dist}
+Version:        16.03
+Release:        1%{?dist}
 
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 License:        GPLv2+
@@ -50,31 +47,28 @@ Patch10:ejabberd-0010-Enable-systemd-notification-if-available.patch
 #Patch11: ejabberd-0011-aarch64.patch
 Patch13: 0013-Do-not-manage-deps-during-build.patch
 
-BuildRequires:  elixir >= 1.1.0
-BuildRequires:  erlang >= 17.1
-BuildRequires:  erlang-cache_tab >= 1.0.1
-BuildRequires:  erlang-jiffy >= 0.14.5
+BuildRequires:  elixir >= 1.1.1
+BuildRequires:  erlang-cache_tab >= 1.0.2
+BuildRequires:  erlang-esip >= 1.0.2
+BuildRequires:  erlang-ezlib >= 1.0.1
+BuildRequires:  erlang-fast_tls >= 1.0.1
+BuildRequires:  erlang-fast_xml >= 1.1.3
+BuildRequires:  erlang-fast_yaml >= 1.0.3
+BuildRequires:  erlang-iconv >= 1.0.0
+BuildRequires:  erlang-jiffy >= 0.14.7
 BuildRequires:  erlang-lager >= 3.0.2
-BuildRequires:  erlang-luerl
+BuildRequires:  erlang-luerl >= 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_mysql >= 1.0.1
 BuildRequires:  erlang-p1_oauth2 >= 0.6.1
 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_pgsql >= 1.1.0
+BuildRequires:  erlang-p1_utils >= 1.0.3
 BuildRequires:  erlang-p1_xmlrpc >= 1.15.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:  erlang-stringprep >= 1.0.2
+BuildRequires:  erlang-stun >= 1.0.1
 BuildRequires:  expat-devel >= 1.95
 BuildRequires:  git
 BuildRequires:  libyaml-devel >= 0.1.4
@@ -83,12 +77,12 @@ BuildRequires:  pam-devel
 
 BuildRequires:  hevea
 BuildRequires:  texlive-comment
-BuildRequires:	autoconf
-BuildRequires:	automake
+BuildRequires:  autoconf
+BuildRequires:  automake
 BuildRequires:  gcc-c++
 
 # For creating user and group
-Requires(pre):		shadow-utils
+Requires(pre):  shadow-utils
 
 Requires(post): /usr/bin/openssl
 Requires(post): systemd
@@ -100,33 +94,10 @@ Provides: group(%{name})
 
 # 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
 # for /usr/bin/pkexec
 Requires:   polkit
 # for flock in ejabberdctl
-Requires:	util-linux
-%{?__erlang_drv_version:Requires: %{__erlang_drv_version}}
-%{?__erlang_nif_version:Requires: %{__erlang_nif_version}}
+Requires:   util-linux
 
 
 %description
@@ -135,16 +106,6 @@ Jabber/XMPP server. It is mostly written in Erlang, and runs on many
 platforms (tested on Linux, FreeBSD, NetBSD, Solaris, Mac OS X and
 Windows NT/2000/XP).
 
-#%package doc
-#Summary: Documentation for ejabberd
-#BuildArch: noarch
-#Obsoletes: %{name}-doc < 2.1.4
-## docdir owner
-#Requires: %{name} = %{version}-%{release}
-#Group: Documentation
-
-#%description doc
-#Documentation for ejabberd.
 
 %prep
 %setup -q
@@ -210,32 +171,32 @@ useradd -r -g %{name} -d %{_localstatedir}/lib/%{name} -s /sbin/nologin -M \
 
 
 if [ $1 -gt 1 ]; then
-	# we should backup DB in every upgrade
-	if ejabberdctl status >/dev/null ; then
-		# Use timestamp to make database restoring easier
-		TIME=$(date +%%Y-%%m-%%dT%%H:%%M:%%S)
-		BACKUPDIR=$(mktemp -d -p /var/tmp/ ejabberd-$TIME.XXXXXX)
-		chown ejabberd:ejabberd $BACKUPDIR
-		BACKUP=$BACKUPDIR/ejabberd-database
-		ejabberdctl backup $BACKUP
-		# Change ownership to root:root because ejabberd user might be
-		# removed on package removal.
-		chown -R root:root $BACKUPDIR
-		chmod 700 $BACKUPDIR
-		echo
-		echo The ejabberd database has been backed up to $BACKUP.
-		echo
-	fi
-
-	# fix cookie path (since ver. 2.1.0 cookie stored in /var/lib/ejabberd/spool
-	# rather than in /var/lib/ejabberd
-	if [ -f /var/lib/ejabberd/spool/.erlang.cookie ]; then
-		cp -pu /var/lib/ejabberd/{spool/,}.erlang.cookie
-		echo
-		echo The ejabberd cookie file was moved again.
-		echo Please delete old one from /var/lib/ejabberd/spool/.erlang.cookie
-		echo
-	fi
+    # we should backup DB in every upgrade
+    if ejabberdctl status >/dev/null ; then
+        # Use timestamp to make database restoring easier
+        TIME=$(date +%%Y-%%m-%%dT%%H:%%M:%%S)
+        BACKUPDIR=$(mktemp -d -p /var/tmp/ ejabberd-$TIME.XXXXXX)
+        chown ejabberd:ejabberd $BACKUPDIR
+        BACKUP=$BACKUPDIR/ejabberd-database
+        ejabberdctl backup $BACKUP
+        # Change ownership to root:root because ejabberd user might be
+        # removed on package removal.
+        chown -R root:root $BACKUPDIR
+        chmod 700 $BACKUPDIR
+        echo
+        echo The ejabberd database has been backed up to $BACKUP.
+        echo
+    fi
+
+    # fix cookie path (since ver. 2.1.0 cookie stored in /var/lib/ejabberd/spool
+    # rather than in /var/lib/ejabberd
+    if [ -f /var/lib/ejabberd/spool/.erlang.cookie ]; then
+        cp -pu /var/lib/ejabberd/{spool/,}.erlang.cookie
+        echo
+        echo The ejabberd cookie file was moved again.
+        echo Please delete old one from /var/lib/ejabberd/spool/.erlang.cookie
+        echo
+    fi
 fi
 
 
@@ -274,6 +235,7 @@ fi)
 
 %files
 %license COPYING
+%doc README README.md
 
 %attr(750,ejabberd,ejabberd) %dir %{_sysconfdir}/ejabberd
 %attr(640,ejabberd,ejabberd) %config(noreplace) %{_sysconfdir}/ejabberd/ejabberd.yml
@@ -316,6 +278,15 @@ fi)
 
 
 %changelog
+* Sun Apr 24 2016 Randy Barlow <rbarlow@redhat.com> - 16.03-1
+- Update to 16.03.
+- Use the new Erlang auto-requires abilities.
+- Remove some commented code.
+- Fixed mixed spaces and tabs (used spaces).
+- Fixed use of macro in changelog.
+- Add the READMEs as docs.
+- Remove dependencies on NIF and DRV since this package no longer ships C code.
+
 * Fri Apr 15 2016 Randy Barlow <rbarlow@redhat.com> - 16.02-2
 - Remove the filter_provides statement. It is no longer needed, and it is suspected to cause
   problems with ARM dependencies.
@@ -748,7 +719,7 @@ fi)
 
 * Thu Jun 22 2006 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.1.1-6
 - Split documentation off to a subpackage.
-- Own %%{_libdir}/ejabberd-%{version}
+- Own _libdir/ejabberd-version
 - Mark %%{_sysconfdir}/logrotate.d/ejabberd as %%config
 
 * Thu Jun  8 2006 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.1.1-5
diff --git a/sources b/sources
index 42d9126..8013b6c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-163cda9b8ee0baaab6b154de678b18c7  16.02.tar.gz
+7ad2a9d1bd392cbe3f1b5b455bd27563  16.03.tar.gz