From e21163ce9f5b34273335903df4045b201195b8fe Mon Sep 17 00:00:00 2001
From: Sven Lankes <slankes@fedoraproject.org>
Date: Jun 11 2010 16:08:18 +0000
Subject: - new upstream release

- add patch from Bruce Jerrick to not segfault when called with unknown
    command (bz #602946)

---

diff --git a/.cvsignore b/.cvsignore
index 881abe0..aaab5df 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-xdotool-1.20100318.2737.tar.gz
+xdotool-2.20100602.2915.tar.gz
diff --git a/sources b/sources
index d35c617..e0353aa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5acdbc269d87928786ee63cff9060256  xdotool-1.20100318.2737.tar.gz
+feea60df4e5731e5a2607860d3a2727f  xdotool-2.20100602.2915.tar.gz
diff --git a/xdotool-makefile.patch b/xdotool-makefile.patch
deleted file mode 100644
index e95e101..0000000
--- a/xdotool-makefile.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- Makefile.orig	2010-02-06 02:17:45.428793838 +0100
-+++ Makefile	2010-02-06 02:19:28.420793962 +0100
-@@ -29,17 +29,20 @@
- install: installlib installprog installman installheader
- 
- installprog: xdotool
-+	[ -d $(INSTALLBIN) ] || mkdir -p $(INSTALLBIN)
- 	install -m 755 xdotool $(INSTALLBIN)/
- 
- installlib: libxdo.so
-+	[ -d $(INSTALLLIB) ] || mkdir -p $(INSTALLLIB)
- 	install libxdo.so $(INSTALLLIB)/libxdo.so.$(MAJOR)
- 	ln -sf libxdo.so.$(MAJOR) $(INSTALLLIB)/libxdo.so
- 
- installheader: xdo.h
-+	[ -d $(INSTALLINCLUDE) ] || mkdir -p $(INSTALLINCLUDE)
- 	install xdo.h $(INSTALLINCLUDE)/xdo.h
- 
- installman: xdotool.1
--	[ -d $(INSTALLMAN) ] || mkdir $(INSTALLMAN)
-+	[ -d $(INSTALLMAN) ] || mkdir -p $(INSTALLMAN)
- 	[ -d $(INSTALLMAN)/man1 ] || mkdir $(INSTALLMAN)/man1
- 	install -m 644 xdotool.1 $(INSTALLMAN)/man1/
- 
diff --git a/xdotool.spec b/xdotool.spec
index 97fb87e..3d9d53e 100644
--- a/xdotool.spec
+++ b/xdotool.spec
@@ -1,5 +1,5 @@
 Name:           xdotool
-Version:        1.20100318.2737
+Version:        2.20100602.2915
 Epoch:          1
 Release:        1%{?dist}
 Summary:        Fake keyboard/mouse input
@@ -7,6 +7,7 @@ Group:          User Interface/X
 License:        BSD
 URL:            http://www.semicomplete.com/projects/xdotool/
 Source0:        http://semicomplete.googlecode.com/files/%{name}-%{version}.tar.gz
+Patch0:         xdotool-prog-segfault.patch
 
 BuildRequires:  libXtst-devel, libX11-devel
 
@@ -32,6 +33,7 @@ developing applications that use libxdo
 
 %prep
 %setup -q
+%patch0
 
 %build
 export WARNFLAGS="$RPM_OPT_FLAGS"
@@ -69,6 +71,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc examples
 
 %changelog
+* Sun Mar 28 2010 Sven Lankes <sven@lank.es> - 1:2.20100602.2915-1
+- new upstream release
+- add patch from Bruce Jerrick to not segfault when called with unknown command (bz #602946)
+
 * Sun Mar 28 2010 Sven Lankes <sven@lank.es> - 1:1.20100318.2737-1
 - new upstream release