diff --git a/Changeset6190.diff b/Changeset6190.diff new file mode 100644 index 0000000..c2f26ac --- /dev/null +++ b/Changeset6190.diff @@ -0,0 +1,10 @@ +Index: branches/0.70-bugfixes/inc/rulesengine.class.php +=================================================================== +--- trunk/inc/rulesengine.class.php (revision 6127) ++++ branches/0.70-bugfixes/inc/rulesengine.class.php (revision 6190) +@@ -67,4 +67,5 @@ + $result = $DB->query($sql); + if ($result){ ++ $this->rule_list = array(); + while ($rule=$DB->fetch_array($result)) { + //For each rule, get a Rule object with all the criterias and actions diff --git a/glpi.spec b/glpi.spec index ca0b9ab..381f4ca 100644 --- a/glpi.spec +++ b/glpi.spec @@ -6,12 +6,12 @@ Name: glpi Version: 0.70 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Free IT asset management software Summary(fr): Gestion Libre de Parc Informatique Group: Applications/Internet -License: GPLv2 +License: GPLv2+ URL: http://www.glpi-project.org/ Source0: http://www.glpi-project.org/IMG/gz/%{name}-%{version}.tar.gz @@ -19,6 +19,8 @@ Source1: glpi-httpd.conf Source2: glpi-config_path.php Source3: glpi-logrotate +Patch0: Changeset6190.diff + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -59,6 +61,8 @@ techniciens grâce à une maintenance plus cohérente. %prep %setup -q -n glpi +%patch0 -p2 + mv lib/cache_lite/LICENSE LICENSE.cache_lite mv lib/phpmailer/LICENSE LICENSE.phpmailer mv lib/tiny_mce/license.txt LICENSE.tiny_mce @@ -71,7 +75,7 @@ mkdir selinux pushd selinux cat >%{name}.te <%{name}.fc < - 0.70-2 +- Changeset 6190 + * Fri Dec 21 2007 Remi Collet - 0.70-1 - 0.70 final