From 51056fd497e0afc0bc1b37061d874f5363027727 Mon Sep 17 00:00:00 2001
From: remi <fedora@famillecollet.com>
Date: Jul 22 2011 18:03:56 +0000
Subject: patch from SVN - Security fix


---

diff --git a/.gitignore b/.gitignore
index 667d201..73e8ba7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 *~
 glpi-0.72.4-11497.tar.gz
 /glpi-0.78.5.tar.gz
+/glpi-0.78-14966.tar.gz
diff --git a/glpi.spec b/glpi.spec
index 94edcec..27a0899 100644
--- a/glpi.spec
+++ b/glpi.spec
@@ -4,7 +4,7 @@
 %global useselinux 0
 %endif
 
-#global svnrelease 12930
+%global svnrelease 14966
 
 Name:           glpi
 Version:        0.78.5
@@ -81,6 +81,7 @@ techniciens grâce à une maintenance plus cohérente.
 %setup -q -n glpi
 
 %patch0
+find install -name \*.orig -exec rm {} \; -print
 
 # Use system lib
 rm -rf lib/cache_lite
@@ -129,7 +130,6 @@ do   cp -ar $i %{buildroot}/%{_datadir}/%{name}/$i
 done
 
 find %{buildroot}/%{_datadir}/%{name} -type f -exec chmod 644 {} \; 
-# chmod 755 %{buildroot}/%{_datadir}/%{name}/scripts/*.sh
 
 # ===== apache =====
 mkdir -p %{buildroot}/%{_sysconfdir}/httpd/conf.d/
@@ -245,6 +245,9 @@ fi
 
 
 %changelog
+* Fri Jul 22 2011 Remi Collet <Fedora@FamilleCollet.com> - 0.78.5-2.svn14966
+- bug and security fix from SVN.
+
 * Sat Jun 11 2011 Remi Collet <Fedora@FamilleCollet.com> - 0.78.5-1
 - version 0.78.5 released
 
diff --git a/mktar.sh b/mktar.sh
new file mode 100755
index 0000000..1e2db0a
--- /dev/null
+++ b/mktar.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+if [ "$1" = "" ]; then
+	echo mising rev number
+	exit 1
+fi
+
+svn export -r $1 https://forge.indepnet.net/svn/glpi/branches/0.78-bugfixes glpi
+rm -rf glpi/tools
+mv glpi/install/mysql/glpi-0.78.2-empty.sql .
+rm -f glpi/install/mysql/*.sql
+mv glpi-0.78.2-empty.sql glpi/install/mysql/
+tar czf glpi-0.78-$1.tar.gz glpi && echo glpi-0.78-$1.tar.gz created
+rm -rf glpi
+
diff --git a/sources b/sources
index 2cbf30c..e3f4e2a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0af73dc3cf241d08bd982a80b8d16438  glpi-0.78.5.tar.gz
+9706b8a4e7f03bf0c5023a19bfb3bf1d  glpi-0.78-14966.tar.gz