From 483978767def67b29b74ef6c38127f96154e40e0 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Wed, 24 Feb 2016 18:30:53 +0100
Subject: glpi-reports: 1.9.1

---
 changeset_r322.diff | 16 ----------------
 changeset_r323.diff | 13 -------------
 glpi-reports.spec   | 20 ++++++--------------
 3 files changed, 6 insertions(+), 43 deletions(-)
 delete mode 100644 changeset_r322.diff
 delete mode 100644 changeset_r323.diff

diff --git a/changeset_r322.diff b/changeset_r322.diff
deleted file mode 100644
index 3d7452b..0000000
--- a/changeset_r322.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: trunk/report/doublons/doublons.php
-===================================================================
---- trunk/report/doublons/doublons.php	(révision 321)
-+++ trunk/report/doublons/doublons.php	(révision 322)
-@@ -75,11 +75,6 @@
- echo "<tr class='tab_bg_1 center'>";
- echo "<th colspan='3'>".__('Duplicate computers', 'reports')."</th></tr>\n";
- 
--if (Session::haveRight("config", READ)) { // Check only read as we probably use the replicate (no 'w' in this case)
--   echo "<tr class='tab_bg_3 center'><td colspan='".(($crit > 0)?'3':'2')."'>";
--   echo "<a href='./doublons.config.php'>".__('Report configuration', 'reports')."</a></td></tr>\n";
--}
--
- echo "<tr class='tab_bg_1'><td class='right'>"._n('Criterion', 'Criteria', 2). "</td><td>";
- echo "<select name='crit'>";
- 
diff --git a/changeset_r323.diff b/changeset_r323.diff
deleted file mode 100644
index 5d96b93..0000000
--- a/changeset_r323.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: trunk/report/doublons/doublons.php
-===================================================================
---- trunk/report/doublons/doublons.php	(révision 322)
-+++ trunk/report/doublons/doublons.php	(révision 323)
-@@ -206,7 +206,7 @@
-    $SerialBlacklist = "''";
- 
-    $res = $DB->query("SELECT `value`
--                      FROM `glpi__blacklists`
-+                      FROM `glpi_blacklists`
-                       WHERE `type` = '3'");
-    while ($data = $DB->fetch_array($res)) {
-       $SerialBlacklist .= ",'".addslashes($data["value"])."'";
diff --git a/glpi-reports.spec b/glpi-reports.spec
index b2c2fc4..a3cb716 100644
--- a/glpi-reports.spec
+++ b/glpi-reports.spec
@@ -1,6 +1,6 @@
 # remirepo spec file for glpi-reports
 #
-# Copyright (c) 2010-2015 Remi Collet
+# Copyright (c) 2010-2016 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -9,7 +9,7 @@
 %global pluginname   reports
 
 Name:           glpi-reports
-Version:        1.9.0
+Version:        1.9.1
 Release:        1%{?dist}
 Summary:        GLPI Plugin providing additional reports
 Summary(fr):    Extension GLPI fournissant des rapports supplémentaires
@@ -18,11 +18,7 @@ Group:          Applications/Internet
 License:        GPLv2+
 URL:            https://forge.glpi-project.org/projects/reports
 
-Source0:        https://forge.glpi-project.org/attachments/download/2101/glpi-reports-1.9.0.tar.gz
-
-# Upstream patches
-Patch1:         changeset_r322.diff
-Patch2:         changeset_r323.diff
+Source0:        https://forge.glpi-project.org/attachments/download/2123/glpi-reports-1.9.1.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
@@ -55,13 +51,6 @@ Fonctionnalités principales :
 %prep
 %setup -q -c 
 
-pushd %{pluginname}
-%patch1 -p1
-%patch2 -p1
-
-rm -rf tools
-popd
-
 # Create link to LICENSE for standard doc folder
 ln -s %{_datadir}/glpi/plugins/%{pluginname}/LICENSE LICENSE
 
@@ -106,6 +95,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Feb 24 2016 Remi Collet <remi@fedoraproject.org> - 1.9.1-1
+- version 1.9.1 for GLPI 0.85 and 0.90
+
 * Sat Oct  3 2015 Remi Collet <remi@fedoraproject.org> - 1.9.0-1
 - version 1.9.0 for GLPI 0.85 and 0.90
   https://forge.glpi-project.org/versions/1152
-- 
cgit