From 3392fbc6fcfee2b2ee4aa661261fee7e27ce8100 Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Tue, 25 Jun 2019 09:39:54 +0300 Subject: [PATCH] django-appconf: update packaging format + add python3 variant Signed-off-by: Alexandru Ardelean --- lang/python/django-appconf/Makefile | 57 ++++++++++++++++++++--------- net/seafile-seahub/Makefile | 4 +- 2 files changed, 42 insertions(+), 19 deletions(-) diff --git a/lang/python/django-appconf/Makefile b/lang/python/django-appconf/Makefile index a5de29bbe..e37f15848 100644 --- a/lang/python/django-appconf/Makefile +++ b/lang/python/django-appconf/Makefile @@ -9,39 +9,62 @@ include $(TOPDIR)/rules.mk PKG_NAME:=django-appconf PKG_VERSION:=1.0.2 -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/34/b9/d07195652ab494b026f7cb0341dd6e5f2e6e39be177abe05e2cec8bd46e4/ +PKG_SOURCE_URL:=https://files.pythonhosted.org/packages/source/d/$(PKG_NAME)/ PKG_HASH:=6a4d9aea683b4c224d97ab8ee11ad2d29a37072c0c6c509896dd9857466fb261 + 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-appconf +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:=A helper class for handling configuration defaults of packaged apps gracefully. - URL:=http://django-appconf.readthedocs.org/ - DEPENDS:=+python +python-django + TITLE:=Helper class for handling config defaults + URL:=https://$(PKG_NAME).readthedocs.io +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-appconf/description - A helper class for handling configuration defaults of packaged apps gracefully. +define Package/python-$(PKG_NAME)/description + A helper class for handling configuration defaults of packaged apps gracefully 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-appconf/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-appconf)) +$(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 9123d9bda..0a7fef9ce 100644 --- a/net/seafile-seahub/Makefile +++ b/net/seafile-seahub/Makefile @@ -24,14 +24,14 @@ include ../../lang/python/python-package.mk SEAFILE_PYTHON_DEPENDS:= \ simplejson chardet dateutil mysql pytz qrcode requests requests-oauthlib \ - django django-constance + django django-constance django-appconf define Package/seafile-seahub SECTION:=net CATEGORY:=Network TITLE:=Seafile server - seahub component URL:=https://seafile.com/ - DEPENDS:=+python +pillow +django-appconf \ + DEPENDS:=+python +pillow \ +django-compressor +django-formtools +django-jsonfield \ +django-picklefield +django-postoffice +django-restframework \ +django-simple-captcha +django-statici18n +django-webpack-loader \