summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--glpi.spec15
1 files changed, 6 insertions, 9 deletions
diff --git a/glpi.spec b/glpi.spec
index d96674a..f2423c7 100644
--- a/glpi.spec
+++ b/glpi.spec
@@ -12,7 +12,7 @@
#global gh_date 20160923
%global gh_owner glpi-project
%global gh_project glpi
-
+%global prever RC2
%if 0%{?fedora} < 20
# See https://bugzilla.redhat.com/1033025
@@ -42,11 +42,8 @@
%endif
Name: %{gh_project}
-%global upstream_version 9.2
-%global upstream_prever RC2
-Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
-%global schema 9.2
-Release: 1%{?dist}
+Version: 9.2
+Release: 0.1.%{prever}%{?dist}
Summary: Free IT asset management software
Summary(fr): Gestion Libre de Parc Informatique
@@ -54,7 +51,7 @@ Group: Applications/Internet
License: GPLv2+ and GPLv3+ and MIT
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}-%{gh_short}.tar.gz
+Source0: https://github.com/%{gh_owner}/%{name}/archive/%{gh_commit}/%{name}-%{version}%{?prever}-%{gh_short}.tar.gz
Patch1: 2800.patch
@@ -213,7 +210,7 @@ techniciens grâce à une maintenance plus cohérente.
%setup -q -n %{name}-%{gh_commit}
%patch1 -p1
-grep %{upstream_version} inc/define.php
+grep %{version} inc/define.php
find . -name \*.orig -exec rm {} \; -print
@@ -490,7 +487,7 @@ fi
%changelog
-* Thu Sep 21 2017 Remi Collet <remi@remirepo.net> - 9.2~RC1-1
+* Thu Sep 21 2017 Remi Collet <remi@remirepo.net> - 9.2-0.1.RC2
- update to 9.2RC1
- drop dependency on zetacomponents/graph
- raise dependency on zend-cache, zend-i18n 2.7