Author: shadzik                      Date: Sat Jan 26 18:17:30 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use _alt_name if with logdb

---- Files affected:
SPECS:
   ejabberd-mysql.spec (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SPECS/ejabberd-mysql.spec
diff -u SPECS/ejabberd-mysql.spec:1.5 SPECS/ejabberd-mysql.spec:1.6
--- SPECS/ejabberd-mysql.spec:1.5       Sat Jan 26 01:09:38 2008
+++ SPECS/ejabberd-mysql.spec   Sat Jan 26 19:17:25 2008
@@ -5,21 +5,36 @@
 #
 %define                _snap   20070926r390
 
+%define        realname        ejabberd-mysql
+%define        _alt_name       %{nil}
+
+%if %{with logdb}
+%define        _alt_name       -logdb
+%endif
+
 Summary:       Ejabberd's native MySQL drivers
 Summary(pl.UTF-8):     Natywne sterowniki do MySQL-a dla demona ejabberd
-Name:          ejabberd-mysql
+Name:          %{realname}%{_alt_name}
 Version:       0
 Release:       1.%{_snap}.0
 License:       GPL
 Group:         Applications/Communications
 # get it from https://svn.process-one.net/ejabberd-modules/mysql/trunk/src/ 
and drop onto distfiles
-Source0:       %{name}.tar.gz
+Source0:       %{realname}.tar.gz
 # Source0-md5: 3f3b5c59ebb5a807ec2d6c5ec31e795b
-Patch0:                %{name}-logdb_mysql5.patch
+Patch0:                %{realname}-logdb_mysql5.patch
 URL:           http://ejabberd.jabber.ru/
 BuildRequires: erlang >= R9C
 BuildRequires: rpmbuild(macros) >= 1.268
+%if %{with logdb}
+Requires:      ejabberd-logdb
+Obsoletes:     ejabberd-mysql
+Conflicts:     ejabberd-mysql
+%else
 Requires:      ejabberd
+Obsoletes:     ejabberd-mysql-logdb
+Conflicts:     ejabberd-mysql-logdb
+%endif
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -29,7 +44,7 @@
 Natywne sterowniki do MySQL-a dla demona ejabberd.
 
 %prep
-%setup -q -n %{name}
+%setup -q -n %{realname}
 %if %{with logdb}
 %patch0 -p0
 %endif
@@ -56,6 +71,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2008-01-26 18:17:25  shadzik
+- use _alt_name if with logdb
+
 Revision 1.5  2008-01-26 00:09:38  qboosh
 - bcond header, pl cosmetic
 
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/ejabberd-mysql.spec?r1=1.5&r2=1.6&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to