allow building with the 'new SQL schema'

[packages/ejabberd.git] / ejabberd.spec

diff --git a/ejabberd.spec b/ejabberd.spec
index df0c96729c41a40b5f4f6ace36cd91d36831322b..efe9d481a5b37efc155c710e89ea70fb00ad2b5b 100644 (file)
--- a/ejabberd.spec
+++ b/ejabberd.spec
@@ -4,71 +4,69 @@
 # Conditional build:
 %bcond_with    pam             # PAM authentication support
 %bcond_without logdb           # enable mod_logdb (server-side message logging)
-%bcond_with    weaker_crypto   # enable SSLv3
+%bcond_with    new_sql_schema  # build with the new SQL schema
 
 Summary:       Fault-tolerant distributed Jabber/XMPP server
 Summary(pl.UTF-8):     Odporny na awarie rozproszony serwer Jabbera/XMPP
 Name:          ejabberd
-Version:       17.03
-Release:       1
+Version:       18.04
+Release:       2
 License:       GPL
 Group:         Applications/Communications
 Source0:       http://www.process-one.net/downloads/ejabberd/%{version}/%{name}-%{version}.tgz
-# Source0-md5: 050f4f5d54547187078981d3e826ec7a
+# Source0-md5: bd82d63fc4eb0931b7f3da0a2847772e
 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-cache_tab-20170322.tar.gz
-# Source10-md5:        f83d633453e48e1903c0ee7138a0f744
-Source11:       ejabberd-elixir-20160606.tar.gz
-# Source11-md5:        f05888b0bb7daea121ad3c618f65632b
-Source12:       ejabberd-esip-20170322.tar.gz
-# Source12-md5:        53c749770167fc62aed6f3f3af1d573a
-Source13:       ejabberd-ezlib-20170110.tar.gz
-# Source13-md5:        087db5c6cc8b24388c67f3ad4e787b20
-Source14:       ejabberd-fast_tls-20170320.tar.gz
-# Source14-md5:        8bd1badec4815fac794915ac7ecf42a5
-Source15:       ejabberd-fast_xml-20170214.tar.gz
-# Source15-md5:        819cdf9a71542e83468e4fce65d85fed
-Source16:       ejabberd-fast_yaml-20170322.tar.gz
-# Source16-md5:        614f37218b8123ab087e8108d3983852
-Source17:       ejabberd-goldrush-20151116.tar.gz
-# Source17-md5:        a68b4fbe59f5e3f73f6dbd693d92950a
-Source18:       ejabberd-iconv-20170322.tar.gz
-# Source18-md5:        a8b29e6e99f395036371b373bbb6424e
-Source19:       ejabberd-jiffy-20160331.tar.gz
-# Source19-md5:        8f5dbcad2bd86c30d30284586e705047
-Source20:       ejabberd-lager-20160610.tar.gz
-# Source20-md5:        e73252d9360b967d328c3fc1ecf95399
-Source21:       ejabberd-luerl-20151210.tar.gz
-# Source21-md5:        a576fb8b925b5b4cb015db08e53b1ac7
-Source22:       ejabberd-p1_mysql-20161125.tar.gz
-# Source22-md5:        cc9924f67aa4faeee2493e94ed756048
-Source23:       ejabberd-p1_oauth2-20160123.tar.gz
-# Source23-md5:        65f44fb6e4cd7f268cf541ea23ec02da
-Source24:       ejabberd-p1_pgsql-20170110.tar.gz
-# Source24-md5:        a3671c35e1ba81f604facecbb470bcd7
-Source25:       ejabberd-p1_utils-20170223.tar.gz
-# Source25-md5:        ff45d96a1c3097c2bb05e814b3ece3d5
-Source26:       ejabberd-rebar_elixir_plugin-20160105.tar.gz
-# Source26-md5:        5fd71f30d0990df6e13f2a8168fcc749
-Source27:       ejabberd-stringprep-20170322.tar.gz
-# Source27-md5:        0ca7d7d297b143c636b39d9938ccf5d5
-Source28:       ejabberd-stun-20170322.tar.gz
-# Source28-md5:        2b60648725323bf4fac597a9bb8b989d
-Source29:       ejabberd-xmpp-20170322.tar.gz
-# Source29-md5:        ab60594df270de155f176605687cfc68
-#
+Source10:       ejabberd-base64url-20150806.tar.gz
+# Source10-md5:        afa75062e6e007cb756d98d5ca666b42
+Source11:       ejabberd-cache_tab-20180322.tar.gz
+# Source11-md5:        9f14ec8529265206436fed4b4a0ca55c
+Source12:       ejabberd-eimp-20180425.tar.gz
+# Source12-md5:        76860dfd63eec9ecebe19735a1079b23
+Source13:       ejabberd-elixir-20170515.tar.gz
+# Source13-md5:        7d60cb822a5d7d3ed8f1daefe63e7b5c
+Source14:       ejabberd-ezlib-20180322.tar.gz
+# Source14-md5:        13e8dc5d7256f9081eb30ccb97ddbb53
+Source15:       ejabberd-fast_tls-20180425.tar.gz
+# Source15-md5:        2805e9185d94dc3da231429b68875d9f
+Source16:       ejabberd-fast_xml-20180425.tar.gz
+# Source16-md5:        aad0a6b1fb3fb4f81929c7eb02565c96
+Source17:       ejabberd-fast_yaml-20180425.tar.gz
+# Source17-md5:        39eef0ecd77cf4144277408b8764deaa
+Source18:       ejabberd-goldrush-20160531.tar.gz
+# Source18-md5:        cce5aa7bdd2a25ad1cf642b2a3eedd53
+Source19:       ejabberd-iconv-20180322.tar.gz
+# Source19-md5:        851afe38b6ffdad1e2584d810ae2f5a1
+Source20:       ejabberd-jiffy-20160331.tar.gz
+# Source20-md5:        0e69e8668ff84e16cc98e95eb57a7687
+Source21:       ejabberd-jose-20170518.tar.gz
+# Source21-md5:        523f534504d4fea2dbd052ceaea6dec0
+Source22:       ejabberd-lager-20170426.tar.gz
+# Source22-md5:        3d91b8e70c10987f8ac549d2e595d631
+Source23:       ejabberd-p1_mysql-20170928.tar.gz
+# Source23-md5:        64c6a4b133da0a4b0b3c7f317196397d
+Source24:       ejabberd-p1_oauth2-20180425.tar.gz
+# Source24-md5:        1e53045cf956aba979d3f1324f8768b6
+Source25:       ejabberd-p1_pgsql-20180322.tar.gz
+# Source25-md5:        40ef5abf21f568b9b195ed0cf4b69946
+Source26:       ejabberd-p1_utils-20180322.tar.gz
+# Source26-md5:        322b2d2c8a48570c454af5baed1ac4c0
+Source27:       ejabberd-rebar_elixir_plugin-20160105.tar.gz
+# Source27-md5:        9382b37f25d3727edf657bda1af1cc32
+Source28:       ejabberd-stringprep-20180322.tar.gz
+# Source28-md5:        92c43f65099e812a11f4a9536b4e71ab
+Source29:       ejabberd-xmpp-20180425.tar.gz
+# Source29-md5:        6e43cfd60dc1a899f690bc25f63b172a
+
 Patch0:                %{name}-paths.patch
 Patch1:                %{name}-config.patch
-# not available for 13.10
-#Patch2: %{name}-vcard-access-get.patch
-# http://www.dp.uz.gov.ua/o.palij/mod_logdb/patch-mod_logdb-13.12.diff
+# https://paleg.github.io/mod_logdb/
+# https://github.com/paleg/ejabberd/tree/17.04-mod_logdb
 Patch3:                %{name}-mod_logdb.patch
-Patch4:                %{name}-no_sslv3_or_3des.patch
 URL:           http://www.ejabberd.im/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -121,9 +119,6 @@ Server-side logging module.
 %if %{with logdb}
 %patch3 -p1
 %endif
-%if %{without weaker_crypto}
-%patch4 -p1
-%endif
 
 # Various parts of the build system use 'git describe'
 # which returns nonsense on manual builds using the builder script
@@ -145,6 +140,7 @@ unset GIT_DIR GIT_WORK_TREE
 %configure \
        %{?with_pam --enable-pam} \
        --enable-user=jabber \
+       %{__enable_disable new_sql_schema new-sql-schema} \
        --enable-elixir \
        --enable-full-xml \
        --enable-odbc \
@@ -174,9 +170,6 @@ cd ../..
 cd deps/ezlib
 %configure
 cd ../..
-cd deps/esip
-%configure
-cd ../..
 
 # for elixir VM
 LC_ALL=en_US.UTF-8; export LC_ALL
@@ -337,9 +330,15 @@ fi
 %exclude %{_libdir}/ejabberd-%{version}/ebin/mod_logdb*
 %endif
 %{_libdir}/ejabberd-%{version}
+%{_libdir}/base64url-*
 %{_libdir}/cache_tab-*
+%dir %{_libdir}/eimp-*
+%dir %{_libdir}/eimp-*/priv
+%dir %{_libdir}/eimp-*/priv/bin
+%attr(755,root,root) %{_libdir}/eimp-*/priv/bin/eimp
+%{_libdir}/eimp-*/ebin
+%{_libdir}/eimp-*/LICENSE.txt
 %{_libdir}/elixir-*
-%{_libdir}/esip-*
 %{_libdir}/ezlib-*
 %{_libdir}/fast_tls-*
 %{_libdir}/fast_xml-*
@@ -347,15 +346,14 @@ fi
 %{_libdir}/goldrush-*
 %{_libdir}/iconv-*
 %{_libdir}/jiffy-*
+%{_libdir}/jose-*
 %{_libdir}/lager-*
-%{_libdir}/luerl-*
 %{_libdir}/p1_mysql-*
 %{_libdir}/p1_oauth2-*
 %{_libdir}/p1_pgsql-*
 %{_libdir}/p1_utils-*
 %{_libdir}/rebar_elixir_plugin-*
 %{_libdir}/stringprep-*
-%{_libdir}/stun-*
 %{_libdir}/xmpp-*
 %dir %attr(770,root,jabber) /var/lib/ejabberd
 %ghost %attr(400,jabber,jabber) %ghost %config(noreplace) %verify(not md5 mtime size) /var/lib/ejabberd/.erlang.cookie