rpms/util-linux-ng/devel util-linux-ng.spec,1.46,1.47

[Karel Zak]

Author: kzak

Update of /cvs/pkgs/rpms/util-linux-ng/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24951

Modified Files:
	util-linux-ng.spec 
Log Message:
Fix conflicts/requires and temporary disable dependency on libuuid (e2fsprogs).



Index: util-linux-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/util-linux-ng.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- util-linux-ng.spec	4 Jun 2009 15:12:50 -0000	1.46
+++ util-linux-ng.spec	4 Jun 2009 19:44:35 -0000	1.47
@@ -25,7 +25,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 ### Dependences
 BuildRequires: audit-libs-devel >= 1.0.6
-BuildRequires: e2fsprogs-devel >= 1.36
+# temporary disable dependence on libuuid (UUID stuff is optional for u-l-ng)
+#BuildRequires: e2fsprogs-devel >= 1.41.6-1
 BuildRequires: gettext-devel
 BuildRequires: libselinux-devel
 BuildRequires: ncurses-devel
@@ -50,6 +51,8 @@ Source11: http://download.sourceforge.ne
 Conflicts: initscripts <= 4.58
 %endif
 Conflicts: kernel < 2.2.12-7
+# old versions of e2fsprogs provides libblkid
+Conflicts: e2fsprogs < 1.41.6-2
 
 # old versions of util-linux have been splited to more sub-packages
 Obsoletes: mount < 2.11, losetup < 2.11
@@ -590,7 +593,7 @@ exit 0
 %{_includedir}/blkid
 %{_mandir}/man3/libblkid.3*
 %{_libdir}/pkgconfig/blkid.pc
-
+%{_includedir}/blkid
 
 %changelog
 * Thu Jun  4 2009 Karel Zak <kzak at redhat.com> 2.15.1-0.1