[packages/input-pad: 2/2] Merge branch 'master' of git://git.pld-linux.org/packages/input-pad

[qboosh]

commit 0c7d457400a57b819b250aaabc4f9937927d4506
Merge: 1918cf5 6033674
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue Nov 20 20:43:05 2012 +0100

    Merge branch 'master' of git://git.pld-linux.org/packages/input-pad
    
    Conflicts:
    	input-pad.spec

 input-pad-format-security.patch | 11 +++++++++++
 input-pad.spec                  |  2 ++
 2 files changed, 13 insertions(+)
---
diff --cc input-pad.spec
index 96fd943,5520e8a..95faef9
--- a/input-pad.spec
+++ b/input-pad.spec
@@@ -1,31 -1,22 +1,32 @@@
  Summary:	On-screen Input Pad to Send Characters with Mouse
 +Summary(pl.UTF-8):	Pole wprowadzania znaków na ekranie przy użyciu myszy
  Name:		input-pad
 -Version:	1.0.1
 -Release:	6
 +Version:	1.0.2
 +Release:	1
  License:	LGPL v2+
  Group:		Libraries
 +#Source0Download: http://code.google.com/p/input-pad/downloads/list
  Source0:	http://input-pad.googlecode.com/files/%{name}-%{version}.tar.gz
 -# Source0-md5:	320461990a87fc31fd504c438fe9707a
 +# Source0-md5:	cfb03c042e699858d80e7c95efbc2092
+ Patch0:		%{name}-format-security.patch
  URL:		http://code.google.com/p/input-pad/
 -BuildRequires:	eekboard-devel
 -BuildRequires:	gtk+3-devel
 +BuildRequires:	eekboard-devel >= 1.0.6
 +BuildRequires:	glib2-devel >= 1:2.8
 +BuildRequires:	gobject-introspection-devel >= 0.6.8
 +BuildRequires:	gtk+3-devel >= 3.0
 +BuildRequires:	intltool >= 0.35.0
  BuildRequires:	libxklavier-devel >= 4.0
 -BuildRequires:	libxml2-devel
 +BuildRequires:	libxml2-devel >= 2.0
  BuildRequires:	pkgconfig
 -BuildRequires:	python-devel
 +BuildRequires:	python-devel >= 1:2.5
  BuildRequires:	swig-python
 +BuildRequires:	xorg-lib-libX11-devel
  BuildRequires:	xorg-lib-libXtst-devel
  BuildRequires:	xorg-lib-libxkbfile-devel
 +Requires:	glib2 >= 1:2.8
 +Requires:	gtk+3 >= 3.0
 +Requires:	libxklavier-devel >= 4.0
 +Requires:	libxml2-devel >= 2.0
  BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
  
  %description
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/input-pad.git/commitdiff/0c7d457400a57b819b250aaabc4f9937927d4506