spec cleanup and removed patchessubmit/trunk/20130325.083934submit/trunk/20121116.014734submit/tizen/20130517.024428submit/tizen/20130509.185017submit/tizen/20130503.233738accepted/trunk/20130325.213717accepted/tizen/20130520.094538accepted/tizen/20130503.231620

4 files changed, 0 insertions, 87 deletions

diff --git a/packaging/xf86-input-synaptics-default-tap.diff b/packaging/xf86-input-synaptics-default-tap.diff
deleted file mode 100644
index 169bae8..0000000
--- a/packaging/xf86-input-synaptics-default-tap.diff
+++ /dev/null
@@ -1,17 +0,0 @@
----
- conf/50-synaptics.conf |    4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/conf/50-synaptics.conf
-+++ b/conf/50-synaptics.conf
-@@ -16,6 +16,10 @@ Section "InputClass"
- # http://who-t.blogspot.com/2010/11/how-to-ignore-configuration-errors.html
-         MatchDevicePath "/dev/input/event*"
-         Option	"HorizScrollDelta"	"0"
-+# enable tap-to-click as default (bnc#722457)
-+	Option "TapButton1" "1"
-+	Option "TapButton1" "2"
-+	Option "TapButton1" "3"
- EndSection
- 
- Section "InputClass"
diff --git a/packaging/xf86-input-synaptics-wait.diff b/packaging/xf86-input-synaptics-wait.diff
deleted file mode 100644
index 7e43d2f..0000000
--- a/packaging/xf86-input-synaptics-wait.diff
+++ /dev/null
@@ -1,48 +0,0 @@
----
- src/eventcomm.c |   14 ++++++++++++--
- 1 file changed, 12 insertions(+), 2 deletions(-)
-
---- a/src/eventcomm.c
-+++ b/src/eventcomm.c
-@@ -516,6 +516,8 @@
-     int i;
-     Bool touchpad_found = FALSE;
-     struct dirent **namelist;
-+    int wait = 0;
-+    const int max_wait = 2000;
- 
-     if (device) {
-         int fd = -1;
-@@ -533,6 +535,7 @@
-         }
-     }
- 
-+    while (wait <= max_wait && !touchpad_found) {
-     i = scandir(DEV_INPUT_EVENT, &namelist, EventDevOnly, alphasort);
-     if (i < 0) {
-         xf86IDrvMsg(pInfo, X_ERROR, "Couldn't open %s\n", DEV_INPUT_EVENT);
-@@ -556,8 +559,8 @@
- 
-             if (event_query_is_touchpad(fd, TRUE)) {
-                 touchpad_found = TRUE;
--                xf86IDrvMsg(pInfo, X_PROBED, "auto-dev sets device to %s\n",
--                            fname);
-+                xf86IDrvMsg(pInfo, X_PROBED, "auto-dev sets device to %s (waited %d msec)\n",
-+                            fname, wait);
-                 pInfo->options =
-                     xf86ReplaceStrOption(pInfo->options, "Device", fname);
-             }
-@@ -565,6 +568,13 @@
-         }
-         free(namelist[i]);
-     }
-+    if (!touchpad_found) {
-+        xf86IDrvMsg(pInfo, X_ERROR, "waiting 100 msec to become devices ready\n");
-+        usleep(100*1000);
-+        wait += 100;
-+        xf86IDrvMsg(pInfo, X_ERROR, "aiting time total: %d\n", wait);
-+    }
-+    } /* while (wait <= max_wait && !touchpad_found) */
- 
-     free(namelist);
- 
diff --git a/packaging/xf86-input-synaptics-xorg.conf.d_snippet.diff b/packaging/xf86-input-synaptics-xorg.conf.d_snippet.diff
deleted file mode 100644
index 424e7ac..0000000
--- a/packaging/xf86-input-synaptics-xorg.conf.d_snippet.diff
+++ /dev/null
@@ -1,16 +0,0 @@
----
- conf/50-synaptics.conf |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/conf/50-synaptics.conf
-+++ b/conf/50-synaptics.conf
-@@ -14,7 +14,8 @@
- # This option is recommend on all Linux systems using evdev, but cannot be
- # enabled by default. See the following link for details:
- # http://who-t.blogspot.com/2010/11/how-to-ignore-configuration-errors.html
--#       MatchDevicePath "/dev/input/event*"
-+        MatchDevicePath "/dev/input/event*"
-+        Option	"HorizScrollDelta"	"0"
- EndSection
- 
- Section "InputClass"
diff --git a/packaging/xf86-input-synaptics.spec b/packaging/xf86-input-synaptics.spec
index 99a09ef..cee7762 100644
--- a/packaging/xf86-input-synaptics.spec
+++ b/packaging/xf86-input-synaptics.spec
@@ -6,9 +6,6 @@ Summary:        Synaptics touchpad input driver for the Xorg X server
 Url:            http://xorg.freedesktop.org/
 Group:          System/X11/Servers/XF86_4
 Source0:        http://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.tar.bz2
-Patch0:         xf86-input-synaptics-wait.diff
-Patch2:         xf86-input-synaptics-xorg.conf.d_snippet.diff
-Patch5:         xf86-input-synaptics-default-tap.diff
 BuildRequires:  autoconf >= 2.60
 BuildRequires:  automake
 BuildRequires:  libtool
@@ -47,9 +44,6 @@ become available.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch2 -p1
-%patch5 -p1
 
 %build
 autoreconf -fi