From b2394833650c58fbbac7df503373c349f470086c Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Wed, 3 Jul 2019 12:01:56 +0300 Subject: [PATCH] django-statici18n: update packaging format + add python3 variant Signed-off-by: Alexandru Ardelean --- lang/python/django-statici18n/Makefile | 53 ++++++++++++++++++-------- net/seafile-seahub/Makefile | 4 +- 2 files changed, 40 insertions(+), 17 deletions(-) diff --git a/lang/python/django-statici18n/Makefile b/lang/python/django-statici18n/Makefile index b4a3898dc..97a880596 100644 --- a/lang/python/django-statici18n/Makefile +++ b/lang/python/django-statici18n/Makefile @@ -9,39 +9,62 @@ include $(TOPDIR)/rules.mk PKG_NAME:=django-statici18n PKG_VERSION:=1.8.2 -PKG_RELEASE:=3 -PKG_LICENSE:=BSD-3-Clause +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://files.pythonhosted.org/packages/source/d/django-statici18n PKG_HASH:=ba9eeb3c4517027922645999359f8335fbb9fea04c457123cfbd6b4a36cbeda4 + 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-statici18n +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 Django app that provides helper for generating JavaScript catalog to static files. - URL:=https://django-statici18n.readthedocs.org/ - DEPENDS:=+python +python-django + TITLE:=Helper for generating JavaScript catalog to static files + 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-statici18n/description +define Package/python-$(PKG_NAME)/description A Django app that provides helper for generating JavaScript catalog to static files. 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-statici18n/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-statici18n)) +$(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 5c7eb8948..41d36e164 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 django-simple-captcha + pillow django-simple-captcha django-statici18n 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-statici18n +django-webpack-loader \ + +django-webpack-loader \ +python-flup +gunicorn +openpyxl \ $(foreach dep,$(SEAFILE_PYTHON_DEPENDS),+python-$(dep)) endef