summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Bogusz2013-01-03 17:06:28 (GMT)
committerJakub Bogusz2013-01-03 17:06:28 (GMT)
commit0f54dd46875f6ccc751b8c48963e4b95b7be5c73 (patch)
treeb23277b63d709509ca190e2b34a59605a6743c0f
parentbcf3daa220e399c640a3075044a5ba556dba2570 (diff)
downloadxorg-gtest-0f54dd46875f6ccc751b8c48963e4b95b7be5c73.zip
xorg-gtest-0f54dd46875f6ccc751b8c48963e4b95b7be5c73.tar.gz
- updated to 0.7.0
- removed obsolete missing patch
-rw-r--r--xorg-gtest-missing.patch44
-rw-r--r--xorg-gtest.spec8
2 files changed, 3 insertions, 49 deletions
diff --git a/xorg-gtest-missing.patch b/xorg-gtest-missing.patch
deleted file mode 100644
index 13fb8d5..0000000
--- a/xorg-gtest-missing.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- xorg-gtest-0.5.0/test/PIXART-USB-OPTICAL-MOUSE.desc.orig 1970-01-01 01:00:00.000000000 +0100
-+++ xorg-gtest-0.5.0/test/PIXART-USB-OPTICAL-MOUSE.desc 2012-10-12 20:57:16.028321087 +0200
-@@ -0,0 +1,41 @@
-+# standard USB mouse
-+# Input driver version is 1.0.1
-+# Input device ID: bus 0x3 vendor 0x93a product 0x2510 version 0x110
-+# Input device name: "PIXART USB OPTICAL MOUSE"
-+# Supported events:
-+# Event type 0 (EV_SYN)
-+# Event type 1 (EV_KEY)
-+# Event code 272 (BTN_LEFT)
-+# Event code 273 (BTN_RIGHT)
-+# Event code 274 (BTN_MIDDLE)
-+# Event type 2 (EV_REL)
-+# Event code 0 (REL_X)
-+# Event code 1 (REL_Y)
-+# Event code 8 (REL_WHEEL)
-+# Event type 4 (EV_MSC)
-+# Event code 4 (MSC_SCAN)
-+#
-+N: PIXART USB OPTICAL MOUSE
-+I: 0003 093a 2510 0110
-+P: 00 00 00 00 00 00 00 00
-+B: 00 17 00 00 00 00 00 00 00
-+B: 01 00 00 00 00 00 00 00 00
-+B: 01 00 00 00 00 00 00 00 00
-+B: 01 00 00 00 00 00 00 00 00
-+B: 01 00 00 00 00 00 00 00 00
-+B: 01 00 00 07 00 00 00 00 00
-+B: 01 00 00 00 00 00 00 00 00
-+B: 01 00 00 00 00 00 00 00 00
-+B: 01 00 00 00 00 00 00 00 00
-+B: 01 00 00 00 00 00 00 00 00
-+B: 01 00 00 00 00 00 00 00 00
-+B: 01 00 00 00 00 00 00 00 00
-+B: 01 00 00 00 00 00 00 00 00
-+B: 02 03 01 00 00 00 00 00 00
-+B: 03 00 00 00 00 00 00 00 00
-+B: 04 10 00 00 00 00 00 00 00
-+B: 05 00 00 00 00 00 00 00 00
-+B: 11 00 00 00 00 00 00 00 00
-+B: 12 00 00 00 00 00 00 00 00
-+B: 15 00 00 00 00 00 00 00 00
-+B: 15 00 00 00 00 00 00 00 00
diff --git a/xorg-gtest.spec b/xorg-gtest.spec
index 077653a..00d446a 100644
--- a/xorg-gtest.spec
+++ b/xorg-gtest.spec
@@ -1,14 +1,13 @@
Summary: X.Org GTest testing environment for Google Test
Summary(pl.UTF-8): Środowisko testowe X.Org GTest dla szkieletu Google Test
Name: xorg-gtest
-Version: 0.6.0
+Version: 0.7.0
Release: 1
License: MIT
Group: X11/Libraries
Source0: http://xorg.freedesktop.org/releases/individual/test/%{name}-%{version}.tar.bz2
-# Source0-md5: 03840e2f77da5b7f44e99f6ebd8c310c
+# Source0-md5: c42a25bb8f10816cd283689f7d66460e
Patch0: %{name}-noserver.patch
-Patch1: %{name}-missing.patch
URL: http://xorg.freedesktop.org/
BuildRequires: autoconf >= 2.60
BuildRequires: automake
@@ -36,7 +35,6 @@ zatrzymywania serwera X do celów testowych.
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
%build
%{__aclocal}
@@ -53,7 +51,7 @@ rm -rf $RPM_BUILD_ROOT
DESTDIR=$RPM_BUILD_ROOT
# this belongs to system gtest
-%{__rm} $RPM_BUILD_ROOT%{_includedir}/gtest/gtest.h
+%{__rm} $RPM_BUILD_ROOT%{_includedir}/gtest/{gtest,gtest-spi}.h
%clean
rm -rf $RPM_BUILD_ROOT