X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=ejabberd.spec;h=f82f77b4c6cc32565b7c173b18973fd3b85c6cc9;hb=HEAD;hp=0ee89dd0d00974aa5d1cf31fd26184820b0faba3;hpb=4f4f623a11eedf0dbd2c456872cef5c2e6055743;p=packages%2Fejabberd.git

diff --git a/ejabberd.spec b/ejabberd.spec
index 0ee89dd..1664769 100644
--- a/ejabberd.spec
+++ b/ejabberd.spec
@@ -9,72 +9,69 @@
 Summary:	Fault-tolerant distributed Jabber/XMPP server
 Summary(pl.UTF-8):	Odporny na awarie rozproszony serwer Jabbera/XMPP
 Name:		ejabberd
-Version:	21.04
-Release:	1
+Version:	23.10
+Release:	2
 License:	GPL
 Group:		Applications/Communications
-# Source0:	http://www.process-one.net/downloads/ejabberd/%{version}/%{name}-%{version}.tgz
-Source0:	https://www.process-one.net/downloads/downloads-action.php?file=/%{version}/%{name}-%{version}.tgz
-# Source0-md5:	e25e36985621f3a1a23ded3191be39e5
+# Source0:	https://www.process-one.net/downloads/downloads-action.php?file=/%{version}/%{name}-%{version}.tar.gz
+Source0:	https://github.com/processone/ejabberd/archive/refs/tags/%{version}.tar.gz
+# Source0-md5:	c91ae2f93c4c4cd7b00e9cb30ac6044d
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Source3:	%{name}.service
 Source4:	%{name}.logrotate
 
-Source10:	ejabberd-base64url-20190617.tar.gz
-# Source10-md5:	5a12fd2fb1f992c850aba5115aab3dd4
-Source11:	ejabberd-cache_tab-20210324.tar.gz
-# Source11-md5:	818140d399728c545387b034098153bf
-Source12:	ejabberd-eimp-20210324.tar.gz
-# Source12-md5:	796a31eca78b372dbf71553a46b981e7
-Source13:	ejabberd-elixir-20170515.tar.gz
-# Source13-md5:	73be42f7d0cda7aeee5c0e6dadc0c451
-Source14:	ejabberd-ezlib-20201111.tar.gz
-# Source14-md5:	c4bc9c91ed5e802a3ce1d920ba71d188
-Source15:	ejabberd-fast_tls-20210324.tar.gz
-# Source15-md5:	0067d2327f8c2e1fd0b8424677e766ce
-Source16:	ejabberd-fast_xml-20210324.tar.gz
-# Source16-md5:	3f543238cd21c42a116ed4c452161a56
-Source17:	ejabberd-fast_yaml-20210324.tar.gz
-# Source17-md5:	8c4ff955ee55e21b881ff5ac9de02e85
-Source18:	ejabberd-goldrush-20160531.tar.gz
-# Source18-md5:	acac73f0fc85d23671f0c49c68f8df8a
-Source19:	ejabberd-idna-20180830.tar.gz
-# Source19-md5:	e34174d5c5e2e91611d3249c690f6d2d
-Source20:	ejabberd-jiffy-20200630.tar.gz
-# Source20-md5:	e99a512a9c4395bda77f07990aa9aa97
-Source21:	ejabberd-jose-20181231.tar.gz
-# Source21-md5:	406b7ceab1b2d3843440dfbdd85f2e79
-Source22:	ejabberd-lager-20190430.tar.gz
-# Source22-md5:	66205d931dd27b496529c19addf6d7d9
-Source23:	ejabberd-mqtree-20210324.tar.gz
-# Source23-md5:	85cff1a3f08f98978a6ed691d7dd1e2a
-Source24:	ejabberd-p1_acme-20210324.tar.gz
-# Source24-md5:	e3f5a625786556eb10497d9419f81874
-Source25:	ejabberd-p1_mysql-20210324.tar.gz
-# Source25-md5:	c850984c1dfc0e6af4672afdace75813
-Source26:	ejabberd-p1_oauth2-20210324.tar.gz
-# Source26-md5:	d93d5ee18fdc0de9b7cd12d6aa3b9aa4
-Source27:	ejabberd-p1_pgsql-20210324.tar.gz
-# Source27-md5:	2f8c3341ac8e49b774c5bad9f2272e23
-Source28:	ejabberd-p1_utils-20210324.tar.gz
-# Source28-md5:	b48ebc4e4342e51f4dca833a93615a6a
-Source29:	ejabberd-pkix-20201208.tar.gz
-# Source29-md5:	14639c53d33057bf4edc7ebfbfc02c11
-Source30:	ejabberd-rebar_elixir_plugin-20160105.tar.gz
-# Source30-md5:	6a069a566d71c3daa45fc4736364adf0
-Source31:	ejabberd-sqlite3-20210324.tar.gz
-# Source31-md5:	df130aec0c3eca906eba05340723cf5f
-Source32:	ejabberd-stringprep-20210324.tar.gz
-# Source32-md5:	f94cf702e4b04538b2feddcb40406da3
-Source33:	ejabberd-stun-20210324.tar.gz
-# Source33-md5:	2e4c4eadd1c53b8ad73701477bb098f9
-Source34:	ejabberd-unicode_util_compat-20170729.tar.gz
-# Source34-md5:	1b348fdf38dba88ebed2f65125ad8590
-Source35:	ejabberd-xmpp-20210324.tar.gz
-# Source35-md5:	6d929a75424b90edfab5df1b3a114dd3
-Source36:	ejabberd-yconf-20210324.tar.gz
-# Source36-md5:	39672c345eb3ae06d8ed9f882a9e09fa
+# Archives created with the ejabberd-pack_deps.sh script (in this repo)
+Source10:       ejabberd-base64url-20190617.tar.gz
+# Source10-md5: 5a12fd2fb1f992c850aba5115aab3dd4
+Source11:       ejabberd-cache_tab-20220502.tar.gz
+# Source11-md5: 822bec23631e956ce927ecc5ae31e24d
+Source12:       ejabberd-eimp-20220502.tar.gz
+# Source12-md5: 39b7de8ad391da8fb12ff9b76301ced5
+Source13:       ejabberd-elixir-20170515.tar.gz
+# Source13-md5: 73be42f7d0cda7aeee5c0e6dadc0c451
+Source14:       ejabberd-ezlib-20220502.tar.gz
+# Source14-md5: 32dadbeff189a0fa18c21aa42258fa1a
+Source15:       ejabberd-fast_tls-20221012.tar.gz
+# Source15-md5: 440590e5d8e16009d4ff9b38c25cea01
+Source16:       ejabberd-fast_xml-20220502.tar.gz
+# Source16-md5: 1288d6e5ea055784634367a0991adc3b
+Source17:       ejabberd-fast_yaml-20230117.tar.gz
+# Source17-md5: 13633fe81d32198c216f5e516f3ef9ee
+Source18:       ejabberd-idna-20180830.tar.gz
+# Source18-md5: e34174d5c5e2e91611d3249c690f6d2d
+Source19:       ejabberd-jiffy-20220223.tar.gz
+# Source19-md5: b98489245dadf5a36ac3408be21d835a
+Source20:       ejabberd-jose-20221216.tar.gz
+# Source20-md5: 1240b886ef9d9102e8df1193f2ebcd4e
+Source21:       ejabberd-mqtree-20220502.tar.gz
+# Source21-md5: 1f1b175534eb917780e89e4c7d49c710
+Source22:       ejabberd-p1_acme-20230117.tar.gz
+# Source22-md5: 0a0170413d2cf6cf3c083835f18bd380
+Source23:       ejabberd-p1_mysql-20231016.tar.gz
+# Source23-md5: 304d139651cc2f14769fc2d7f81b3e66
+Source24:       ejabberd-p1_oauth2-20220502.tar.gz
+# Source24-md5: bade7f8e1d18c9f6149b70268c73087b
+Source25:       ejabberd-p1_pgsql-20231016.tar.gz
+# Source25-md5: 6afd5c5763af4a744115d31c3d31eab8
+Source26:       ejabberd-p1_utils-20220502.tar.gz
+# Source26-md5: 0eab972a4a247519e5a898d8da6054c1
+Source27:       ejabberd-pkix-20220502.tar.gz
+# Source27-md5: 88fd008dca6cf2208678fbf50b47a21a
+Source28:       ejabberd-rebar_elixir_plugin-20160105.tar.gz
+# Source28-md5: 6a069a566d71c3daa45fc4736364adf0
+Source29:       ejabberd-sqlite3-20230117.tar.gz
+# Source29-md5: f9457e450712ef06a6157b23e1ebccee
+Source30:       ejabberd-stringprep-20221012.tar.gz
+# Source30-md5: b2931baf14b779c718dcd5c42c87f8d5
+Source31:       ejabberd-stun-20231016.tar.gz
+# Source31-md5: d9520616dd0331efaabb05c901cee249
+Source32:       ejabberd-unicode_util_compat-20170729.tar.gz
+# Source32-md5: 1b348fdf38dba88ebed2f65125ad8590
+Source33:       ejabberd-xmpp-20231016.tar.gz
+# Source33-md5: d2dc96824f02642a02c94fb5712d7f69
+Source34:       ejabberd-yconf-20230117.tar.gz
+# Source34-md5: 6f064bf9d6ad4cbabb44879edd2d1c9e
 
 Patch0:		%{name}-paths.patch
 Patch1:		%{name}-config.patch
@@ -127,10 +124,9 @@ Requires:	%{name} = %{version}-%{release}
 Server-side logging module.
 
 %prep
-%setup -q -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 -a 21 -a 22 -a 23 -a 24 -a 25 -a 26 -a 27 -a 28 -a 29 -a 30 -a 31 -a 32 -a 33 -a 34 -a 35 -a 36
+%setup -q -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 -a 21 -a 22 -a 23 -a 24 -a 25 -a 26 -a 27 -a 28 -a 29 -a 30 -a 31 -a 32 -a 33 -a 34
 %patch0 -p1
 %patch1 -p1
-#%%patch2 -p1
 %if %{with logdb}
 %patch3 -p1
 %endif
@@ -259,13 +255,13 @@ fi
 %systemd_reload
 
 %triggerprein -- %{name} < 13.10
-if [ -e /etc/jabber/ejabberd.cfg ] ; then
-	if grep -Eq '^[^%]*access_get' /etc/jabber/ejabberd.cfg ; then
+if [ -e %{_sysconfdir}/jabber/ejabberd.cfg ] ; then
+if grep -Eq '^[^%]*access_get' %{_sysconfdir}/jabber/ejabberd.cfg ; then
 		echo "Your 'ejabberd.cfg' config file seems to use 'access_get' option of mod_vcard" >&2
 		echo "this is not supported by this ejabberd version in PLD" >&2
 		exit 1
 	fi
-	rm -f /etc/jabber/ejabberd.yml.rpmnew 2>/dev/null || :
+rm -f %{_sysconfdir}/jabber/ejabberd.yml.rpmnew 2>/dev/null || :
 fi
 if [ -e /var/lock/subsys/ejabberd ] ; then
 	# old init script won't stop ejabberd correctly
@@ -357,11 +353,9 @@ fi
 %{_libdir}/fast_tls-*
 %{_libdir}/fast_xml-*
 %{_libdir}/fast_yaml-*
-%{_libdir}/goldrush-*
 %{_libdir}/idna-*
 %{_libdir}/jiffy-*
 %{_libdir}/jose-*
-%{_libdir}/lager-*
 %dir %{_libdir}/mqtree-*
 %{_libdir}/mqtree-*/ebin
 %dir %{_libdir}/mqtree-*/priv