[oe-commits] Martin Jansa : qwo: add patch for build with automake-1.11

[git version control]

Module: openembedded.git
Branch: shr/testing2010
Commit: 8c794730225965c0a9e380e0a7867b316d0315b4
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=8c794730225965c0a9e380e0a7867b316d0315b4

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Thu Apr 22 15:37:12 2010 +0200

qwo: add patch for build with automake-1.11

* qwo.1 is created in created in DESTDIR already with help2man, no need
  to add it to DEST files
* automake-1.11 checks for files instaled more than once and fails

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 recipes/qwo/qwo-0.5/qwo.automake-1.11.patch |   12 ++++++++++++
 recipes/qwo/qwo_0.5.bb                      |    4 +++-
 2 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/recipes/qwo/qwo-0.5/qwo.automake-1.11.patch b/recipes/qwo/qwo-0.5/qwo.automake-1.11.patch
new file mode 100644
index 0000000..5a54f1e
--- /dev/null
+++ b/recipes/qwo/qwo-0.5/qwo.automake-1.11.patch
@@ -0,0 +1,12 @@
+diff -uNr qwo-0.5.orig//data/Makefile.am qwo-0.5/data/Makefile.am
+--- qwo-0.5.orig//data/Makefile.am	2009-05-28 20:05:43.000000000 +0200
++++ qwo-0.5/data/Makefile.am	2010-04-22 15:33:59.000000000 +0200
+@@ -13,8 +13,6 @@
+ man_MANS = qwo.1
+ endif
+ 
+-dist_man_MANS = $(man_MANS)
+-
+ qwo.1:
+ 	help2man -n "An input method for touchscreen" -s 1 -N -o qwo.1\
+ 		$(top_builddir)/src/qwo
diff --git a/recipes/qwo/qwo_0.5.bb b/recipes/qwo/qwo_0.5.bb
index 69bd751..f8222be 100644
--- a/recipes/qwo/qwo_0.5.bb
+++ b/recipes/qwo/qwo_0.5.bb
@@ -6,8 +6,10 @@ PRIORITY = "optional"
 LICENSE = "GPLv2"
 DEPENDS = "libxtst libxext virtual/imlib2 libconfig"
 RDEPENDS += "imlib2-loaders"
+PR = "r1"
 
-SRC_URI = "http://download.savannah.nongnu.org/releases/qwo/qwo-${PV}.tar.gz "
+SRC_URI = "http://download.savannah.nongnu.org/releases/qwo/qwo-${PV}.tar.gz \
+           file://qwo.automake-1.11.patch;patch=1"
 
 inherit autotools