Author: shadzik Date: Wed Apr 1 00:45:35 2009 GMT
Module: SPECS Tag: HEAD
---- Log message:
- reverse logdb bcond
- remove alt_name shit and package logdb to subpackage
- rel 2
---- Files affected:
SPECS:
ejabberd.spec (1.47 -> 1.48)
---- Diffs:
================================================================
Index: SPECS/ejabberd.spec
diff -u SPECS/ejabberd.spec:1.47 SPECS/ejabberd.spec:1.48
--- SPECS/ejabberd.spec:1.47 Fri Jan 30 22:48:27 2009
+++ SPECS/ejabberd.spec Wed Apr 1 02:45:30 2009
@@ -5,20 +5,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
@@ -49,13 +45,6 @@
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
@@ -66,6 +55,14 @@
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
@@ -131,17 +128,27 @@
%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*
+
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
* %{date} PLD Team <[email protected]>
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.48 2009/04/01 00:45:30 shadzik
+- reverse logdb bcond
+- remove alt_name shit and package logdb to subpackage
+- rel 2
+
Revision 1.47 2009/01/30 21:48:27 arekm
- up to 2.0.3
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/ejabberd.spec?r1=1.47&r2=1.48&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
