rpms/glpi/devel Changeset6190.diff,NONE,1.1 glpi.spec,1.5,1.6

[Remi Collet (remi)]

Author: remi

Update of /cvs/extras/rpms/glpi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31311

Modified Files:
	glpi.spec 
Added Files:
	Changeset6190.diff 
Log Message:
add memory leak patch

Changeset6190.diff:

--- NEW FILE Changeset6190.diff ---
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


Index: glpi.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi/devel/glpi.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- glpi.spec	21 Dec 2007 22:07:21 -0000	1.5
+++ glpi.spec	28 Dec 2007 21:14:50 -0000	1.6
@@ -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 @@
 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 @@
 %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 @@
 pushd selinux
 
 cat >%{name}.te <<EOF
-policy_module(%{name},0.69.1)
+policy_module(%{name},0.70)
 require {
   type httpd_sys_content_t;
   type httpd_log_t;
@@ -84,6 +88,7 @@
 %{_localstatedir}/log/%{name}(/.*)?   system_u:object_r:httpd_sys_content_t:s0
 %{_localstatedir}/lib/%{name}(/.*)?   system_u:object_r:httpd_sys_content_t:s0
 EOF
+popd
 %endif
 
 
@@ -234,6 +239,9 @@
 %endif
 
 %changelog
+* Fri Dec 28 2007 Remi Collet <Fedora at FamilleCollet.com> - 0.70-2
+- Changeset 6190
+
 * Fri Dec 21 2007 Remi Collet <Fedora at FamilleCollet.com> - 0.70-1
 - 0.70 final