summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorStanislav Seletskiy2016-09-19 12:42:25 +0700
committerStanislav Seletskiy2016-09-19 12:42:25 +0700
commitb98ee4807b4b908e092bb05e2bf8a918603bcaf5 (patch)
treecba9863d9bfef120c05d31384510a08f1c3bd235
parentfb0a1783b5ae4823cdb1e13b1135f2df56dcbd1d (diff)
downloadaur-rxvt-unicode-nobuiltins.tar.gz
squash packages into one
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD13
2 files changed, 7 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 14aa1aa41da..16906b481d4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Mon Sep 19 05:25:46 UTC 2016
+# Mon Sep 19 05:42:19 UTC 2016
pkgbase = rxvt-unicode-nobuiltins
pkgver = 9.22
pkgrel = 2
@@ -12,17 +12,14 @@ pkgbase = rxvt-unicode-nobuiltins
makedepends = startup-notification
provides = rxvt-unicode
conflicts = rxvt-unicode
+ conflicts = rxvt-unicode-terminfo
source = http://dist.schmorp.de/rxvt-unicode/rxvt-unicode-9.22.tar.bz2
md5sums = 93782dec27494eb079467dacf6e48185
pkgname = rxvt-unicode-nobuiltins
pkgdesc = A unicode enabled rxvt-clone terminal emulator (urxvt)
- depends = rxvt-unicode-nobuiltins-terminfo
depends = libxft
depends = perl
depends = startup-notification
optdepends = gtk2-perl: to use the urxvt-tabbed
-pkgname = rxvt-unicode-nobuiltins-terminfo
- pkgdesc = Terminfo files for urxvt
-
diff --git a/PKGBUILD b/PKGBUILD
index 10d85d2892a..27aac3e4948 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,14 +6,14 @@
_pkgbase=rxvt-unicode
pkgbase=${_pkgbase}-nobuiltins
-pkgname=('rxvt-unicode-nobuiltins' 'rxvt-unicode-nobuiltins-terminfo')
+pkgname=('rxvt-unicode-nobuiltins')
provides=('rxvt-unicode')
pkgver=9.22
pkgrel=2
arch=('i686' 'x86_64')
url='http://software.schmorp.de/pkg/rxvt-unicode.html'
license=('GPL')
-conflicts=(rxvt-unicode)
+conflicts=(rxvt-unicode rxvt-unicode-terminfo)
makedepends=('libxft' 'perl' 'startup-notification')
source=(
"http://dist.schmorp.de/rxvt-unicode/$_pkgbase-$pkgver.tar.bz2"
@@ -57,24 +57,21 @@ build() {
package_rxvt-unicode-nobuiltins() {
pkgdesc='A unicode enabled rxvt-clone terminal emulator (urxvt)'
- depends=('rxvt-unicode-nobuiltins-terminfo' 'libxft' 'perl' 'startup-notification')
+ depends=('libxft' 'perl' 'startup-notification')
optdepends=('gtk2-perl: to use the urxvt-tabbed')
cd $_pkgbase-$pkgver
# workaround terminfo installation
export TERMINFO="$srcdir/terminfo"
install -d "$TERMINFO"
+
make DESTDIR="$pkgdir" install
# install the tabbing wrapper ( requires gtk2-perl! )
sed -i 's/\"rxvt\"/"urxvt"/' doc/rxvt-tabbed
install -Dm 755 doc/rxvt-tabbed "$pkgdir/usr/bin/urxvt-tabbed"
-}
-package_rxvt-unicode-nobuiltins-terminfo() {
- pkgdesc='Terminfo files for urxvt'
- conflict=('rxvt-unicode<=9.18-6')
install -dm 755 "$pkgdir/usr/share/"
- mv terminfo "$pkgdir/usr/share/"
+ mv ../terminfo "$pkgdir/usr/share/"
}
# vim:set ts=2 sw=2 et: