summaryrefslogtreecommitdiffstats
path: root/ejabberd.spec
diff options
context:
space:
mode:
Diffstat (limited to 'ejabberd.spec')
-rw-r--r--ejabberd.spec82
1 files changed, 43 insertions, 39 deletions
diff --git a/ejabberd.spec b/ejabberd.spec
index a9cb66e..8420018 100644
--- a/ejabberd.spec
+++ b/ejabberd.spec
@@ -4,8 +4,8 @@
Name: ejabberd
-Version: 17.09
-Release: 2%{?dist}
+Version: 18.01
+Release: 1%{?dist}
License: GPLv2+
Summary: A distributed, fault-tolerant Jabber/XMPP server
@@ -32,28 +32,24 @@ Source16: ejabberd.if
# Use ejabberd as an example for PAM service name (fedora/epel-specific)
Patch1: ejabberd-0001-Fix-PAM-service-example-name-to-match-actual-one.patch
-# https://github.com/processone/ejabberd/issues/1850
-Patch2: ejabberd-0002-Drop-post_hook_configure-from-rebar.config.patch
# Fedora-specific
Patch3: ejabberd-0003-Install-into-BINDIR-instead-of-SBINDIR.patch
# Fedora-specific
Patch4: ejabberd-0004-Enable-systemd-notification-if-available.patch
-# https://github.com/processone/ejabberd/pull/2158
-Patch5: ejabberd-0005-Use-bin-sh-as-the-explicit-shell-when-using-su-in-ej.patch
-# Remove mod_avatar from the config file since we don't have its dependency (eimp) in Fedora yet.
-Patch6: ejabberd-0006-Remove-mod_avatar-from-the-ejabberd.yml-since-we-don.patch
BuildRequires: elixir >= 1.4.4
-BuildRequires: erlang-cache_tab >= 1.0.11
+BuildRequires: erlang-cache_tab >= 1.0.12
BuildRequires: erlang-epam >= 1.0.3
-BuildRequires: erlang-esip >= 1.0.16
-BuildRequires: erlang-ezlib >= 1.0.2
-BuildRequires: erlang-fast_tls >= 1.0.16
-BuildRequires: erlang-fast_xml >= 1.1.24
-BuildRequires: erlang-fast_yaml >= 1.0.11
+BuildRequires: erlang-esip >= 1.0.21
+BuildRequires: erlang-ezlib >= 1.0.3
+BuildRequires: erlang-fast_tls >= 1.0.20
+BuildRequires: erlang-fast_xml >= 1.1.28
+BuildRequires: erlang-fast_yaml >= 1.0.12
+BuildRequires: erlang-fs >= 2.12.0
BuildRequires: erlang-iconv >= 1.0.6
BuildRequires: erlang-jiffy >= 0.14.8
+BuildRequires: erlang-jose >= 1.8.4
BuildRequires: erlang-lager >= 3.4.2
BuildRequires: erlang-luerl >= 0.2
BuildRequires: erlang-meck >= 0.8.4
@@ -66,8 +62,8 @@ BuildRequires: erlang-rebar
BuildRequires: erlang-riak_client
BuildRequires: erlang-sd_notify
BuildRequires: erlang-stringprep >= 1.0.10
-BuildRequires: erlang-stun >= 1.0.15
-BuildRequires: erlang-xmpp >= 1.1.15
+BuildRequires: erlang-stun >= 1.0.20
+BuildRequires: erlang-xmpp >= 1.1.19
BuildRequires: expat-devel >= 1.95
BuildRequires: git
BuildRequires: libyaml-devel >= 0.1.4
@@ -89,8 +85,30 @@ Requires(postun): systemd
Provides: user(%{name})
Provides: group(%{name})
+Requires: ejabberd-selinux == %{version}-%{release}
# From rebar
-Requires: elixir >= 1.1.0
+Requires: elixir >= 1.4.4
+Requires: erlang-cache_tab >= 1.0.12
+Requires: erlang-epam >= 1.0.3
+Requires: erlang-esip >= 1.0.21
+Requires: erlang-ezlib >= 1.0.3
+Requires: erlang-fast_tls >= 1.0.20
+Requires: erlang-fast_xml >= 1.1.28
+Requires: erlang-fast_yaml >= 1.0.12
+Requires: erlang-fs >= 2.12.0
+Requires: erlang-iconv >= 1.0.6
+Requires: erlang-jiffy >= 0.14.8
+Requires: erlang-jose >= 1.8.4
+Requires: erlang-lager >= 3.4.2
+Requires: erlang-luerl >= 0.2
+Requires: erlang-meck >= 0.8.4
+Requires: erlang-p1_mysql >= 1.0.3
+Requires: erlang-p1_oauth2 >= 0.6.2
+Requires: erlang-p1_pgsql >= 1.1.3
+Requires: erlang-p1_utils >= 1.0.10
+Requires: erlang-stringprep >= 1.0.10
+Requires: erlang-stun >= 1.0.20
+Requires: erlang-xmpp >= 1.1.19
# We install a logrotate.d file
Requires: logrotate
# for /usr/bin/pkexec
@@ -354,6 +372,14 @@ fi
%changelog
+* Sat Jan 13 2018 Randy Barlow <bowlofeggs@fedoraproject.org> - 18.01-1
+- Update to 18.01 (#1516062).
+- https://blog.process-one.net/ejabberd-17-11-happy-birthday-ejabberd/
+- https://blog.process-one.net/ejabberd-17-12/
+- https://blog.process-one.net/ejabberd-18-01/
+- Require the selinux policy to be installed.
+- Allow port 5281 in the SELinux policy (#1494854).
+
* Mon Dec 11 2017 Randy Barlow <bowlofeggs@fedoraproject.org> - 17.09-2
- Fix three issues that prevented ejabberd from starting (#1524199).
@@ -393,25 +419,3 @@ fi
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 16.12-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Fri Dec 30 2016 Randy Barlow <bowlofeggs@fedoraproject.org> - 16.12-1
-- Update to 16.12 (#1400097).
-- Rebase two patches.
-- Add new erlang-xmpp dependency.
-- Use sed to fix include statements on fast_xml and xmpp so they can be
- found from the system.
-- Run the test suite.
-
-* Sun Dec 25 2016 Randy Barlow <bowlofeggs@fedoraproject.org> - 16.09-5
-- Use auth_admin for all polkit default rules (#1094143).
-- Drop unused BuildRequires on hevea and texlive-comment.
-- Add a Requires on logrotate since we install a logrotate.d file.
-
-* Thu Dec 01 2016 Randy Barlow <bowlofeggs@fedoraproject.org> - 16.09-4
-- Drop the use of -set-cookie since it is unsafe.
-- Configure the ejabberdctl script to set INSTALLUSER so it uses su to be ejabberd (#1163812).
-
-* Sun Nov 27 2016 Randy Barlow <bowlofeggs@fedoraproject.org> - 16.09-3
-- Use -set-cookie in ejabberdctl so root can attach to the node (#1163812).
-- Mark ejabberdctl as executable.
-- Dropped unnecessary gcc-g++ BuildRequires.