commit d7bafe6af046fce26fba1e3d8e07f37cc1dab0f4
Author: Jan Rękorajski <[email protected]>
Date: Sun Dec 28 18:31:51 2014 +0100
- updated gettext BR
ibus-xkb.spec | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
---
diff --git a/ibus-xkb.spec b/ibus-xkb.spec
index 02e59df..1648a41 100644
--- a/ibus-xkb.spec
+++ b/ibus-xkb.spec
@@ -13,19 +13,27 @@ Release: 1
License: LGPL v2+
Group: Libraries
#Source0Download: http://code.google.com/p/ibus/downloads/list
+<<<<<<< Updated upstream
Source0:
https://github.com/ibus/ibus-xkb/archive/%{version}/%{name}-%{version}.tar.gz
# Source0-md5: c0bc5be7f0c068bea1e4785c5b60694b
Patch0: %{name}-vala.patch
Patch1: %{name}-am.patch
URL: https://github.com/ibus/ibus-xkb/
+=======
+Source0:
https://github.com/fujiwarat/ibus-xkb/archive/%{version}.tar.gz?/%{name}-%{version}.tar.gz
+# Source0-md5: c0bc5be7f0c068bea1e4785c5b60694b
+URL: http://code.google.com/p/ibus/
+>>>>>>> Stashed changes
%{?with_gconf:BuildRequires: GConf2-devel >= 2.12}
+BuildRequires: autoconf
+BuildRequires: automake
%{?with_gnomekbd:BuildRequires: atk-devel}
BuildRequires: autoconf >= 2.62
BuildRequires: automake >= 1:1.10
# dbus-launch used in dconf configuration generation
%{?with_dconf:BuildRequires: dbus-x11}
%{?with_dconf:BuildRequires: dconf-devel >= 0.7.5}
-BuildRequires: gettext-devel
+BuildRequires: gettext-tools
BuildRequires: glib2-devel >= 1:2.26.0
BuildRequires: gobject-introspection-devel >= 0.6.8
BuildRequires: gtk+3-devel >= 3.0
@@ -112,8 +120,13 @@ API języka Vala dla biblioteki ibus-xkb.
%patch1 -p1
%build
+<<<<<<< Updated upstream
%{__libtoolize}
%{__intltoolize}
+=======
+%{__intltoolize}
+%{__libtoolize}
+>>>>>>> Stashed changes
%{__aclocal}
%{__autoconf}
%{__autoheader}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ibus-xkb.git/commitdiff/d7bafe6af046fce26fba1e3d8e07f37cc1dab0f4
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
