From 4f1239afcda312d0c4bf5d8bde271d10b6b0702b Mon Sep 17 00:00:00 2001
From: terjeros <terjeros@fedoraproject.org>
Date: Apr 17 2010 18:52:11 +0000
Subject: - Add patch now upstream

- Require newer e16

---

diff --git a/e16-keyedit.spec b/e16-keyedit.spec
index 2b95713..c5d477f 100644
--- a/e16-keyedit.spec
+++ b/e16-keyedit.spec
@@ -3,16 +3,15 @@
 Summary:        GUI for editing keybindings in Enlightenment, DR16
 Name:           e16-keyedit
 Version:        0.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        MIT with advertising
 Group:          User Interface/Desktops
 URL:            http://www.enlightenment.org/
 Source0:        http://downloads.sourceforge.net/enlightenment/e16keyedit-%{version}.tar.gz
-Patch0:         e16keyedit-0.6-dso.patch
 BuildRequires:  gtk2-devel desktop-file-utils
 BuildRequires:  automake autoconf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:       e16 >= 0.16.8
+Requires:       e16 >= 1.0.1
 
 %description
 The e16-keyedit package provides a graphical interface for managing
@@ -20,12 +19,8 @@ keybindings in Enlightenment, DR16.
 
 %prep
 %setup -q -n %{oname}-%{version}
-%patch0 -p1
 
 %build
-aclocal
-automake
-autoconf
 %configure
 %{__make} %{?_smp_mflags}
 %{__cat} <<EOF > %{name}.desktop
@@ -56,6 +51,10 @@ desktop-file-install --vendor=fedora \
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Fri Apr 16 2010 Terje Rosten <terjeros@phys.ntnu.no> - 0.7-2
+- Add patch now upstream
+- Require newer e16
+
 * Fri Apr 16 2010 Terje Rosten <terjeros@phys.ntnu.no> - 0.7-1
 - 0.7
 
diff --git a/e16keyedit-0.6-dso.patch b/e16keyedit-0.6-dso.patch
deleted file mode 100644
index ab63240..0000000
--- a/e16keyedit-0.6-dso.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up e16keyedit-0.6/configure.ac~ e16keyedit-0.6/configure.ac
---- e16keyedit-0.6/configure.ac~	2009-05-15 18:44:26.000000000 +0200
-+++ e16keyedit-0.6/configure.ac	2010-02-14 19:46:49.010247074 +0100
-@@ -36,6 +36,10 @@ else
- 	fi
- fi
- 
-+PKG_CHECK_MODULES(X, x11)
-+CFLAGS="$CFLAGS $X_CFLAGS"
-+LIBS="$LIBS $X_LIBS"
-+
- AC_SUBST(ENABLE_GTK2)
- 
- dnl Checks for header files.