[packages/ibus-xkb] - updated download URL, git conflict cleanup

[qboosh]

commit bfbd3f52e5aa15285d494ff6ca65f64e5bf908df
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Apr 26 17:33:35 2020 +0200

    - updated download URL, git conflict cleanup

 ibus-xkb.spec | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)
---
diff --git a/ibus-xkb.spec b/ibus-xkb.spec
index 1648a41..e41253c 100644
--- a/ibus-xkb.spec
+++ b/ibus-xkb.spec
@@ -12,21 +12,13 @@ Version:	1.5.0.20140114
 Release:	1
 License:	LGPL v2+
 Group:		Libraries
-#Source0Download: http://code.google.com/p/ibus/downloads/list
-<<<<<<< Updated upstream
+#Source0Download: https://github.com/ibus/ibus-xkb/releases
 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
@@ -120,13 +112,8 @@ 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/bfbd3f52e5aa15285d494ff6ca65f64e5bf908df