[arch-commits] Commit in python-pyroute2/trunk (PKGBUILD fix_makefile.patch)

[Thore Bödecker]

    Date: Thursday, June 9, 2022 @ 14:27:20
  Author: foxxx0
Revision: 1229675

upgpkg: python-pyroute2 0.6.11-1: update to upstream release 0.6.11

Modified:
  python-pyroute2/trunk/PKGBUILD
  python-pyroute2/trunk/fix_makefile.patch

--------------------+
 PKGBUILD           |    6 +++---
 fix_makefile.patch |   49 ++++++++++++++++++++++++++-----------------------
 2 files changed, 29 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-06-09 14:18:43 UTC (rev 1229674)
+++ PKGBUILD	2022-06-09 14:27:20 UTC (rev 1229675)
@@ -6,7 +6,7 @@
 _pkgbase="${pkgbase//python-/}"
 pkgname=("python-${_pkgbase}")
 pkgdesc="A pure Python netlink and Linux network configuration library"
-pkgver=0.6.9
+pkgver=0.6.11
 pkgrel=1
 arch=('any')
 url="https://docs.pyroute2.org/"
@@ -16,8 +16,8 @@
 checkdepends=('python-pytest')
 source=("${_pkgbase}-${pkgver}.tar.gz::https://github.com/svinota/${_pkgbase}/archive/${pkgver}.tar.gz"
         'fix_makefile.patch')
-sha512sums=('4de8b8dc897959e2dc367dec460a918ace6cc096c2f634433b39d1600bafa4ca6841f54280d581f6331bf2b9776cac75e721afa2bbabbd329cc0a12b34e91fe8'
-            '05742f086de35b382aa97ac5e0bce0fd5bb2454f85d60c230a474700859af33806f45001ff7a072b71995494d747333a7f22761f5859bbf06fef59ccd81f86a9')
+sha512sums=('cc7a46d9738d048dc9008780e03ca24710f3ea395572057b17252fc5d0b71ab47cf3c053b249ee3d8626c1589d98e17e6513fd2d2ec266ef5f8ca31e2017bd51'
+            '1a8b2a9533d5afc8af77ee112a42134b91f3d575d7db3774b02e10c6f66133907b52485b0dd9d82bf983046a713f574dcf54445945f8e58b2c387b2e547895e0')
 
 prepare() {
   cd "${srcdir}/${_pkgbase}-${pkgver}"

Modified: fix_makefile.patch
===================================================================
--- fix_makefile.patch	2022-06-09 14:18:43 UTC (rev 1229674)
+++ fix_makefile.patch	2022-06-09 14:27:20 UTC (rev 1229675)
@@ -1,37 +1,40 @@
-Only in a: dist
 diff -upr a/Makefile b/Makefile
---- a/Makefile	2022-03-21 09:45:51.000000000 +0100
-+++ b/Makefile	2022-03-30 16:15:10.079243904 +0200
-@@ -44,7 +44,7 @@ ifdef lib
- endif
-
+--- 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
-@@ -57,7 +57,7 @@ endef
-
+@@ -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 `find templates -maxdepth 1 -mindepth 1 -type f -printf '%f\n'`; 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; \
-@@ -71,7 +71,7 @@ endef
+@@ -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 `find templates -maxdepth 1 -mindepth 1 -type f -printf '%f\n'`; do \
++			for template in $(call list_templates); do \
  				${python} \
  					util/process_template.py \
  					templates/$$template \
-@@ -207,6 +207,8 @@ upload: dist
- 	${python} -m twine upload dist/*
-
+@@ -199,6 +203,8 @@ upload: dist
+ 
+ .PHONY: setup
  setup:
 +	$(MAKE) clean
 +	$(MAKE) VERSION
@@ -38,21 +41,21 @@
  	$(call process_templates)
  	@for module in $(call list_modules); do $(call deploy_license); done
  	@for module in pyroute2 pyroute2.minimal; do \
-@@ -217,7 +219,7 @@ setup:
- 			$$module/setup.cfg ; \
+@@ -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)
-@@ -231,7 +233,7 @@ install: dist
- install-minimal: 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)
-
- audit-imports:
+ 
+ .PHONY: audit-imports