diff --git a/lang/python/django-restframework/Makefile b/lang/python/django-restframework/Makefile index 27b604a1f..b699c4857 100644 --- a/lang/python/django-restframework/Makefile +++ b/lang/python/django-restframework/Makefile @@ -9,40 +9,62 @@ include $(TOPDIR)/rules.mk PKG_NAME:=django-restframework PKG_VERSION:=3.9.0 -PKG_RELEASE:=3 -PKG_LICENSE:=BSD-3-Clause +PKG_RELEASE:=4 PKG_SOURCE:=djangorestframework-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://files.pythonhosted.org/packages/source/d/djangorestframework PKG_HASH:=607865b0bb1598b153793892101d881466bd5a991de12bd6229abb18b1c86136 -PKG_BUILD_DIR:=$(BUILD_DIR)/djangorestframework-$(PKG_VERSION) + PKG_MAINTAINER:=Alexandru Ardelean +PKG_LICENSE:=BSD-3-Clause +PKG_LICENSE_FILES:=LICENSE.md + +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-restframework +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:=Web APIs for Django, made easy. URL:=https://www.django-rest-framework.org - DEPENDS:=+python +python-django endef -define Package/django-restframework/description +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/python-$(PKG_NAME)/description Web APIs for Django, made easy. 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-restframework/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-restframework)) +$(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 c5d1a547e..99db5ab8b 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-picklefield django-postoffice + django-jsonfield django-picklefield django-postoffice django-restframework define Package/seafile-seahub SECTION:=net @@ -33,7 +33,6 @@ define Package/seafile-seahub TITLE:=Seafile server - seahub component URL:=https://seafile.com/ DEPENDS:=+python +pillow \ - +django-restframework \ +django-simple-captcha +django-statici18n +django-webpack-loader \ +python-flup +gunicorn +openpyxl \ $(foreach dep,$(SEAFILE_PYTHON_DEPENDS),+python-$(dep))