Merge pull request #6507 from lonwillett/gajim-fix-plugin-installer

gajim: fix plugin installer
This commit is contained in:
Enno Boland 2017-05-27 09:05:07 +02:00 committed by GitHub
commit d14272bdd8
2 changed files with 24 additions and 2 deletions

View File

@ -0,0 +1,22 @@
--- plugins/Makefile.am.orig 2017-02-01 14:16:03.000000000 +0100
+++ plugins/Makefile.am 2017-05-22 17:25:16.121616663 +0200
@@ -7,7 +7,7 @@
pluginsdirs = ${sort ${dir ${wildcard ${srcdir}/*/ ${srcdir}/*/*/}}}
-pluginsfiles = $(wildcard ${p}/*.py ${p}/manifest.ini ${p}/*.ui ${p}/*.png)
+pluginsfiles = $(wildcard ${p}/*.py ${p}/manifest.ini ${p}/*.pem ${p}/*.ui ${p}/*.png)
nobase_gajimplugins_DATA = $(foreach p, ${pluginsdirs}, $(pluginsfiles))
--- plugins/Makefile.in.orig 2017-03-05 22:58:32.000000000 +0100
+++ plugins/Makefile.in 2017-05-22 17:40:36.897800490 +0200
@@ -316,7 +316,7 @@
gajimpluginsdir = $(gajim_pluginsdir)
dist_gajimplugins_PYTHON =
pluginsdirs = ${sort ${dir ${wildcard ${srcdir}/*/ ${srcdir}/*/*/}}}
-pluginsfiles = $(wildcard ${p}/*.py ${p}/manifest.ini ${p}/*.ui ${p}/*.png)
+pluginsfiles = $(wildcard ${p}/*.py ${p}/manifest.ini ${p}/*.pem ${p}/*.ui ${p}/*.png)
nobase_gajimplugins_DATA = $(foreach p, ${pluginsdirs}, $(pluginsfiles))
MAINTAINERCLEANFILES = Makefile.in
all: all-am

View File

@ -1,12 +1,12 @@
# Template file for 'gajim'
pkgname=gajim
version=0.16.7
revision=2
revision=3
noarch=yes
build_style=gnu-configure
configure_args="--enable-site-packages PYTHON=python2"
hostmakedepends="intltool python"
makedepends="python-dbus pygtk-devel python-openssl python-sqlite python-nbxmpp"
makedepends="python-dbus pygtk-devel python-openssl python-sqlite python-nbxmpp python-pyasn1"
depends="${makedepends/-devel/}"
pycompile_module="gajim"
short_desc="Full featured Jabber/XMPP client"