From 666152effa5d96eadc5e8792745b503ac6184ea3 Mon Sep 17 00:00:00 2001 From: Jaromir Capik Date: Mon, 4 Feb 2013 14:26:08 +0100 Subject: [PATCH] Resolving conflicts with ff-utils --- linuxconsoletools.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/linuxconsoletools.spec b/linuxconsoletools.spec index e374cf7..43dca48 100644 --- a/linuxconsoletools.spec +++ b/linuxconsoletools.spec @@ -1,6 +1,6 @@ Name: linuxconsoletools Version: 1.4.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Tools for connecting joysticks & legacy devices to the kernel's input subsystem Group: Applications/System License: GPLv2+ @@ -11,7 +11,9 @@ Source: http://downloads.sourceforge.net/linuxconsole/%{name}-%{version}.tar.bz2 BuildRequires: SDL-devel Provides: joystick = %{version}-%{release} +Provides: ff-utils = 1:%{version}-%{release} Obsoletes: joystick < 1.2.16-1 +Obsoletes: ff-utils < 2.4.22-1 Conflicts: gpm < 1.20.6-26 %description @@ -61,6 +63,9 @@ chmod -x %{buildroot}%{_mandir}/man1/* %changelog +* Mon Feb 04 2013 Jaromir Capik - 1.4.4-5 +- Resolving conflicts with ff-utils + * Fri Jan 04 2013 Jaromir Capik - 1.4.4-4 - Adding conflict with gpm < 1.20.6-26 (inputattach)