upgpkg: xq 1.2.5-2HEADmain

3 files changed, 4 insertions, 11 deletions

diff --git a/xq/.SRCINFO b/xq/.SRCINFO
index 3a307a5..37ac4a7 100644
--- a/xq/.SRCINFO
+++ b/xq/.SRCINFO
@@ -1,11 +1,12 @@
 pkgbase = xq
         pkgdesc = Command-line XML and HTML beautifier and content extractor
         pkgver = 1.2.5
-        pkgrel = 1
+        pkgrel = 2
         url = https://github.com/sibprogrammer/xq
         arch = x86_64
         license = MIT
         makedepends = go
+        conflicts = yq
         source = xq-1.2.5.tar.gz::https://github.com/sibprogrammer/xq/archive/refs/tags/v1.2.5.tar.gz
         sha256sums = 9432a992d2f0ab82a7350da6317e27f835713c340177518dd08581bd0e918365
 
diff --git a/xq/PKGBUILD b/xq/PKGBUILD
index ed49aeb..5a4f12c 100644
--- a/xq/PKGBUILD
+++ b/xq/PKGBUILD
@@ -3,12 +3,13 @@
 
 pkgname=xq
 pkgver=1.2.5
-pkgrel=1
+pkgrel=2
 pkgdesc='Command-line XML and HTML beautifier and content extractor'
 arch=('x86_64')
 url='https://github.com/sibprogrammer/xq'
 license=('MIT')
 makedepends=('go')
+conflicts=('yq')
 source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/refs/tags/v${pkgver}.tar.gz")
 sha256sums=('9432a992d2f0ab82a7350da6317e27f835713c340177518dd08581bd0e918365')
 
diff --git a/xq/manpage-template.patch b/xq/manpage-template.patch
deleted file mode 100644
index 32b64cf..0000000
--- a/xq/manpage-template.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/docs/xq.man
-+++ b/docs/xq.man
-@@ -1,5 +1,5 @@
- .\" Manpage for xq utility
--.TH XQ 1 "06 Nov 2022" "" "xq man page"
-+.TH XQ 1 "@DATE@" "@VERSION@" "xq man page"
- .SH NAME
- xq - command-line XML and HTML beautifier and content extractor
- .SH SYNOPSIS