From 6a7f547a387bf9a22ab8744abab7d2dcb4867ffb Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Tue, 25 Jun 2019 10:04:01 +0300 Subject: [PATCH] django-picklefield: update packaging format + add python3 variant Signed-off-by: Alexandru Ardelean --- lang/python/django-picklefield/Makefile | 51 ++++++++++++++++++------- net/seafile-seahub/Makefile | 4 +- 2 files changed, 39 insertions(+), 16 deletions(-) diff --git a/lang/python/django-picklefield/Makefile b/lang/python/django-picklefield/Makefile index fe6e2c5c7..b24157b27 100644 --- a/lang/python/django-picklefield/Makefile +++ b/lang/python/django-picklefield/Makefile @@ -10,38 +10,61 @@ include $(TOPDIR)/rules.mk PKG_NAME:=django-picklefield PKG_VERSION:=1.1.0 PKG_RELEASE:=3 -PKG_LICENSE:=MIT PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://files.pythonhosted.org/packages/source/d/django-picklefield +PKG_SOURCE_URL:=https://files.pythonhosted.org/packages/source/d/$(PKG_NAME)/ PKG_HASH:=ce7fee5c6558fe5dc8924993d994ccde75bb75b91cd82787cbd4c92b95a69f9c + PKG_MAINTAINER:=Alexandru Ardelean +PKG_LICENSE:=MIT +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-picklefield +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:=Pickled object field for Django - URL:=https://github.com/gintas/django-picklefield - DEPENDS:=+python +python-django + URL:=https://github.com/gintas/django-picklefield/ +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-picklefield/description +define Package/python-$(PKG_NAME)/description Pickled object field for Django 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-picklefield/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-picklefield)) +$(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 9b71b55c0..25db57942 100644 --- a/net/seafile-seahub/Makefile +++ b/net/seafile-seahub/Makefile @@ -25,7 +25,7 @@ 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-jsonfield + django-jsonfield django-picklefield define Package/seafile-seahub SECTION:=net @@ -33,7 +33,7 @@ define Package/seafile-seahub TITLE:=Seafile server - seahub component URL:=https://seafile.com/ DEPENDS:=+python +pillow \ - +django-picklefield +django-postoffice +django-restframework \ + +django-postoffice +django-restframework \ +django-simple-captcha +django-statici18n +django-webpack-loader \ +python-flup +gunicorn +openpyxl \ $(foreach dep,$(SEAFILE_PYTHON_DEPENDS),+python-$(dep))