summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2017-09-26 07:29:45 +0200
committerRemi Collet <remi@remirepo.net>2017-09-26 07:29:45 +0200
commitbf3d4f705dfc4992ea6d9a97be10b00dae0ffaf6 (patch)
tree1bcb0aff24545c89ccf91e4a55ceda6e196e0657
parentfc131b38b11c882fe275426e4fd64231801f8a86 (diff)
v9.2
-rw-r--r--glpi.spec12
1 files changed, 6 insertions, 6 deletions
diff --git a/glpi.spec b/glpi.spec
index f2423c7..09837c8 100644
--- a/glpi.spec
+++ b/glpi.spec
@@ -7,12 +7,12 @@
# Please, preserve the changelog entries
#
-%global gh_commit f38701abbb7f5a451c25b3905e49e3cd8a10572a
+%global gh_commit 43bade1249719184b83a197fb57167676f68aae5
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
#global gh_date 20160923
%global gh_owner glpi-project
%global gh_project glpi
-%global prever RC2
+#global prever RC2
%if 0%{?fedora} < 20
# See https://bugzilla.redhat.com/1033025
@@ -43,7 +43,7 @@
Name: %{gh_project}
Version: 9.2
-Release: 0.1.%{prever}%{?dist}
+Release: 1%{?dist}
Summary: Free IT asset management software
Summary(fr): Gestion Libre de Parc Informatique
@@ -53,8 +53,6 @@ URL: http://www.glpi-project.org/
# Upstream sources (not the github auto-generated archive)
Source0: https://github.com/%{gh_owner}/%{name}/archive/%{gh_commit}/%{name}-%{version}%{?prever}-%{gh_short}.tar.gz
-Patch1: 2800.patch
-
Source1: %{name}-httpd.conf
Source2: %{name}-9.1-config_path.php
Source12: %{name}-9.1-config_path_test.php
@@ -208,7 +206,6 @@ techniciens grâce à une maintenance plus cohérente.
%prep
%setup -q -n %{name}-%{gh_commit}
-%patch1 -p1
grep %{version} inc/define.php
@@ -487,6 +484,9 @@ fi
%changelog
+* Tue Sep 26 2017 Remi Collet <remi@remirepo.net> - 9.2-1
+- update to 9.2
+
* Thu Sep 21 2017 Remi Collet <remi@remirepo.net> - 9.2-0.1.RC2
- update to 9.2RC1
- drop dependency on zetacomponents/graph