- reverse logdb bcond

- remove alt_name shit and package logdb to subpackage
- rel 2

Changed files:
    ejabberd.spec -> 1.48

diff --git a/ejabberd.spec b/ejabberd.spec
index ecb0639f583b876634cb6cafa915846c76ff96bc..50b718766d2aa0a24d424111a991003ea58f8048 100644 (file)
--- a/ejabberd.spec
+++ b/ejabberd.spec
@@ -4,20 +4,16 @@
 #
 # Conditional build:
 %bcond_with    pam             # PAM authentication support
-%bcond_with    logdb           # enable mod_logdb (server-side message logging)
+%bcond_without logdb           # enable mod_logdb (server-side message logging)
 #
-%define        _alt_name       %{nil}
-%if %{with logdb}
-%define        _alt_name       -logdb
-%endif
 
 %define        realname        ejabberd
 
 Summary:       Fault-tolerant distributed Jabber/XMPP server
 Summary(pl.UTF-8):     Odporny na awarie rozproszony serwer Jabbera/XMPP
-Name:          %{realname}%{_alt_name}
+Name:          %{realname}
 Version:       2.0.3
-Release:       1
+Release:       2
 License:       GPL
 Group:         Applications/Communications
 Source0:       http://www.process-one.net/downloads/ejabberd/%{version}/%{realname}-%{version}.tar.gz
@@ -48,13 +44,6 @@ Requires(post):      textutils
 Requires(post,preun):  /sbin/chkconfig
 Requires:      erlang
 Requires:      rc-scripts
-%if %{with logdb}
-Obsoletes:     ejabberd
-Conflicts:     ejabberd
-%else
-Obsoletes:     ejabberd-logdb
-Conflicts:     ejabberd-logdb
-%endif
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -65,6 +54,14 @@ server. It is written mostly in Erlang.
 ejabberd to darmowy, z otwartymi źródłami, odporny na awarie
 rozproszony serwer Jabbera. Jest napisany w większości w Erlangu.
 
+%package logdb
+Summary:        Server-side logging module
+Group:         Applications/Communications
+Requires:      %{name} = %{version}-%{release}
+
+%description logdb
+Server-side logging module.
+
 %prep
 %setup -q -n %{realname}-%{version}
 %patch0 -p1
@@ -130,7 +127,12 @@ fi
 %attr(755,root,root) %{_sbindir}/*
 %attr(640,root,jabber) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/jabber/*
 %attr(770,root,jabber) /var/log/ejabberd
+%exclude %{_libdir}/ejabberd/ebin/mod_logdb*
 %{_libdir}/ejabberd
 %dir %attr(770,root,jabber) /var/lib/ejabberd
 %attr(754,root,root) /etc/rc.d/init.d/%{realname}
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{realname}
+
+%files logdb
+%defattr(644,root,root,755)
+%{_libdir}/ejabberd/ebin/mod_logdb*