[libevdev/f20] Restore deprecated constants LIBEVDEV_READ_* dropped from 0.6

[Peter Hutterer]

commit a6df1db1eb79be450244144135890ec2793ab89c
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Fri Jan 3 08:32:33 2014 +1000

    Restore deprecated constants LIBEVDEV_READ_* dropped from 0.6

 ...t-Drop-some-leftover-deprecated-constants.patch |   30 ++++++++++++++++++++
 libevdev.spec                                      |   12 ++++++--
 2 files changed, 39 insertions(+), 3 deletions(-)
---
diff --git a/0001-Revert-Drop-some-leftover-deprecated-constants.patch b/0001-Revert-Drop-some-leftover-deprecated-constants.patch
new file mode 100644
index 0000000..250be85
--- /dev/null
+++ b/0001-Revert-Drop-some-leftover-deprecated-constants.patch
@@ -0,0 +1,30 @@
+From 9ee61912a356bb8c1995cf262428196e5e4f179d Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer at who-t.net>
+Date: Fri, 3 Jan 2014 08:30:04 +1000
+Subject: [PATCH libevdev] Revert "Drop some leftover deprecated constants."
+
+This reverts commit a612ee753e8c40d2d1fff6da516d278064e27d86.
+---
+ libevdev/libevdev.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/libevdev/libevdev.c b/libevdev/libevdev.c
+index 8a37204..432aeff 100644
+--- a/libevdev/libevdev.c
++++ b/libevdev/libevdev.c
+@@ -36,6 +36,12 @@
+ 
+ #define MAXEVENTS 64
+ 
++/* DEPRECATED */
++LIBEVDEV_EXPORT const enum libevdev_read_flag LIBEVDEV_READ_SYNC = LIBEVDEV_READ_FLAG_SYNC;
++LIBEVDEV_EXPORT const enum libevdev_read_flag LIBEVDEV_READ_NORMAL = LIBEVDEV_READ_FLAG_NORMAL;
++LIBEVDEV_EXPORT const enum libevdev_read_flag LIBEVDEV_FORCE_SYNC = LIBEVDEV_READ_FLAG_FORCE_SYNC;
++LIBEVDEV_EXPORT const enum libevdev_read_flag LIBEVDEV_READ_BLOCKING = LIBEVDEV_READ_FLAG_BLOCKING;
++
+ static int sync_mt_state(struct libevdev *dev, int create_events);
+ 
+ static int
+-- 
+1.8.4.2
+
diff --git a/libevdev.spec b/libevdev.spec
index 52711bd..e27451e 100644
--- a/libevdev.spec
+++ b/libevdev.spec
@@ -1,15 +1,17 @@
 Name:           libevdev
 Version:        0.6
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Kernel Evdev Device Wrapper Library
 
 Group:          System Environment/Libraries
 License:        MIT
 URL:            http://www.freedesktop.org/wiki/Software/libevdev
 Source0:        http://www.freedesktop.org/software/%{name}/%{name}-%{version}.tar.xz
-# Straight reversion of upstream 7a38f4abc3ed1df368d5bad32a1d72559acdc234
-# Produced via 'git revert' and 'git format-patch'
+
+# 0.6 has an ABI change, revert here for now until the sonames are bumped, etc.
+# https://bugzilla.redhat.com/show_bug.cgi?id=1046426
 Patch0:         0001-Revert-Drop-deprecated-functions.patch
+Patch1:         0001-Revert-Drop-some-leftover-deprecated-constants.patch
 
 BuildRequires:  automake libtool
 BuildRequires:  python
@@ -28,6 +30,7 @@ Kernel Evdev Device Wrapper Library Development Package.
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .revert_functions
+%patch1 -p1 -b .revert_constants
 
 %build
 autoreconf --force -v --install || exit 1
@@ -57,6 +60,9 @@ rm -f %{buildroot}%{_libdir}/*.la
 %{_mandir}/man3/libevdev.3*
 
 %changelog
+* Fri Jan 03 2014 Peter Hutterer <peter.hutterer at redhat.com> 0.6-3
+- Restore deprecated constants LIBEVDEV_READ_* dropped from 0.6 (#1046426)
+
 * Thu Dec 26 2013 Adam Williamson <awilliam at redhat.com> 0.6-2
 - revert catastrophic upstream dropping of 'deprecated' functions - #1046426