rpms/kernel
9
2
Fork 4
Code Issues Pull Requests Releases Activity

fix libdm conflict

Browse Source
This commit is contained in:
Kyle McMartin 2011-06-14 12:58:31 -04:00
parent 61c4903272
commit 1d8e3474dc
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kernel.spec
View File

@ -51,7 +51,7 @@ Summary: The Linux kernel
# For non-released -rc kernels, this will be prepended with "0.", so # For non-released -rc kernels, this will be prepended with "0.", so
# for example a 3 here will become 0.3 # for example a 3 here will become 0.3
# #
%global baserelease 2 %global baserelease 3
%global fedora_build %{baserelease} %global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching # base_sublevel is the kernel version we're starting with and patching
@ -433,7 +433,7 @@ Summary: The Linux kernel
# First the general kernel 2.6 required versions as per # First the general kernel 2.6 required versions as per
# Documentation/Changes # Documentation/Changes
# #
%define kernel_dot_org_conflicts ppp < 2.4.3-3, isdn4k-utils < 3.2-32, nfs-utils < 1.0.7-12, e2fsprogs < 1.37-4, util-linux < 2.12, jfsutils < 1.1.7-2, reiserfs-utils < 3.6.19-2, xfsprogs < 2.6.13-4, procps < 3.2.5-6.3, oprofile < 0.9.1-2, module-init-tools < 3.13-1, device-mapper-libs < 2.02.84-2 %define kernel_dot_org_conflicts ppp < 2.4.3-3, isdn4k-utils < 3.2-32, nfs-utils < 1.0.7-12, e2fsprogs < 1.37-4, util-linux < 2.12, jfsutils < 1.1.7-2, reiserfs-utils < 3.6.19-2, xfsprogs < 2.6.13-4, procps < 3.2.5-6.3, oprofile < 0.9.1-2, module-init-tools < 3.13-1, device-mapper-libs < 1.02.63-2
# #
# Then a series of requirements that are distribution specific, either # Then a series of requirements that are distribution specific, either
@ -1929,6 +1929,10 @@ fi
# and build. # and build.
%changelog %changelog
* Tue Jun 14 2011 Kyle McMartin <kmcmartin@redhat.com> 3.0-0.rc3.git0.3
- Fix libdm conflict (whose bright idea was it to give subpackages differing
version numbers?)
* Tue Jun 14 2011 Kyle McMartin <kmcmartin@redhat.com> * Tue Jun 14 2011 Kyle McMartin <kmcmartin@redhat.com>
- Update to 3.0-rc3, add another conflicts to deal with 2 digit - Update to 3.0-rc3, add another conflicts to deal with 2 digit
versions (libdm.) versions (libdm.)