From 29ea03827a6d31764126a75e2981eab6f77b8105 Mon Sep 17 00:00:00 2001 From: Maurizio Porrato Date: Mon, 22 Dec 2014 20:37:56 +0000 Subject: [PATCH] janus-gateway: config install fixed upstream --- janus-gateway-git/PKGBUILD | 15 ++++----------- janus-gateway-git/install-conf.patch | 10 ---------- 2 files changed, 4 insertions(+), 21 deletions(-) delete mode 100644 janus-gateway-git/install-conf.patch diff --git a/janus-gateway-git/PKGBUILD b/janus-gateway-git/PKGBUILD index bdfe030..49eb186 100644 --- a/janus-gateway-git/PKGBUILD +++ b/janus-gateway-git/PKGBUILD @@ -1,8 +1,8 @@ # Maintainer: Maurizio Porrato pkgname=janus-gateway-git -pkgver=0.0.6.r87.g0881acc -pkgrel=2 +pkgver=0.0.6.r90.g591ef3e +pkgrel=1 pkgdesc="WebRTC gateway." arch=('i686' 'x86_64') url="http://janus.conf.meetecho.com/" @@ -13,10 +13,8 @@ provides=(janus-gateway) backup=('etc/janus/janus.cfg') install=janus-gateway-git.install -source=('git+https://github.com/meetecho/janus-gateway.git' - 'install-conf.patch') -md5sums=('SKIP' - '17955203b7d06f5c887638e621d7b3c1') +source=('git+https://github.com/meetecho/janus-gateway.git') +md5sums=('SKIP') _gitname="janus-gateway" pkgver() { @@ -24,11 +22,6 @@ pkgver() { git describe --long | sed -r 's/([^-]*-g)/r\1/;s/-/./g;s/^v//' } -prepare() { - cd "$srcdir/${_gitname}" - patch < "$startdir/install-conf.patch" -} - build() { cd "$srcdir/${_gitname}" ./autogen.sh diff --git a/janus-gateway-git/install-conf.patch b/janus-gateway-git/install-conf.patch deleted file mode 100644 index 677882d..0000000 --- a/janus-gateway-git/install-conf.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- Makefile.am.upstream 2014-12-21 12:31:15.401000516 +0000 -+++ Makefile.am 2014-12-21 12:34:24.689975050 +0000 -@@ -264,5 +264,5 @@ - ## - - configs: -- $(MKDIR_P) $(confdir) -- $(foreach config,$(conf_DATA),cp "$(CURDIR)/$(config)" "$(confdir)/$(notdir $(basename $(config) .sample))";) -+ $(MKDIR_P) $(DESTDIR)$(confdir) -+ $(foreach config,$(conf_DATA),cp "$(CURDIR)/$(config)" "$(DESTDIR)$(confdir)/$(notdir $(basename $(config) .sample))";)