[xautomation/f15] Fix conflict

[Mohamed ElMorabity]

commit 57ca796c7c2ba0c873fcdd9db99caf0070c91b22
Author: Mohamed El Morabity <melmorabity at fedoraproject.org>
Date:   Sun Apr 22 23:11:46 2012 +0200

    Fix conflict

 .gitignore                 |    1 +
 sources                    |    2 +-
 xautomation-1.03-DSO.patch |   12 ------------
 xautomation.spec           |   16 +++++-----------
 4 files changed, 7 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b0228c3..94809dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 xautomation-1.03.tar.gz
 /xautomation-1.04.tar.gz
 /xautomation-1.05.tar.gz
+/xautomation-1.06.tar.gz
diff --git a/sources b/sources
index 99c489a..52ed83f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4526ea5085a680a3ae8629af1731e5fa  xautomation-1.05.tar.gz
+89cb18c15c0c177ce044c9d566a7ddfe  xautomation-1.06.tar.gz
diff --git a/xautomation.spec b/xautomation.spec
index 0e51397..8c19f5b 100644
--- a/xautomation.spec
+++ b/xautomation.spec
@@ -1,5 +1,5 @@
 Name:           xautomation
-Version:        1.05
+Version:        1.06
 Release:        1%{?dist}
 Summary:        Tools to automate tasks in X, even detecting on screen images
 
@@ -7,9 +7,6 @@ Group:          User Interface/X
 License:        GPLv2+
 URL:            http://hoopajoo.net/projects/xautomation.html
 Source0:        http://hoopajoo.net/static/projects/%{name}-%{version}.tar.gz
-# Fix DSO linking
-Patch0:         xautomation-1.03-DSO.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libpng-devel
 BuildRequires:  libXtst-devel
@@ -26,7 +23,6 @@ find buttons, etc, on the screen to click on.
 
 %prep
 %setup -q
-%patch0 -p1 -b .DSO
 
 
 %build
@@ -35,16 +31,10 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files
-%defattr(-,root,root,-)
 %doc AUTHORS COPYING README
 %{_bindir}/pat2ppm
 %{_bindir}/patextract
@@ -58,6 +48,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Apr 22 2012 Mohamed El Morabity <melmorabity at fedoraproject.org> - 1.06-1
+- Update to 1.06
+- Spec cleanup
+
 * Thu Sep 15 2011 Mohamed El Morabity <melmorabity at fedoraproject.org> - 1.05-1
 - Update to 1.05