SPECS: acpid.spec, apmd.spec - drop mutual obsoletes

[patrys]

Author: patrys                       Date: Mon Aug  6 10:37:11 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- drop mutual obsoletes

---- Files affected:
SPECS:
   acpid.spec (1.52 -> 1.53) , apmd.spec (1.63 -> 1.64) 

---- Diffs:

================================================================
Index: SPECS/acpid.spec
diff -u SPECS/acpid.spec:1.52 SPECS/acpid.spec:1.53
--- SPECS/acpid.spec:1.52	Mon Feb 12 22:23:46 2007
+++ SPECS/acpid.spec	Mon Aug  6 12:37:06 2007
@@ -7,7 +7,7 @@
 Summary(pl.UTF-8):	Demon zdarzeń ACPI
 Name:		acpid
 Version:	1.0.4
-Release:	7
+Release:	8
 License:	GPL v2
 Group:		Daemons
 Source0:	http://dl.sourceforge.net/acpid/%{name}-%{version}.tar.gz
@@ -24,8 +24,8 @@
 BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(post,preun):	/sbin/chkconfig
 Requires:	rc-scripts
-Obsoletes:	apmd
 Obsoletes:	poweracpid
+Conflicts:	apmd
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -100,6 +100,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.53  2007/08/06 10:37:06  patrys
+- drop mutual obsoletes
+
 Revision 1.52  2007/02/12 21:23:46  glen
 - tabs in preamble
 

================================================================
Index: SPECS/apmd.spec
diff -u SPECS/apmd.spec:1.63 SPECS/apmd.spec:1.64
--- SPECS/apmd.spec:1.63	Mon Feb 12 22:23:47 2007
+++ SPECS/apmd.spec	Mon Aug  6 12:37:06 2007
@@ -21,7 +21,7 @@
 Summary(zh_CN.UTF-8):	用于膝上型计算机的高级电源管理 (APM) BIOS 实用程序。
 Name:		apmd
 Version:	3.2.2
-Release:	3
+Release:	4
 Epoch:		1
 License:	GPL
 Group:		Applications/System
@@ -38,7 +38,7 @@
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 Requires:	procps
 Requires:	rc-scripts
-Obsoletes:	acpid
+Conflicts:	acpid
 Obsoletes:	poweracpid
 ExclusiveArch:	%{ix86} ppc
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -335,6 +335,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.64  2007/08/06 10:37:06  patrys
+- drop mutual obsoletes
+
 Revision 1.63  2007/02/12 21:23:47  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/acpid.spec?r1=1.52&r2=1.53&f=u
    http://cvs.pld-linux.org/SPECS/apmd.spec?r1=1.63&r2=1.64&f=u