From 00c88393fe363fa4219f44e569f5bf8a9d30058a Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Sat, 3 Oct 2015 16:34:07 +0200
Subject: glpi-reports: upstream patches for 'doublon'

---
 glpi-reports.spec | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'glpi-reports.spec')

diff --git a/glpi-reports.spec b/glpi-reports.spec
index a9630ea..b2c2fc4 100644
--- a/glpi-reports.spec
+++ b/glpi-reports.spec
@@ -20,6 +20,10 @@ 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
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  gettext
@@ -51,7 +55,12 @@ Fonctionnalités principales :
 %prep
 %setup -q -c 
 
-rm -r %{pluginname}/tools
+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
-- 
cgit