- use _alt_name if build with logdb

Changed files:
    ejabberd.spec -> 1.36

diff --git a/ejabberd.spec b/ejabberd.spec
index 72518ce11fb3a74063fd28fa90c39e3121b36e6e..623abaf0e95e7c10f0a2c9558856ea05f8a04380 100644 (file)
--- a/ejabberd.spec
+++ b/ejabberd.spec
@@ -3,26 +3,33 @@
 %bcond_with    pam             # PAM authentication support
 %bcond_with    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:          ejabberd
+Name:          %{realname}%{_alt_name}
 Version:       1.1.4
 Release:       2
 License:       GPL
 Group:         Applications/Communications
-Source0:       http://www.process-one.net/en/projects/ejabberd/download/%{version}/%{name}-%{version}.tar.gz
+Source0:       http://www.process-one.net/en/projects/ejabberd/download/%{version}/%{realname}-%{version}.tar.gz
 # Source0-md5: 65e9cd346f11a28afbacfe1d7be3a33b
-Source1:       %{name}.init
-Source2:       %{name}.sysconfig
-Source3:       %{name}.sh
-Source4:       %{name}ctl.sh
-Source5:       %{name}-inetrc
-Patch0:                %{name}-makefile.patch
-Patch1:                %{name}-config.patch
-Patch2:                %{name}-mod_muc.patch
-Patch3:                %{name}-auth_pam.patch
-Patch4:                %{name}-show_certificate_chain.patch
-Patch5:                %{name}-mod_logdb.patch
+Source1:       %{realname}.init
+Source2:       %{realname}.sysconfig
+Source3:       %{realname}.sh
+Source4:       %{realname}ctl.sh
+Source5:       %{realname}-inetrc
+Patch0:                %{realname}-makefile.patch
+Patch1:                %{realname}-config.patch
+Patch2:                %{realname}-mod_muc.patch
+Patch3:                %{realname}-auth_pam.patch
+Patch4:                %{realname}-show_certificate_chain.patch
+Patch5:                %{realname}-mod_logdb.patch
 URL:           http://ejabberd.jabber.ru/
 BuildRequires: autoconf
 BuildRequires: erlang >= R9C
@@ -40,6 +47,13 @@ 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
@@ -51,7 +65,7 @@ ejabberd to darmowy, z otwartymi źródłami, odporny na awarie
 rozproszony serwer Jabbera. Jest napisany w większości w Erlangu.
 
 %prep
-%setup -q
+%setup -q -n %{realname}-%{version}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -74,16 +88,16 @@ cd ..
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/var/lib/%{name},/etc/{sysconfig,rc.d/init.d},%{_sbindir}}
+install -d $RPM_BUILD_ROOT{/var/lib/%{realname},/etc/{sysconfig,rc.d/init.d},%{_sbindir}}
 
 %{__make} -C src install \
        DESTDIR=$RPM_BUILD_ROOT
 
-sed -e's,@libdir@,%{_libdir},g' %{SOURCE1} > $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
+sed -e's,@libdir@,%{_libdir},g' %{SOURCE1} > $RPM_BUILD_ROOT/etc/rc.d/init.d/%{realname}
+install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{realname}
 
-sed -e's,@libdir@,%{_libdir},g' %{SOURCE3} > $RPM_BUILD_ROOT%{_sbindir}/%{name}
-sed -e's,@libdir@,%{_libdir},g' %{SOURCE4} > $RPM_BUILD_ROOT%{_sbindir}/%{name}ctl
+sed -e's,@libdir@,%{_libdir},g' %{SOURCE3} > $RPM_BUILD_ROOT%{_sbindir}/%{realname}
+sed -e's,@libdir@,%{_libdir},g' %{SOURCE4} > $RPM_BUILD_ROOT%{_sbindir}/%{realname}ctl
 install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/jabber
 
 %clean
@@ -122,5 +136,5 @@ fi
 %attr(770,root,jabber) /var/log/ejabberd
 %{_libdir}/ejabberd
 %dir %attr(770,root,jabber) /var/lib/ejabberd
-%attr(754,root,root) /etc/rc.d/init.d/%{name}
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
+%attr(754,root,root) /etc/rc.d/init.d/%{realname}
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{realname}