SPECS: device-mapper.spec - add buildconflicts not to collide with...

[glen]

Author: glen                         Date: Wed Jul 12 17:09:20 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- add buildconflicts not to collide with older libdevmapper.h

---- Files affected:
SPECS:
   device-mapper.spec (1.60 -> 1.61) 

---- Diffs:

================================================================
Index: SPECS/device-mapper.spec
diff -u SPECS/device-mapper.spec:1.60 SPECS/device-mapper.spec:1.61
--- SPECS/device-mapper.spec:1.60	Sat Jul  1 13:24:23 2006
+++ SPECS/device-mapper.spec	Wed Jul 12 19:09:15 2006
@@ -1,4 +1,6 @@
 # $Revision$, $Date$
+# TODO
+# - add fix to drop BuildConflicts:	device-mapper-initrd-devel
 #
 # Conditional build:
 %bcond_without	selinux		# build without SELinux support
@@ -8,7 +10,7 @@
 Summary(pl):	Wsparcie dla mapowania urządzeń w przestrzeni użytkownika
 Name:		device-mapper
 Version:	1.02.07
-Release:	0.17
+Release:	0.18
 License:	GPL v2
 Group:		Applications/System
 Source0:	ftp://sources.redhat.com/pub/dm/%{name}.%{version}.tgz
@@ -24,6 +26,8 @@
 %{?with_initrd:BuildRequires:	klibc-static}
 %{?with_selinux:BuildRequires:	libselinux-devel >= 1.10}
 %{?with_initrd:BuildRequires:	uClibc-static >= 0.9.26}
+# /usr/include/klibc/libdevmapper.h is included first before currently built version with klcc
+BuildConflicts:	device-mapper-initrd-devel < 1.02.07
 %{?with_selinux:Requires:	libselinux >= 1.10}
 Conflicts:	dev < 2.9.0-8
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -247,11 +251,14 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.61  2006/07/12 17:09:15  glen
+- add buildconflicts not to collide with older libdevmapper.h
+
 Revision 1.60  2006/07/01 11:24:23  qboosh
 - added ac patch
 
 Revision 1.59  2006/06/20 16:40:56  wiget
-- don't use %%{_lib} in uClibc path
+- don't use %{_lib} in uClibc path
 - release 0.17
 
 Revision 1.58  2006/06/20 10:15:14  pluto
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/device-mapper.spec?r1=1.60&r2=1.61&f=u