packages: heartbeat/heartbeat.spec - conflicts before package split
glen
glen at pld-linux.org
Tue May 12 15:40:20 CEST 2009
Author: glen Date: Tue May 12 13:40:19 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- conflicts before package split
---- Files affected:
packages/heartbeat:
heartbeat.spec (1.89 -> 1.90)
---- Diffs:
================================================================
Index: packages/heartbeat/heartbeat.spec
diff -u packages/heartbeat/heartbeat.spec:1.89 packages/heartbeat/heartbeat.spec:1.90
--- packages/heartbeat/heartbeat.spec:1.89 Tue May 12 11:05:45 2009
+++ packages/heartbeat/heartbeat.spec Tue May 12 15:40:13 2009
@@ -49,11 +49,11 @@
Requires(pre): /usr/bin/getgid
Requires(pre): /usr/sbin/groupadd
Requires(pre): /usr/sbin/useradd
+Requires: %{name}-libs = %{version}-%{release}
Requires: psmisc >= 22.5-2
Requires: rc-scripts
Requires: syslogdaemon
Requires: which
-Requires: %{name}-libs = %{version}-%{release}
Provides: group(haclient)
Provides: user(hacluster)
# disappeared
@@ -110,17 +110,18 @@
%description ldirectord
ldirectord is a stand-alone daemon to monitor services of real for
virtual services provided by The Linux Virtual Server
-(http://www.linuxvirtualserver.org/).
+<http://www.linuxvirtualserver.org/>.
%description ldirectord -l pl.UTF-8
ldirectord to samodzielny demon monitorujący rzeczywiste usługi dla
wirtualnych usług dostarczanych poprzez Linux Virtual Server
-(http://www.linuxvirtualserver.org/).
+<http://www.linuxvirtualserver.org/>.
%package libs
Summary: Heartbeat libraries
Summary(pl.UTF-8): Biblioteki heartbeat
Group: Libraries
+Conflicts: heartbeat < 2.99.2-0.1
%description libs
Heartbeat libraries.
@@ -365,6 +366,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.90 2009/05/12 13:40:13 glen
+- conflicts before package split
+
Revision 1.89 2009/05/12 09:05:45 jajcus
- -libs subpackage separated so whole heartbeat does not need to be installed on a developement machine
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/heartbeat/heartbeat.spec?r1=1.89&r2=1.90&f=u
More information about the pld-cvs-commit
mailing list