From 545cff8b630efc844bb60d9d0ca07ef65133f548 Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Wed, 3 Jul 2019 11:47:45 +0300 Subject: [PATCH] django-simple-captcha: update packaging format + add python3 variant This change also updates the maintainer email to cotequeiroz@gmail.com, as requested on a different change. Also, changing here is the download URL to github's codeload, since that one offers .tar.gz archives. Signed-off-by: Alexandru Ardelean --- lang/python/django-simple-captcha/Makefile | 57 +++++++++++++++++----- net/seafile-seahub/Makefile | 4 +- 2 files changed, 48 insertions(+), 13 deletions(-) diff --git a/lang/python/django-simple-captcha/Makefile b/lang/python/django-simple-captcha/Makefile index 96da70712a..81d94d9eef 100644 --- a/lang/python/django-simple-captcha/Makefile +++ b/lang/python/django-simple-captcha/Makefile @@ -9,34 +9,69 @@ include $(TOPDIR)/rules.mk PKG_NAME:=django-simple-captcha PKG_VERSION:=0.5.11 -PKG_RELEASE:=3 +PKG_RELEASE:=4 -PKG_MAINTAINER:=Eneas U de Queiroz +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=https://codeload.github.com/mbi/django-simple-captcha/tar.gz/v$(PKG_VERSION)? +PKG_HASH:=7ca26a4f48e14e5f8be022c0dc099ef98980f3fc99f403ca565ab1f3addaee5b + +PKG_MAINTAINER:=Eneas U de Queiroz PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).zip -PKG_SOURCE_URL:=https://files.pythonhosted.org/packages/source/d/$(PKG_NAME) -PKG_HASH:=e14e5c4b207be3dffb200309e7ac7a48de1a2b3293f09eefedd9ab317c4d9a7f +PKG_BUILD_DIR:=$(BUILD_DIR)/$(BUILD_VARIANT)-$(PKG_NAME)-$(PKG_VERSION) include $(INCLUDE_DIR)/package.mk include ../python-package.mk +include ../python3-package.mk -define Package/django-simple-captcha +PKG_UNPACK:=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip-components=1 -xzf $(DL_DIR)/$(PKG_SOURCE) + +define Package/$(PKG_NAME)/Default SUBMENU:=Python SECTION:=lang CATEGORY:=Languages TITLE:=Simple Django captcha application URL:=https://github.com/mbi/django-simple-captcha - DEPENDS:=+python +python-six +python-django +pillow +django-ranged-response +endef + +define Package/python-$(PKG_NAME) +$(call Package/$(PKG_NAME)/Default) + DEPENDS:= \ + +PACKAGE_python-$(PKG_NAME):python \ + +PACKAGE_python-$(PKG_NAME):python-six \ + +PACKAGE_python-$(PKG_NAME):python-django \ + +PACKAGE_python-$(PKG_NAME):python-pillow \ + +PACKAGE_python-$(PKG_NAME):python-django-ranged-response VARIANT:=python endef -define Package/django-simple-captcha/description +define Package/python-$(PKG_NAME)/description Django Simple Captcha is an extremely simple, yet highly customizable Django application to add captcha images to any Django form. endef -$(eval $(call PyPackage,django-simple-captcha)) -$(eval $(call BuildPackage,django-simple-captcha)) -$(eval $(call BuildPackage,django-simple-captcha-src)) +define Package/python3-$(PKG_NAME) +$(call Package/$(PKG_NAME)/Default) + DEPENDS:= \ + +PACKAGE_python3-$(PKG_NAME):python3 \ + +PACKAGE_python3-$(PKG_NAME):python3-six \ + +PACKAGE_python3-$(PKG_NAME):python3-django \ + +PACKAGE_python3-$(PKG_NAME):python3-pillow \ + +PACKAGE_python3-$(PKG_NAME):python3-django-ranged-response + VARIANT:=python3 +endef + +define Package/python3-$(PKG_NAME)/description +$(call define Package/python-$(PKG_NAME)/description) +. +(Variant for Python3) +endef + +$(eval $(call PyPackage,python-$(PKG_NAME))) +$(eval $(call BuildPackage,python-$(PKG_NAME))) +$(eval $(call BuildPackage,python-$(PKG_NAME)-src)) + +$(eval $(call Py3Package,python3-$(PKG_NAME))) +$(eval $(call BuildPackage,python3-$(PKG_NAME))) +$(eval $(call BuildPackage,python3-$(PKG_NAME)-src)) diff --git a/net/seafile-seahub/Makefile b/net/seafile-seahub/Makefile index d04413611d..5c7eb89487 100644 --- a/net/seafile-seahub/Makefile +++ b/net/seafile-seahub/Makefile @@ -30,7 +30,7 @@ SEAFILE_PYTHON_DEPENDS:= \ simplejson chardet dateutil mysql pytz qrcode requests requests-oauthlib \ django django-constance django-appconf django-compressor django-formtools \ django-jsonfield django-picklefield django-postoffice django-restframework \ - pillow + pillow django-simple-captcha define Package/seafile-seahub SECTION:=net @@ -38,7 +38,7 @@ define Package/seafile-seahub TITLE:=Seafile server - seahub component URL:=https://seafile.com/ DEPENDS:=+python \ - +django-simple-captcha +django-statici18n +django-webpack-loader \ + +django-statici18n +django-webpack-loader \ +python-flup +gunicorn +openpyxl \ $(foreach dep,$(SEAFILE_PYTHON_DEPENDS),+python-$(dep)) endef