summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-09-24 16:17:04 +0200
committerRemi Collet <remi@remirepo.net>2019-09-24 16:17:04 +0200
commit6315041d8d56f3fc7e5d3ec610c9f32c75de90f0 (patch)
tree8f21596ec0cc9dcc2fa77393ffa28fcdd956d95c
parent8c43b2f63f55f761a3684035f02ce875f64eda0b (diff)
v9.4.4.HEADmaster
-rw-r--r--composer.json49
-rw-r--r--glpi-fedora-autoloader.php16
-rw-r--r--glpi.spec11
3 files changed, 40 insertions, 36 deletions
diff --git a/composer.json b/composer.json
index 3a19aa9..8923385 100644
--- a/composer.json
+++ b/composer.json
@@ -12,42 +12,42 @@
},
"require": {
"php": ">=5.6.0",
- "ext-mysqli": "*",
+ "ext-curl": "*",
"ext-fileinfo": "*",
+ "ext-gd": "*",
"ext-json": "*",
"ext-mbstring": "*",
- "ext-gd": "*",
+ "ext-mysqli": "*",
"ext-zlib": "*",
- "ext-curl": "*",
- "iamcal/lib_autolink": "~1.7",
- "phpmailer/phpmailer": "~6.0",
- "sabre/vobject": "~4.1",
- "simplepie/simplepie": "^1.5",
- "tecnickcom/tcpdf": "~6.2.16",
- "zendframework/zend-cache": "^2.8",
- "zendframework/zend-i18n": "^2.8",
- "zendframework/zend-serializer": "^2.8",
+ "elvanto/litemoji": "^1.4 || ^2.0",
+ "iamcal/lib_autolink": "^1.7",
+ "leafo/scssphp": "^0.7.7",
"michelf/php-markdown": "^1.6",
- "true/punycode": "^2.1",
- "paragonie/random_compat": "^2.0",
"monolog/monolog": "^1.23",
+ "paragonie/random_compat": "^2.0",
+ "phpmailer/phpmailer": "^6.0",
+ "sabre/vobject": "^4.1",
"sebastian/diff": "^1.4 || ^2.0 || ^3.0",
- "elvanto/litemoji": "^1.4",
+ "simplepie/simplepie": "^1.5",
"symfony/console": "^3.4",
- "leafo/scssphp": "^0.7.7"
+ "tecnickcom/tcpdf": "^6.2",
+ "true/punycode": "^2.1",
+ "zendframework/zend-cache": "^2.8",
+ "zendframework/zend-i18n": "^2.8",
+ "zendframework/zend-serializer": "^2.8"
},
"require-dev": {
- "guzzlehttp/guzzle": "~6",
- "glpi-project/coding-standard": "^0.7.1",
- "consolidation/robo": "^1.0",
- "natxet/CssMin": "^3.0",
- "patchwork/jsqueeze": "^2.0",
- "atoum/atoum": "^3.3",
+ "atoum/atoum": "dev-master",
"atoum/telemetry-extension": "^1.0",
- "sensiolabs/security-checker": "^5.0",
+ "consolidation/robo": "^1.0",
"fzaninotto/Faker": "^1.7",
+ "glpi-project/coding-standard": "^0.7.1",
+ "guzzlehttp/guzzle": "^6.0",
"jakub-onderka/php-parallel-lint": "^1.0",
- "mikey179/vfsStream": "^1.6"
+ "mikey179/vfsStream": "^1.6",
+ "natxet/CssMin": "^3.0",
+ "patchwork/jsqueeze": "^2.0",
+ "sensiolabs/security-checker": "^5.0"
},
"suggest": {
"ext-ldap": "Used ot provide LDAP authentication and synchronization",
@@ -57,7 +57,8 @@
"optimize-autoloader": true,
"platform": {
"php": "5.6.0"
- }
+ },
+ "sort-packages": true
},
"scripts": {
"testdb": "php vendor/bin/atoum -p 'php -d memory_limit=512M' --debug --force-terminal --use-dot-report --configurations tests/telemetry.php --bootstrap-file tests/bootstrap.php --no-code-coverage --max-children-number 1 -d tests/database",
diff --git a/glpi-fedora-autoloader.php b/glpi-fedora-autoloader.php
index ebb3394..22afd49 100644
--- a/glpi-fedora-autoloader.php
+++ b/glpi-fedora-autoloader.php
@@ -5,27 +5,27 @@ require_once "$vendor/Fedora/Autoloader/autoload.php";
// Dependencies from composer.json
\Fedora\Autoloader\Dependencies::required([
- // "iamcal/lib_autolink": "~1.7",
+ // "iamcal/lib_autolink": "^1.7",
"$vendor/php-iamcal-lib-autolink/autoload.php",
- // "phpmailer/phpmailer": "~6.0",
+ // "phpmailer/phpmailer": "^6.0",
"$vendor/PHPMailer/PHPMailer6/autoload.php",
- // "sabre/vobject": "~4.1",
+ // "sabre/vobject": "^4.1",
"$vendor/Sabre/VObject4/autoload.php",
// "simplepie/simplepie": "^1.5",
"$vendor/php-simplepie/autoloader.php",
- // "tecnickcom/tcpdf": "~6.2.16",
+ // "tecnickcom/tcpdf": "^6.2",
"$vendor/tcpdf/autoload.php",
- // "zendframework/zend-cache": "^2.7",
+ // "zendframework/zend-cache": "^2.8",
[
"$vendor/Zend/Cache/autoload.php",
"$vendor/Zend/autoload.php",
],
- // "zendframework/zend-i18n": "^2.7",
+ // "zendframework/zend-i18n": "^2.8",
[
"$vendor/Zend/I18n/autoload.php",
"$vendor/Zend/autoload.php",
],
- // "zendframework/zend-serializer": "^2.7",
+ // "zendframework/zend-serializer": "^2.8",
[
"$vendor/Zend/Serializer/autoload.php",
"$vendor/Zend/autoload.php",
@@ -38,7 +38,7 @@ require_once "$vendor/Fedora/Autoloader/autoload.php";
"$vendor/random_compat/autoload.php",
// "monolog/monolog": "^1.23",
"$vendor/Monolog/autoload.php",
-// "elvanto/litemoji": "^1.4"
+// "elvanto/litemoji": "^1.4 || ^2.0"
"$vendor/LitEmoji/autoload.php",
// "sebastian/diff": "^1.4 || ^2.0 || ^3.0"
[
diff --git a/glpi.spec b/glpi.spec
index 3640125..efe2295 100644
--- a/glpi.spec
+++ b/glpi.spec
@@ -7,7 +7,7 @@
# Please, preserve the changelog entries
#
-%global gh_commit 081338b2fa3a98eacb6f7ca380714f34ec0266ff
+%global gh_commit 9b9127cb21ce038a37b9201b986b8b55ed7ba461
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
#global gh_date 20160923
%global gh_owner glpi-project
@@ -52,10 +52,10 @@
%endif
Name: %{gh_project}
-%global upstream_version 9.4.3
+%global upstream_version 9.4.4
#global upstream_prever RC2
Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
-Release: 2%{?dist}
+Release: 1%{?dist}
Summary: Free IT asset management software
Summary(fr): Gestion Libre de Parc Informatique
@@ -449,7 +449,7 @@ rm composer.lock
: Add developement dependecies
cat << 'EOF' | tee -a vendor/autoload.php
\Fedora\Autoloader\Dependencies::required([
- // "guzzlehttp/guzzle": "~6"
+ // "guzzlehttp/guzzle": "^6.0"
"$vendor/GuzzleHttp6/autoload.php",
"$vendor/org/bovigo/vfs/autoload.php",
]);
@@ -610,6 +610,9 @@ fi
%changelog
+* Tue Sep 24 2019 Remi Collet <remi@remirepo.net> - 9.4.4-1
+- update to 9.4.4
+
* Fri Jul 19 2019 Remi Collet <remi@remirepo.net> - 9.4.3-2
- allow elvanto/litemoji 2.0
see https://github.com/glpi-project/glpi/pull/6141