diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-05-18 10:03:18 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-05-18 10:03:18 -0400 |
| commit | cf59280c31ac276fd2ca78cabb48acf0b56b4446 (patch) | |
| tree | 9683508ca1c5547c11d789c80a191df5fa796e5e /kernel.spec | |
| parent | ea896256a407513f86b4e11d4c8bd83fe4d6a747 (diff) | |
| download | kernel-cf59280c31ac276fd2ca78cabb48acf0b56b4446.tar.gz kernel-cf59280c31ac276fd2ca78cabb48acf0b56b4446.tar.xz kernel-cf59280c31ac276fd2ca78cabb48acf0b56b4446.zip | |
Linux v4.1-rc3-346-gc0655fe9b090
- Enable in-kernel vmmouse driver (rhbz 1214474)
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec index c2cbbb955..61f66d11b 100644 --- a/kernel.spec +++ b/kernel.spec @@ -67,7 +67,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 3 # The git snapshot level -%define gitrev 3 +%define gitrev 4 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -640,6 +640,7 @@ Requires(pre): %{kernel_prereq}\ Requires(pre): %{initrd_prereq}\ Requires(pre): linux-firmware >= 20130724-29.git31f6b30\ Requires(preun): systemd >= 200\ +Conflicts: xorg-x11-drv-vmmouse < 3.0.99\ %{expand:%%{?kernel%{?1:_%{1}}_conflicts:Conflicts: %%{kernel%{?1:_%{1}}_conflicts}}}\ %{expand:%%{?kernel%{?1:_%{1}}_obsoletes:Obsoletes: %%{kernel%{?1:_%{1}}_obsoletes}}}\ %{expand:%%{?kernel%{?1:_%{1}}_provides:Provides: %%{kernel%{?1:_%{1}}_provides}}}\ @@ -2212,6 +2213,10 @@ fi # # %changelog +* Mon May 18 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.1.0-0.rc3.git4.1 +- Linux v4.1-rc3-346-gc0655fe9b090 +- Enable in-kernel vmmouse driver (rhbz 1214474) + * Fri May 15 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.1.0-0.rc3.git3.1 - Linux v4.1-rc3-177-gf0897f4cc0fc |