rpms/glpi/F-9 glpi-httpd.conf, 1.2, 1.3 glpi.spec, 1.15, 1.16 sources, 1.11, 1.12

Remi Collet (remi) fedora-extras-commits at redhat.com
Fri Aug 1 16:45:05 UTC 2008


Author: remi

Update of /cvs/extras/rpms/glpi/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31676

Modified Files:
	glpi-httpd.conf glpi.spec sources 
Log Message:
update to 0.71.1 - bugfix


Index: glpi-httpd.conf
===================================================================
RCS file: /cvs/extras/rpms/glpi/F-9/glpi-httpd.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- glpi-httpd.conf	12 Jul 2008 07:30:27 -0000	1.2
+++ glpi-httpd.conf	1 Aug 2008 16:44:35 -0000	1.3
@@ -10,6 +10,14 @@
     Allow from all
 </Directory>
 
+<Directory /usr/share/glpi/install>
+
+    # 15" should be enough for migration in most case
+    php_value max_execution_time 900
+    php_value memory_limit 128M
+
+</Directory>
+
 <Directory /usr/share/glpi/config>
     Order Allow,Deny
     Deny from all


Index: glpi.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi/F-9/glpi.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- glpi.spec	12 Jul 2008 07:30:27 -0000	1.15
+++ glpi.spec	1 Aug 2008 16:44:35 -0000	1.16
@@ -5,7 +5,7 @@
 %endif
 
 Name:           glpi
-Version:        0.71
+Version:        0.71.1
 Release:        1%{?dist}
 Summary:        Free IT asset management software
 Summary(fr):    Gestion Libre de Parc Informatique
@@ -36,6 +36,8 @@
 %if %{useselinux}
 Requires:       policycoreutils
 %endif
+Requires:       %{_sysconfdir}/cron.d
+
 
 %description
 GLPI is the Information Resource-Manager with an additional Administration-
@@ -78,6 +80,12 @@
 iconv -f ISO-8859-15 -t UTF-8 LISEZMOI.txt >a && mv a LISEZMOI.txt
 iconv -f ISO-8859-15 -t UTF-8 README.txt   >a && mv a README.txt
 
+cat >cron <<EOF
+# GLPI core
+# Run cron from to execute task even when no user connected
+*/4 * * * * apache %{_bindir}/php %{_datadir}/%{name}/front/cron.php
+EOF
+
 
 %build
 # empty build
@@ -118,6 +126,10 @@
 mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
 install -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
 
+# ====== Cron =====
+mkdir -p %{buildroot}%{_sysconfdir}/cron.d
+install -m 644 cron %{buildroot}%{_sysconfdir}/cron.d/%{name}
+
 # cleanup
 find %{buildroot} -name remove.txt -exec rm -f {} \; -print
 
@@ -185,7 +197,9 @@
 %ghost %config(noreplace,missingok) %{_sysconfdir}/%{name}/config_db.php
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/glpi.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
+%config(noreplace) %{_sysconfdir}/cron.d/%{name}
 
+# This folder can contain private information (sessions, docs, ...)
 %dir %_localstatedir/lib/%{name}
 %attr(750,apache,root) %{_localstatedir}/lib/%{name}/files
 
@@ -208,6 +222,11 @@
 
 
 %changelog
+* Fri Aug 01 2008 Remi Collet <Fedora at FamilleCollet.com> - 0.71.1-1
+- update to 0.71.1 bugfix
+- use system cron
+- increase memory_limit / max_execution_time for upgrade
+
 * Fri Jul 11 2008 Remi Collet <Fedora at FamilleCollet.com> - 0.71-1
 - update to 0.71 stable
 - fix bug #452353 (selinux)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glpi/F-9/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	12 Jul 2008 07:30:27 -0000	1.11
+++ sources	1 Aug 2008 16:44:35 -0000	1.12
@@ -1 +1 @@
-9715471ac8e3be2a59f2888a180f26c2  glpi-0.71.tar.gz
+b490c23a0fe5388da6ad6bcb51b65e0f  glpi-0.71.1.tar.gz




More information about the fedora-extras-commits mailing list