Date: Sunday, June 12, 2022 @ 10:14:09 Author: foxxx0 Revision: 1236939
upgpkg: python-pyroute2 0.6.12-1 | update to upstream release 0.6.12 my makefile patch was merged upstream in https://github.com/svinota/pyroute2/pull/925 Modified: python-pyroute2/trunk/PKGBUILD Deleted: python-pyroute2/trunk/fix_makefile.patch --------------------+ PKGBUILD | 13 ++-------- fix_makefile.patch | 61 --------------------------------------------------- 2 files changed, 3 insertions(+), 71 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-06-12 09:13:25 UTC (rev 1236938) +++ PKGBUILD 2022-06-12 10:14:09 UTC (rev 1236939) @@ -6,7 +6,7 @@ _pkgbase="${pkgbase//python-/}" pkgname=("python-${_pkgbase}") pkgdesc="A pure Python netlink and Linux network configuration library" -pkgver=0.6.11 +pkgver=0.6.12 pkgrel=1 arch=('any') url="https://docs.pyroute2.org/"; @@ -14,10 +14,8 @@ depends=('python') makedepends=('python' 'python-pip' 'python-setuptools' 'python-setuptools-scm' 'python-sphinx' 'git' 'python-aafigure' 'twine' 'python-black') checkdepends=('python-pytest') -source=("${_pkgbase}-${pkgver}.tar.gz::https://github.com/svinota/${_pkgbase}/archive/${pkgver}.tar.gz"; - 'fix_makefile.patch') -sha512sums=('cc7a46d9738d048dc9008780e03ca24710f3ea395572057b17252fc5d0b71ab47cf3c053b249ee3d8626c1589d98e17e6513fd2d2ec266ef5f8ca31e2017bd51' - '1a8b2a9533d5afc8af77ee112a42134b91f3d575d7db3774b02e10c6f66133907b52485b0dd9d82bf983046a713f574dcf54445945f8e58b2c387b2e547895e0') +source=("${_pkgbase}-${pkgver}.tar.gz::https://github.com/svinota/${_pkgbase}/archive/${pkgver}.tar.gz";) +sha512sums=('363e8db3afb67622748c48df1a801287b128db097ab38199dbd4acd479c612e0c01b2155c9ec07255f289b0cd7cc555eb6a15b4e09f77970daa5696dfdfdd99f') prepare() { cd "${srcdir}/${_pkgbase}-${pkgver}" @@ -25,11 +23,6 @@ # Update the version manually. Otherwise it would look for a git tag which is not present in the distribution. sed -i "s/version = get_project_version.*$/version = '${pkgver}'/" util/update_version.py sed -i "s/^VERSION=.*\$/VERSION='${pkgver}'/" tests/conf.sh - - # there is some weirdness in the Makefile with respect to depencies - # TODO : this needs to be submitted upstream - patch -p1 -N -i "${srcdir}/fix_makefile.patch" - } build() { Deleted: fix_makefile.patch =================================================================== --- fix_makefile.patch 2022-06-12 09:13:25 UTC (rev 1236938) +++ fix_makefile.patch 2022-06-12 10:14:09 UTC (rev 1236939) @@ -1,61 +0,0 @@ -diff -upr a/Makefile b/Makefile ---- a/Makefile 2022-06-06 18:33:00.000000000 +0200 -+++ b/Makefile 2022-06-09 16:25:01.340485977 +0200 -@@ -48,7 +48,11 @@ endif - # Functions - # - define list_modules -- `ls -1 | sed -n '/egg-info/n; /pyroute2/p'` -+ `find . -maxdepth 1 -mindepth 1 -type d -iname 'pyroute2*' -printf '%f\n'` -+endef -+ -+define list_templates -+ `find templates -maxdepth 1 -mindepth 1 -type f -printf '%f\n'` - endef - - define make_modules -@@ -61,7 +65,7 @@ endef - - define clean_module - if [ -f $$module/setup.json ]; then \ -- for i in `ls -1 templates`; do rm -f $$module/$$i; done; \ -+ for i in $(call list_templates); do rm -f $$module/$$i; done; \ - fi; \ - rm -f $$module/LICENSE.*; \ - rm -f $$module/README.license.md; \ -@@ -75,7 +79,7 @@ endef - define process_templates - for module in $(call list_modules); do \ - if [ -f $$module/setup.json ]; then \ -- for template in `ls -1 templates`; do \ -+ for template in $(call list_templates); do \ - ${python} \ - util/process_template.py \ - templates/$$template \ -@@ -199,6 +203,8 @@ upload: dist - - .PHONY: setup - setup: -+ $(MAKE) clean -+ $(MAKE) VERSION - $(call process_templates) - @for module in $(call list_modules); do $(call deploy_license); done - @for module in pyroute2 pyroute2.minimal; do \ -@@ -210,7 +216,7 @@ setup: - done - - .PHONY: dist --dist: clean VERSION setup -+dist: setup - cd pyroute2; ${python} setup.py sdist - mkdir dist - $(call make_modules, dist) -@@ -227,7 +233,7 @@ install-minimal: dist - ${python} -m pip install dist/pyroute2.minimal* dist/pyroute2.core* ${root} - - .PHONY: uninstall --uninstall: clean VERSION setup -+uninstall: setup - $(call make_modules, uninstall) - - .PHONY: audit-imports
