From e42ffe560f69c604c96e8b9bd254019cbd957240 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 14 Jun 2018 14:03:56 +0200 Subject: test build for pr #4178 --- glpi.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'glpi.spec') diff --git a/glpi.spec b/glpi.spec index 4947ec6..2216f7e 100644 --- a/glpi.spec +++ b/glpi.spec @@ -44,7 +44,7 @@ Name: %{gh_project} %global upstream_prever RC2 # use 9.3.0~RC2 < 9.3 (for plugin compatibility check) Version: %{upstream_version}.0%{?upstream_prever:~%{upstream_prever}} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Free IT asset management software Summary(fr): Gestion Libre de Parc Informatique @@ -54,8 +54,8 @@ URL: http://www.glpi-project.org/ Source0: https://github.com/%{gh_owner}/%{name}/archive/%{gh_commit}/%{name}-%{upstream_version}%{?upstream_prever:-%{upstream_prever}}-%{gh_short}.tar.gz Source1: %{name}-httpd.conf -Source2: %{name}-9.2-config_path.php -Source12: %{name}-9.2-config_path_test.php +Source2: %{name}-downstream.php +Source12: %{name}-downstream-test.php Source3: %{name}-logrotate Source4: %{name}-nginx.conf Source5: %{name}-fedora-autoloader.php @@ -64,6 +64,8 @@ Source6: %{name}-minify.php # Override PHP configuration for php-fpm Source7: %{name}-user.ini +Patch0: https://patch-diff.githubusercontent.com/raw/glpi-project/glpi/pull/4178.patch + BuildArch: noarch BuildRequires: gettext BuildRequires: php-cli @@ -274,6 +276,7 @@ techniciens grâce à une maintenance plus cohérente. %prep %setup -q -n %{name}-%{gh_commit} +%patch0 -p1 grep %{upstream_version} inc/define.php @@ -556,6 +559,9 @@ fi %changelog +* Thu Jun 14 2018 Remi Collet - 9.3.0~RC2-2 +- test build + * Tue Jun 12 2018 Remi Collet - 9.3.0~RC2-1 - update to 9.3-RC2 - drop dependency on jasig/phpcas -- cgit