From de2dcb1138c99754a04bb220c94cd87eece58c1a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Wed, 29 Jan 2020 18:42:02 +0100 Subject: [PATCH] - up to 20.01 --- ejabberd.spec | 63 +++++++++++++++++++++++++++------------------------ 1 file changed, 33 insertions(+), 30 deletions(-) diff --git a/ejabberd.spec b/ejabberd.spec index af02b16..62a7f71 100644 --- a/ejabberd.spec +++ b/ejabberd.spec @@ -9,68 +9,69 @@ Summary: Fault-tolerant distributed Jabber/XMPP server Summary(pl.UTF-8): Odporny na awarie rozproszony serwer Jabbera/XMPP Name: ejabberd -Version: 19.09.1 +Version: 20.01 Release: 1 License: GPL Group: Applications/Communications Source0: http://www.process-one.net/downloads/ejabberd/%{version}/%{name}-%{version}.tgz -# Source0-md5: f1f471643a63d7e0e281a6a272603828 +# Source0-md5: d6ec87cecdd0b6ce9771f7d34cdeb1d6 Source1: %{name}.init Source2: %{name}.sysconfig Source3: %{name}.service Source4: %{name}.logrotate # # Archives created with the ejabberd-pack_deps.sh script (in this repo) -Source10: ejabberd-base64url-20190617.tar.gz +Source10: ejabberd-base64url-20190617.tar.gz # Source10-md5: 5a12fd2fb1f992c850aba5115aab3dd4 -Source11: ejabberd-cache_tab-20190802.tar.gz +Source11: ejabberd-cache_tab-20190802.tar.gz # Source11-md5: cf0e72d17802d2e10d850f0e339a1c11 -Source12: ejabberd-eimp-20190802.tar.gz +Source12: ejabberd-eimp-20190802.tar.gz # Source12-md5: ec256209f4c1798f1fc4c863881f9e43 -Source13: ejabberd-elixir-20170515.tar.gz +Source13: ejabberd-elixir-20170515.tar.gz # Source13-md5: 73be42f7d0cda7aeee5c0e6dadc0c451 -Source14: ejabberd-ezlib-20190523.tar.gz +Source14: ejabberd-ezlib-20190523.tar.gz # Source14-md5: e521f10bba8fd2208aa5c15272050399 -Source15: ejabberd-fast_tls-20190802.tar.gz +Source15: ejabberd-fast_tls-20190802.tar.gz # Source15-md5: 80359622cc6d929923d5c316f9b9061f -Source16: ejabberd-fast_xml-20190802.tar.gz +Source16: ejabberd-fast_xml-20190802.tar.gz # Source16-md5: 628bc356a896e6921818700738d977e5 -Source17: ejabberd-fast_yaml-20190924.tar.gz +Source17: ejabberd-fast_yaml-20190924.tar.gz # Source17-md5: 3cc634471017adb2d33a9890a82c44d7 -Source18: ejabberd-goldrush-20160531.tar.gz +Source18: ejabberd-goldrush-20160531.tar.gz # Source18-md5: acac73f0fc85d23671f0c49c68f8df8a -Source19: ejabberd-idna-20180830.tar.gz +Source19: ejabberd-idna-20180830.tar.gz # Source19-md5: e34174d5c5e2e91611d3249c690f6d2d -Source20: ejabberd-jiffy-20160331.tar.gz +Source20: ejabberd-jiffy-20160331.tar.gz # Source20-md5: 78f31a7dea7538ef3e63f77351f4d0b7 -Source21: ejabberd-jose-20170518.tar.gz +Source21: ejabberd-jose-20170518.tar.gz # Source21-md5: b1675bfc57c1b3b7e154270e2bcd4559 -Source22: ejabberd-lager-20190430.tar.gz +Source22: ejabberd-lager-20190430.tar.gz # Source22-md5: 66205d931dd27b496529c19addf6d7d9 -Source23: ejabberd-mqtree-20190924.tar.gz -Source24: ejabberd-p1_acme-20190925.tar.gz +Source23: ejabberd-mqtree-20190924.tar.gz +# Source23-md5: 37160cbf55427331356c97ecde1c783d +Source24: ejabberd-p1_acme-20190925.tar.gz # Source24-md5: 1dce6f1586f69c5ff23d5d6fa6f82c55 -Source25: ejabberd-p1_mysql-20190831.tar.gz +Source25: ejabberd-p1_mysql-20190831.tar.gz # Source25-md5: 8cc96c4fcc8341b2c0565f818de2ba6d -Source26: ejabberd-p1_oauth2-20190523.tar.gz +Source26: ejabberd-p1_oauth2-20190523.tar.gz # Source26-md5: 5a1284f4e055d414f5867fdf54baf164 -Source27: ejabberd-p1_pgsql-20190523.tar.gz +Source27: ejabberd-p1_pgsql-20190523.tar.gz # Source27-md5: 348772eb0ccb9952cb202a7900eb905d -Source28: ejabberd-p1_utils-20190802.tar.gz +Source28: ejabberd-p1_utils-20190802.tar.gz # Source28-md5: 19c97dcdc6a37a4b574f67bdce6b9566 -Source29: ejabberd-pkix-20190924.tar.gz +Source29: ejabberd-pkix-20190924.tar.gz # Source29-md5: 0af6cff7fde9e16d8db908ae616d15a2 -Source30: ejabberd-rebar_elixir_plugin-20160105.tar.gz +Source30: ejabberd-rebar_elixir_plugin-20160105.tar.gz # Source30-md5: 6a069a566d71c3daa45fc4736364adf0 -Source31: ejabberd-sqlite3-20180130.tar.gz +Source31: ejabberd-sqlite3-20180130.tar.gz # Source31-md5: cc8950eb769eb6ceb13723a7b61fe507 -Source32: ejabberd-stringprep-20190802.tar.gz +Source32: ejabberd-stringprep-20190802.tar.gz # Source32-md5: cd354de1ee12712a2434c39241cf5488 -Source33: ejabberd-unicode_util_compat-20170729.tar.gz +Source33: ejabberd-unicode_util_compat-20170729.tar.gz # Source33-md5: 1b348fdf38dba88ebed2f65125ad8590 -Source34: ejabberd-xmpp-20190926.tar.gz +Source34: ejabberd-xmpp-20190926.tar.gz # Source34-md5: 2f974dedd11f039d5f1b7b4cbb61043a -Source35: ejabberd-yconf-20190924.tar.gz +Source35: ejabberd-yconf-20190924.tar.gz # Source35-md5: ada7f1ffc1f2ab8cc0e4e6a5fc870961 Patch0: %{name}-paths.patch @@ -81,7 +82,7 @@ Patch3: %{name}-mod_logdb.patch URL: http://www.ejabberd.im/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: erlang >= 1:19.3 +BuildRequires: erlang >= 2:22.2 BuildRequires: expat-devel >= 1.95 BuildRequires: openssl-devel %if %{with pam} @@ -98,7 +99,7 @@ Requires(post): sed >= 4.0 Requires(post): textutils Requires(post,preun): /sbin/chkconfig Requires(post,preun,postun): systemd-units >= 38 -Requires: erlang >= 1:19.3 +Requires: erlang >= 2:22.2 Requires: expat >= 1.95 Requires: rc-scripts Requires: systemd-units >= 38 @@ -145,6 +146,8 @@ git add configure.ac git commit -a -m "dummy commit" git tag "%{version}" +sed -i -e 's,#!.*/usr/bin/env.*elixir,#!/usr/bin/elixir,' deps/elixir/bin/mix deps/elixir/lib/mix/lib/mix/tasks/escript.build.ex + %build unset GIT_DIR GIT_WORK_TREE %{__aclocal} -I m4 -- 2.43.0