django-compressor: add missing dependencies. 8993/head
authorEneas U de Queiroz <cote2004-github@yahoo.com>
Wed, 15 May 2019 19:45:56 +0000 (16:45 -0300)
committerEneas U de Queiroz <cote2004-github@yahoo.com>
Mon, 20 May 2019 14:24:37 +0000 (11:24 -0300)
Added python-rcssmin, and django-appconfig as dependencies, and a note
in the package help text about not having a rjsmin package, so the
jsmin (javascript) filter will not work.
Adjusted the Makefile to conform to current python-package style, and to
display the package title correctly in menuconfig.

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
lang/python/django-compressor/Makefile

index 36a9e91b6277aa8e95c9697b0b87387b72efdb00..52018abd75a368ca749ed404770956e4324da6ac 100644 (file)
@@ -9,14 +9,17 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=django-compressor
 PKG_VERSION:=2.2
-PKG_RELEASE:=2
+PKG_RELEASE:=3
+
+PKG_MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com>
 PKG_LICENSE:=MIT
+PKG_LICENSE_FILES:=LICENSE
 
 PKG_SOURCE:=django_compressor-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://pypi.python.org/packages/82/76/1355459f90714517c52f264aa7245b52e59a273ec16e8f8d505fa6c342f8/
-PKG_BUILD_DIR:=$(BUILD_DIR)/django_compressor-$(PKG_VERSION)/
 PKG_HASH:=9616570e5b08e92fa9eadc7a1b1b49639cce07ef392fc27c74230ab08075b30f
-PKG_MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com>
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/django_compressor-$(PKG_VERSION)/
 
 include $(INCLUDE_DIR)/package.mk
 include ../python-package.mk
@@ -25,24 +28,19 @@ define Package/django-compressor
   SUBMENU:=Python
   SECTION:=lang
   CATEGORY:=Languages
-  TITLE:=Compresses linked and inline JavaScript or CSS into single cached files.
+  TITLE:=Compress CSS/JS into single cached files
   URL:=http://django-compressor.readthedocs.org/
-  DEPENDS:=+python +django
+  DEPENDS:=+python +django +django-appconf +python-rcssmin
+  VARIANT:=python
 endef
 
 define Package/django-compressor/description
   Compresses linked and inline JavaScript or CSS into single cached files.
+  Note that the JavaScript filter is not being installed as a dependency.
+  You'll need to build the rjsmin module (it is not par of the openwrt standard
+  feeds) to use JavaScript functionality.
 endef
 
-define Build/Compile
-       $(call Build/Compile/PyMod,,install --prefix=/usr --root=$(PKG_INSTALL_DIR))
-endef
-
-define Package/django-compressor/install
-       $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)
-       $(CP) \
-           $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \
-           $(1)$(PYTHON_PKG_DIR)
-endef
-
+$(eval $(call PyPackage,django-compressor))
 $(eval $(call BuildPackage,django-compressor))
+$(eval $(call BuildPackage,django-compressor-src))