From 7bbc5131f2c38c4bc3b6be0b0522e3c1762a1748 Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Tue, 25 Jun 2019 10:00:06 +0300 Subject: [PATCH] django-jsonfield: update packaging format + add python3 variant Signed-off-by: Alexandru Ardelean --- lang/python/django-jsonfield/Makefile | 53 +++++++++++++++++++-------- net/seafile-seahub/Makefile | 4 +- 2 files changed, 40 insertions(+), 17 deletions(-) diff --git a/lang/python/django-jsonfield/Makefile b/lang/python/django-jsonfield/Makefile index 8ec80f32f1..ed3ffbcebc 100644 --- a/lang/python/django-jsonfield/Makefile +++ b/lang/python/django-jsonfield/Makefile @@ -9,39 +9,62 @@ include $(TOPDIR)/rules.mk PKG_NAME:=django-jsonfield PKG_VERSION:=1.0.1 -PKG_RELEASE:=3 -PKG_LICENSE:=BSD-3-Clause +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://pypi.python.org/packages/e4/b2/a079f0a2218e0eb7892edbf404e0bbfbb281a6bbf06966b775f5142ed159/ +PKG_SOURCE_URL:=https://files.pythonhosted.org/packages/source/d/$(PKG_NAME)/ PKG_HASH:=6c0afd5554739365b55d86e285cf966cc3a45682fff963463364ea1f6511ca3e + PKG_MAINTAINER:=Alexandru Ardelean +PKG_LICENSE:=BSD-3-Clause +PKG_LICENSE_FILES:=LICENSE + +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-jsonfield +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:=JSONField for django models - URL:=https://github.com/bradjasper/django-jsonfield - DEPENDS:=+python +python-django + URL:=https://github.com/adamchainz/django-jsonfield +endef + +define Package/python-$(PKG_NAME) +$(call Package/$(PKG_NAME)/Default) + DEPENDS:= \ + +PACKAGE_python-$(PKG_NAME):python \ + +PACKAGE_python-$(PKG_NAME):python-django + VARIANT:=python endef -define Package/django-jsonfield/description +define Package/python-$(PKG_NAME)/description JSONField for django models endef -define Build/Compile - $(call Build/Compile/PyMod,,install --prefix=/usr --root=$(PKG_INSTALL_DIR)) +define Package/python3-$(PKG_NAME) +$(call Package/$(PKG_NAME)/Default) + DEPENDS:= \ + +PACKAGE_python3-$(PKG_NAME):python3 \ + +PACKAGE_python3-$(PKG_NAME):python3-django + VARIANT:=python3 endef -define Package/django-jsonfield/install - $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) - $(CP) \ - $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \ - $(1)$(PYTHON_PKG_DIR) +define Package/python3-$(PKG_NAME)/description +$(call define Package/python-$(PKG_NAME)/description) +. +(Variant for Python3) endef -$(eval $(call BuildPackage,django-jsonfield)) +$(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 c0599a4573..9b71b55c02 100644 --- a/net/seafile-seahub/Makefile +++ b/net/seafile-seahub/Makefile @@ -24,7 +24,8 @@ include ../../lang/python/python-package.mk SEAFILE_PYTHON_DEPENDS:= \ simplejson chardet dateutil mysql pytz qrcode requests requests-oauthlib \ - django django-constance django-appconf django-compressor django-formtools + django django-constance django-appconf django-compressor django-formtools \ + django-jsonfield define Package/seafile-seahub SECTION:=net @@ -32,7 +33,6 @@ define Package/seafile-seahub TITLE:=Seafile server - seahub component URL:=https://seafile.com/ DEPENDS:=+python +pillow \ - +django-jsonfield \ +django-picklefield +django-postoffice +django-restframework \ +django-simple-captcha +django-statici18n +django-webpack-loader \ +python-flup +gunicorn +openpyxl \ -- 2.30.2