summaryrefslogtreecommitdiffstats
path: root/glpi.spec
diff options
context:
space:
mode:
Diffstat (limited to 'glpi.spec')
-rw-r--r--glpi.spec18
1 files changed, 16 insertions, 2 deletions
diff --git a/glpi.spec b/glpi.spec
index a758bd8..553b37a 100644
--- a/glpi.spec
+++ b/glpi.spec
@@ -43,7 +43,7 @@
Name: %{gh_project}
Version: 9.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Free IT asset management software
Summary(fr): Gestion Libre de Parc Informatique
@@ -59,6 +59,8 @@ Source12: %{name}-9.1-config_path_test.php
Source3: %{name}-logrotate
Source4: %{name}-nginx.conf
Source5: %{name}-fedora-autoloader.php
+# Temporary minify script, waiting for consolidation/robo
+Source6: %{name}-minify.php
BuildArch: noarch
BuildRequires: gettext
@@ -98,6 +100,11 @@ BuildRequires: php-composer(guzzlehttp/guzzle) >= 6
BuildRequires: php-composer(atoum/atoum) < 4
BuildRequires: php-composer(atoum/atoum) >= 3.2
%endif
+BuildRequires: php-cli
+BuildRequires: php-composer(natxet/CssMin) < 4
+BuildRequires: php-composer(natxet/CssMin) >= 3.0
+BuildRequires: php-composer(patchwork/jsqueeze) < 3
+BuildRequires: php-composer(patchwork/jsqueeze) >= 2.0
%if %{with_nginx}
Requires: nginx-filesystem
@@ -227,6 +234,7 @@ ln -s /usr/share/fonts/fontawesome/fontawesome-webfont.ttf lib/font-awesome-4.7.
ls lib
cp %{SOURCE2} config/config_path.php
+cp %{SOURCE6} tools/minify.php
mkdir vendor
sed -e "s,##DATADIR##,%{_datadir}," \
@@ -258,7 +266,10 @@ EOF
%build
-# Regenerate the locales
+: Minify CSS and JS files
+php tools/minify.php
+
+: Regenerate the locales
for po in locales/*.po
do
msgfmt $po -o $(dirname $po)/$(basename $po .po).mo
@@ -486,6 +497,9 @@ fi
%changelog
+* Wed Sep 27 2017 Remi Collet <remi@remirepo.net> - 9.2-3
+- add missing minified JS and CSS files
+
* Tue Sep 26 2017 Remi Collet <remi@remirepo.net> - 9.2-2
- missing js and sound files