diff options
| -rw-r--r-- | 5200.patch | 31 | ||||
| -rw-r--r-- | glpi.spec | 12 |
2 files changed, 6 insertions, 37 deletions
diff --git a/5200.patch b/5200.patch deleted file mode 100644 index 7ed7d76..0000000 --- a/5200.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 53de3f8e261cbc449deb5e603fe7d0f1c4c273ec Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Fri, 4 Jan 2019 16:08:52 +0100 -Subject: [PATCH] fix paths used for css/js test - ---- - tests/units/Html.php | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tests/units/Html.php b/tests/units/Html.php -index ee17710b31..c5d2f22068 100644 ---- a/tests/units/Html.php -+++ b/tests/units/Html.php -@@ -421,7 +421,7 @@ public function testCss() { - 'other.css', - 'other-min.css' - ]; -- $dir = str_replace(GLPI_ROOT, '', GLPI_TMP_DIR); -+ $dir = str_replace(realpath(GLPI_ROOT), '', realpath(GLPI_TMP_DIR)); - $base_expected = '<link rel="stylesheet" type="text/css" href="'. - $CFG_GLPI['root_doc'] . $dir .'/%url?v='. GLPI_VERSION .'" %attrs>'; - $base_attrs = 'media="all"'; -@@ -530,7 +530,7 @@ public function testScript() { - 'other.js', - 'other-min.js' - ]; -- $dir = str_replace(GLPI_ROOT, '', GLPI_TMP_DIR); -+ $dir = str_replace(realpath(GLPI_ROOT), '', realpath(GLPI_TMP_DIR)); - $base_expected = '<script type="text/javascript" src="'. - $CFG_GLPI['root_doc'] . $dir .'/%url?v='. GLPI_VERSION .'"></script>'; - @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # -%global gh_commit a91cd4fae005b30123cf883bddf837dfd26a959b +%global gh_commit d1318f84e7278c0fe46419db3c1743a147a30621 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20160923 %global gh_owner glpi-project @@ -53,9 +53,9 @@ Name: %{gh_project} %global upstream_version 9.4.0 -%global upstream_prever RC1 +%global upstream_prever RC2 Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 3%{?dist} +Release: 1%{?dist} Summary: Free IT asset management software Summary(fr): Gestion Libre de Parc Informatique @@ -77,8 +77,6 @@ Source7: %{name}-user.ini # allow to install in /usr/bin Patch0: %{name}-bin.patch -# for tests -Patch1: https://patch-diff.githubusercontent.com/raw/glpi-project/glpi/pull/5200.patch BuildArch: noarch BuildRequires: gettext @@ -322,7 +320,6 @@ techniciens grâce à une maintenance plus cohérente. %prep %setup -q -n %{name}-%{gh_commit} %patch0 -p1 -b .rpm -%patch1 -p1 -b .pr5200 grep %{upstream_version} inc/define.php @@ -610,6 +607,9 @@ fi %changelog +* Tue Jan 15 2019 Remi Collet <remi@remirepo.net> - 9.4.0~RC2-1 +- update to 9.4.0 RC2 + * Fri Jan 4 2019 Remi Collet <remi@remirepo.net> - 9.4.0~RC1-3 - open https://github.com/glpi-project/glpi/pull/5200 fix tests - re-enable test suite |