Fix FTBFS in Rawhide

Signed-off-by: Peter Lemenkov <lemenkov@redhat.com>

1 files changed, 40 insertions, 21 deletions

diff --git a/ejabberd.spec b/ejabberd.spec
index f4fc60b..0c45a18 100644
--- a/ejabberd.spec
+++ b/ejabberd.spec
@@ -1,10 +1,11 @@
 %global _hardened_build 1
 %global debug_package %{nil}
+%global srcname ejabberd
 
 
 Name:           ejabberd
 Version:        16.08
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 License:        GPLv2+
@@ -115,18 +116,39 @@ autoreconf -ivf
 # Disabled: --enable-hipe --enable-roster-gateway-workaround --enable-transient_supervisors
 #           --enable-full-xml --enable-mssql --enable-tools --enable-riak --enable-http
 %configure --enable-odbc --enable-mysql --enable-pgsql --enable-pam --enable-zlib --enable-iconv --enable-debug --enable-lager --libdir=%{_libdir}/erlang/lib/ --with-erlang=%{_libdir}/erlang/
-mkdir deps
-make -t deps
-make src REBAR=%__rebar
+
+%{erlang_compile}
 
 
 %install
-make install DESTDIR=%{buildroot} REBAR=%__rebar
-rm %{buildroot}/%{_docdir}/ejabberd/COPYING
+%{erlang_install}
+
+sed 	-e "s*{{rootdir}}*%{_prefix}*" \
+	-e "s*{{installuser}}**" \
+	-e "s*{{bindir}}*%{_bindir}*" \
+	-e "s*{{libdir}}*%{_erllibdir}*" \
+	-e "s*{{sysconfdir}}*%{_sysconfdir}*" \
+	-e "s*{{localstatedir}}*/var*" \
+	-e "s*{{docdir}}*%{_datadir}/doc/%{name}*" \
+	-e "s*{{erl}}*%{_erllibdir}/bin/erl*" \
+	-e "s*{{epmd}}*%{_erllibdir}/bin/epmd*" ejabberdctl.template \
+> ejabberdctl.example
+
+install -d -m 0750 %{buildroot}%{_sysconfdir}/%{name}
+install -D -p -m 0644 ejabberd.yml.example %{buildroot}%{_sysconfdir}/%{name}/ejabberd.yml
+install -D -p -m 0644 ejabberdctl.cfg.example %{buildroot}%{_sysconfdir}/%{name}/ejabberdctl.cfg
+install -D -p -m 0644 inetrc %{buildroot}%{_sysconfdir}/%{name}/inetrc
+
+install -D -p -m 0644 ejabberdctl.example %{buildroot}%{_bindir}/ejabberdctl
+
+install -d -m 0750 %{buildroot}/var/lib/ejabberd
+install -d -m 0750 %{buildroot}/var/lock/ejabberdctl
+install -d -m 0750 %{buildroot}/var/log/ejabberd
 
 # fix example SSL certificate path to real one, which we created recently (see above)
 %{__perl} -pi -e 's!/path/to/ssl.pem!/etc/ejabberd/ejabberd.pem!g' %{buildroot}/etc/ejabberd/ejabberd.yml
 
+install -D -p -m 0755 tools/captcha.sh %{buildroot}%{_erllibdir}/%{name}-%{version}/priv/bin/captcha.sh
 # fix captcha path
 %{__perl} -pi -e 's!/lib/ejabberd/priv/bin/captcha.sh!%{_libdir}/%{name}/priv/bin/captcha.sh!g' %{buildroot}/etc/ejabberd/ejabberd.yml
 
@@ -141,20 +163,20 @@ install -D -m 0644 -p %{S:5} %{buildroot}%{_tmpfilesdir}/%{name}.conf
 install -D -p -m 0644  %{S:2} %{buildroot}%{_sysconfdir}/logrotate.d/ejabberd
 
 # create room for additional files (such as SQL schemas)
-install -d %{buildroot}%{_datadir}/%{name}
+install -d -m 0755 %{buildroot}%{_erllibdir}/%{name}-%{version}/priv/sql/
 # install sql-scripts for creating db schemes for various RDBMS
-install -p -m 0644 sql/lite.sql %{buildroot}%{_datadir}/%{name}
-install -p -m 0644 sql/mssql.sql %{buildroot}%{_datadir}/%{name}
-install -p -m 0644 sql/mysql.sql %{buildroot}%{_datadir}/%{name}
-install -p -m 0644 sql/pg.sql %{buildroot}%{_datadir}/%{name}
+install -p -m 0644 sql/lite.sql %{buildroot}%{_erllibdir}/%{name}-%{version}/priv/sql/
+install -p -m 0644 sql/mssql.sql %{buildroot}%{_erllibdir}/%{name}-%{version}/priv/sql/
+install -p -m 0644 sql/mysql.sql %{buildroot}%{_erllibdir}/%{name}-%{version}/priv/sql/
+install -p -m 0644 sql/pg.sql %{buildroot}%{_erllibdir}/%{name}-%{version}/priv/sql/
+
+install -d -m 0755 %{buildroot}%{_erllibdir}/%{name}-%{version}/priv/msgs/
+install -p -m 0644 priv/msgs/*.msg %{buildroot}%{_erllibdir}/%{name}-%{version}/priv/msgs/
 
 # Install polkit-related files
 install -D -p -m 0644 %{S:12} %{buildroot}%{_datadir}/polkit-1/actions/ejabberdctl.policy
 install -D -p -m 0644 %{S:13} %{buildroot}%{_datadir}/polkit-1/rules.d/51-ejabberdctl.rules
 
-# Move the files to the correctly versioned folder
-mv %{buildroot}/%{_erllibdir}/ejabberd-0.0 %{buildroot}/%{_erllibdir}/ejabberd-%{version}
-
 
 %pre
 getent group %{name} >/dev/null || groupadd -r %{name}
@@ -257,13 +279,7 @@ fi)
 %{_erllibdir}/%{name}-%{version}/include/*.hrl
 %{_erllibdir}/%{name}-%{version}/priv/bin/captcha.sh
 %{_erllibdir}/%{name}-%{version}/priv/msgs/*.msg
-%{_erllibdir}/%{name}-%{version}/priv/sql/lite.sql
-
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/lite.sql
-%{_datadir}/%{name}/mssql.sql
-%{_datadir}/%{name}/mysql.sql
-%{_datadir}/%{name}/pg.sql
+%{_erllibdir}/%{name}-%{version}/priv/sql/*.sql
 
 %attr(750,ejabberd,ejabberd) %dir /var/lib/ejabberd
 %attr(750,ejabberd,ejabberd) %dir /var/lock/ejabberdctl
@@ -271,6 +287,9 @@ fi)
 
 
 %changelog
+* Mon Oct 17 2016 Peter Lemenkov <lemenkov@gmail.com> - 16.08-3
+- Fix FTBFS in Rawhide
+
 * Thu Aug 18 2016 Peter Lemenkov <lemenkov@gmail.com> - 16.08-2
 - Reenable systemd notification
 - Drop outdated dependency - p1_xmlrpc