Author: shadzik Date: Sat Jan 26 18:07:27 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- use _alt_name if build with logdb
---- Files affected:
SPECS:
ejabberd.spec (1.35 -> 1.36)
---- Diffs:
================================================================
Index: SPECS/ejabberd.spec
diff -u SPECS/ejabberd.spec:1.35 SPECS/ejabberd.spec:1.36
--- SPECS/ejabberd.spec:1.35 Fri Jan 25 20:24:22 2008
+++ SPECS/ejabberd.spec Sat Jan 26 19:07:22 2008
@@ -4,26 +4,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
@@ -41,6 +48,13 @@
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
@@ -52,7 +66,7 @@
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
@@ -75,16 +89,16 @@
%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
@@ -123,8 +137,8 @@
%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}
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -132,6 +146,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.36 2008-01-26 18:07:22 shadzik
+- use _alt_name if build with logdb
+
Revision 1.35 2008-01-25 19:24:22 shadzik
- add patch5
- rel 2
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/ejabberd.spec?r1=1.35&r2=1.36&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
