summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorayekat2019-05-12 17:43:15 +0200
committerayekat2019-05-12 17:43:15 +0200
commit1a6792ea307ae0d772083fa3ec364abd63fe9d45 (patch)
treefcc8fccd5038b64b06b5daa399f7b38afef022da
parent11bafd718e1ecebb118233d6b80784883fdb2051 (diff)
downloadaur-1a6792ea307ae0d772083fa3ec364abd63fe9d45.tar.gz
0.7.7-2: Add conflict with makemetapkg
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD7
-rw-r--r--changelog3
3 files changed, 11 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 98b39bbe69c2..f6a4102931a1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = remakepkg
pkgdesc = Apply changes to pacman packages
pkgver = 0.7.7
- pkgrel = 1
+ pkgrel = 2
url = https://gitlab.com/ayekat/pacman-hacks
changelog = changelog
arch = any
@@ -10,6 +10,7 @@ pkgbase = remakepkg
makedepends = git
depends = coreutils
depends = sed
+ conflicts = makemetapkg
source = git+https://gitlab.com/ayekat/pacman-hacks.git#tag=v0.7.7
source = diffrepo.hook.example
sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index b225a0106d84..bc864d186d23 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,13 +2,18 @@
pkgname=remakepkg
pkgver=0.7.7
-pkgrel=1
+pkgrel=2
arch=(any)
pkgdesc='Apply changes to pacman packages'
url='https://gitlab.com/ayekat/pacman-hacks'
license=(GPL3)
+# Both are part of pacman-hacks. If you want both makemetapkg and remakepkg,
+# just install pacman-hacks:
+# https://gitlab.com/ayekat/PKGBUILDs/tree/pacman-hacks
+conflicts=(makemetapkg)
+
depends=(coreutils sed)
makedepends=(asciidoc git)
diff --git a/changelog b/changelog
index b76cdbd382d2..e74919b1dac4 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,6 @@
+v0.7.7-2 (2019-05-12)
+* Add conflict with makemetapkg
+
v0.7.7-1 (2019-05-06)
* Makefile: Fix targets dependency order for generating scripts/manpage/libs