From 4fd695660f009810bc2289a6e2136f65b542e897 Mon Sep 17 00:00:00 2001 From: Benjamin Tissoires Date: May 03 2013 09:42:56 +0000 Subject: evemu 1.1.0 the project is now on freedesktop.org --- diff --git a/.gitignore b/.gitignore index 6111e72..addee1f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /evemu-1.0.10.tar.gz +/evemu-1.1.0.tar.gz diff --git a/0001-Don-t-segfault-when-not-using-stdout.patch b/0001-Don-t-segfault-when-not-using-stdout.patch deleted file mode 100644 index 7b057c9..0000000 --- a/0001-Don-t-segfault-when-not-using-stdout.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 8c253b18369ed02b8fb282970e974cad4de7fab5 Mon Sep 17 00:00:00 2001 -From: Benjamin Tissoires -Date: Thu, 31 Jan 2013 09:07:54 +1000 -Subject: [PATCH] Don't segfault when not using stdout - -when using: -$ evemu-record /dev/input/event21 record.txt - -And hitting Ctrl-C, the program segfault, because it tries to close two -times the output file descriptor. - -Signed-off-by: Peter Hutterer ---- - tools/evemu-record.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/tools/evemu-record.c b/tools/evemu-record.c -index 6c5e98d..4417ae1 100644 ---- a/tools/evemu-record.c -+++ b/tools/evemu-record.c -@@ -53,8 +53,10 @@ FILE *output; - static void handler (int sig __attribute__((unused))) - { - fflush(output); -- if (output != stdout) -+ if (output != stdout) { - fclose(output); -+ output = NULL; -+ } - } - - int main(int argc, char *argv[]) -@@ -102,7 +104,7 @@ int main(int argc, char *argv[]) - fprintf(stderr, "error: could not describe device\n"); - } - close(fd); -- if (output != stdout) -+ if (output && output != stdout) - fclose(output); - return 0; - } --- -1.8.1 - diff --git a/evemu.spec b/evemu.spec index 92fe794..234607e 100644 --- a/evemu.spec +++ b/evemu.spec @@ -1,18 +1,16 @@ Name: evemu -Version: 1.0.10 -Release: 3%{?dist} +Version: 1.1.0 +Release: 1%{?dist} Summary: Event Device Query and Emulation Program Group: Development/Tools License: GPLv3+ -URL: http://launchpad.net/evemu -Source0: http://launchpad.net/%{name}/trunk/%{name}-%{version}/+download/%{name}-%{version}.tar.gz +URL: http://www.freedesktop.org/wiki/Evemu +Source0: http://www.freedesktop.org/software/%{name}/%{name}-%{version}.tar.gz # Fixed upstream in revno 60 Patch01: 0001-tools-add-missing-evemu-event-man-page.patch -Patch02: test-for-device-grab.patch -Patch03: 0001-Don-t-segfault-when-not-using-stdout.patch BuildRequires: automake libtool BuildRequires: python2-devel @@ -40,9 +38,7 @@ Obsoletes: utouch-evemu-devel < 1.0.10 %prep %setup -q -%patch01 -p1 -%patch02 -p0 -%patch03 -p1 +#patch01 -p1 %build autoreconf -v --install --force || exit 1 @@ -77,6 +73,9 @@ rm -f %{buildroot}%{_libdir}/*.la %{python_sitelib}/evemu/* %changelog +* Fri May 03 2013 Benjamin Tissoires 1.1.0-1 +- Update to version 1.1.0, hosted now on freedesktop + * Thu Jan 31 2013 Peter Hutterer 1.0.10-3 - fclose output only once diff --git a/sources b/sources index d7864c2..faccf47 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2291627ed85aaad375b7f3ef531ce57b evemu-1.0.10.tar.gz +d2c44810e9c419901e253895fccb5972 evemu-1.1.0.tar.gz diff --git a/test-for-device-grab.patch b/test-for-device-grab.patch deleted file mode 100644 index 863a093..0000000 --- a/test-for-device-grab.patch +++ /dev/null @@ -1,17 +0,0 @@ -=== modified file 'tools/evemu-record.c' ---- tools/evemu-record.c 2012-03-23 15:38:02 +0000 -+++ tools/evemu-record.c 2013-01-08 02:16:09 +0000 -@@ -70,6 +70,12 @@ - return -1; - } - -+ if (ioctl(fd, EVIOCGRAB, (void*)1) < 0) { -+ fprintf(stderr, "error: this device is grabbed and I cannot record events\n"); -+ return -1; -+ } else -+ ioctl(fd, EVIOCGRAB, (void*)0); -+ - struct sigaction act; - memset (&act, '\0', sizeof(act)); - act.sa_handler = &handler; -