diff --git a/.SRCINFO b/.SRCINFO index fa9e7710a435..6b9d154a84c5 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = flexget pkgdesc = FlexGet is a program aimed to automate downloading or processing content (torrents, podcasts, etc.) from different sources like RSS-feeds, html-pages, various sites and more. pkgver = 3.13.1 - pkgrel = 1 + pkgrel = 2 url = https://github.com/Flexget/Flexget arch = any license = MIT @@ -68,8 +68,10 @@ pkgbase = flexget depends = python-setuptools depends = python-sgmllib3k depends = python-six + depends = python-socksio depends = python-soupsieve depends = python-sqlalchemy + depends = python-telegram-bot depends = python-tempora depends = python-typing_extensions depends = python-tzdata @@ -80,8 +82,12 @@ pkgbase = flexget depends = python-zc.lockfile depends = python-zstandard depends = python-zxcvbn - optdepends = flexget-webui: webui v2 optdepends = flexget-webui-v1: webui v1 + optdepends = flexget-webui: webui v2 + optdepends = python-cloudscraper + optdepends = python-deluge-client + optdepends = python-qbittorrent-api + optdepends = python-transmission-rpc options = !strip source = flexget-3.13.1.tar.gz::https://github.com/Flexget/Flexget/archive/v3.13.1.tar.gz source = flexget.service diff --git a/PKGBUILD b/PKGBUILD index 12661ed3669d..0a536d51d25b 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -10,7 +10,7 @@ _pkgname=Flexget pkgname=${_pkgname,,} pkgver=3.13.1 -pkgrel=1 +pkgrel=2 pkgdesc="FlexGet is a program aimed to automate downloading or processing content (torrents, podcasts, etc.) from different sources like RSS-feeds, html-pages, various sites and more." arch=(any) url="https://github.com/${_pkgname}/${_pkgname}" @@ -76,8 +76,10 @@ depends=( "python-setuptools" "python-sgmllib3k" "python-six" + "python-socksio" "python-soupsieve" "python-sqlalchemy" + "python-telegram-bot" "python-tempora" "python-typing_extensions" "python-tzdata" @@ -90,8 +92,14 @@ depends=( "python-zxcvbn" ) makedepends=('python-build' 'python-installer' 'python-setuptools' 'python-wheel') -optdepends=('flexget-webui: webui v2' - 'flexget-webui-v1: webui v1') +optdepends=( + "flexget-webui-v1: webui v1" + "flexget-webui: webui v2" + "python-cloudscraper" + "python-deluge-client" + "python-qbittorrent-api" + "python-transmission-rpc" +) source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz" "${pkgname}.service" "${pkgname}@.service" diff --git a/geninfo.sh b/geninfo.sh index 3a9d451ae66c..dc0111b86c7a 100755 --- a/geninfo.sh +++ b/geninfo.sh @@ -8,7 +8,7 @@ pkgver=$(awk -F= '/pkgver=/{print $2}' PKGBUILD) pytoml="src/${_pipname}-${pkgver}/pyproject.toml" pyreq="src/${_pipname}-${pkgver}/requirements.txt" -trap "rm depends.txt" EXIT +trap "rm depends.txt optdepends.txt" EXIT makepkg -do pkgdesc=$(yq eval -o=json "$pytoml" | jq -r '.project.description') depends=$(./geninfo.py "$pyreq" | @@ -22,15 +22,35 @@ depends=$(./geninfo.py "$pyreq" | sed 's|python-jinja2|python-jinja|' | sed 's|python-typing-|python-typing_|' | sed 's|python-zc-lockfile|python-zc.lockfile|' | + sed '$a python-telegram-bot' | + sed '$a python-socksio' | sort -u | sed 's|^| \"|' | sed 's|$|\"|' ) echo -e "${depends}\n)" > depends.txt +optdepends=$(yq eval -o=json "$pytoml" | + jq '.tool.poetry.group.docker.dependencies | keys' | + jq -r '.[]' | + tr 'A-Z' 'a-z' | + sed 's|^|python-|' | + sed 's|python-python-|python-|' | + sed '/^python-python$/d' | + sed '/python-telegram-bot/d' | + sed 's|^|\"|g' | + sed 's|$|\"|g' | + sed '$a "flexget-webui: webui v2"' | + sed '$a "flexget-webui-v1: webui v1"' | + sed 's|^| |g' | + sort -u +) +echo -e "${optdepends}\n)" > optdepends.txt sed -e "s|^pkgdesc=.*|pkgdesc=\"$pkgdesc\"|" \ -e "/^depends=(/,/)/c\depends=(" \ + -e "/^optdepends=(/,/)/c\optdepends=(" \ -i PKGBUILD sed -e "/^depends=/r depends.txt" \ + -e "/^optdepends=/r optdepends.txt" \ -i PKGBUILD