rpms/glpi/devel .cvsignore, 1.8, 1.9 glpi-config_path.php, 1.1, 1.2 glpi-httpd.conf, 1.1, 1.2 glpi.spec, 1.14, 1.15 sources, 1.10, 1.11 glpi.patch, 1.2, NONE

[Remi Collet (remi)]

Author: remi

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

Modified Files:
	.cvsignore glpi-config_path.php glpi-httpd.conf glpi.spec 
	sources 
Removed Files:
	glpi.patch 
Log Message:
update to 0.71


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glpi/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	27 Jan 2008 18:19:14 -0000	1.8
+++ .cvsignore	12 Jul 2008 07:21:32 -0000	1.9
@@ -1 +1 @@
-glpi-0.70.2.tar.gz
+glpi-0.71.tar.gz


Index: glpi-config_path.php
===================================================================
RCS file: /cvs/extras/rpms/glpi/devel/glpi-config_path.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- glpi-config_path.php	9 Oct 2007 11:53:22 -0000	1.1
+++ glpi-config_path.php	12 Jul 2008 07:21:33 -0000	1.2
@@ -11,5 +11,6 @@
 define("GLPI_PLUGIN_DOC_DIR", "/var/lib/glpi/files/_plugins");
 define("GLPI_LOCK_DIR",       "/var/lib/glpi/files/_lock/");
 
+define("GLPI_CACHE_LITE_DIR", "Cache");
 define("GLPI_LOG_DIR",        "/var/log/glpi");
 ?>


Index: glpi-httpd.conf
===================================================================
RCS file: /cvs/extras/rpms/glpi/devel/glpi-httpd.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- glpi-httpd.conf	9 Oct 2007 11:53:22 -0000	1.1
+++ glpi-httpd.conf	12 Jul 2008 07:21:33 -0000	1.2
@@ -4,6 +4,8 @@
     Options None
     AllowOverride Limit Options FileInfo
 
+    php_value memory_limit 64M
+
     Order Deny,Allow
     Allow from all
 </Directory>


Index: glpi.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi/devel/glpi.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- glpi.spec	25 Apr 2008 18:44:27 -0000	1.14
+++ glpi.spec	12 Jul 2008 07:21:33 -0000	1.15
@@ -5,8 +5,8 @@
 %endif
 
 Name:           glpi
-Version:        0.70.2
-Release:        3%{?dist}
+Version:        0.71
+Release:        1%{?dist}
 Summary:        Free IT asset management software
 Summary(fr):    Gestion Libre de Parc Informatique
 
@@ -27,6 +27,7 @@
 Requires:       php-domxml
 %else
 Requires:       php-xml
+Requires:       php-pear(Cache_Lite) >= 1.7.4
 %endif
 Requires:       %{_sysconfdir}/logrotate.d
 Requires(postun): /sbin/service
@@ -58,7 +59,19 @@
 %prep
 %setup -q -n glpi
 
+%if 0%{?rhel} == 4
+
+# use bundled lib
 mv lib/cache_lite/LICENSE   LICENSE.cache_lite
+grep -v GLPI_CACHE_LITE_DIR %{SOURCE2} >config/config_path.php 
+
+%else
+
+# Use system lib
+rm -rf lib/cache_lite
+cp %{SOURCE2} config/config_path.php 
+
+%endif
 mv lib/phpmailer/LICENSE    LICENSE.phpmailer
 mv lib/tiny_mce/license.txt LICENSE.tiny_mce
 dos2unix -o LICENSE.phpmailer LICENSE.tiny_mce
@@ -90,7 +103,6 @@
 
 # ===== config =====
 cp -ar config %{buildroot}/%{_datadir}/%{name}/config
-install --mode 644 %{SOURCE2} %{buildroot}/%{_datadir}/%{name}/config/config_path.php
 
 mkdir -p %{buildroot}/%{_sysconfdir}/%{name}
 touch %{buildroot}%{_sysconfdir}/%{name}/config_db.php
@@ -132,12 +144,15 @@
 
 %post
 %if %{useselinux}
-# Remove Selinux policy (from previous packaging)
 (
+# Remove Selinux policy (from previous packaging)
 semodule -s targeted -r %{name} &>/dev/null
+# Remove old httpd_sys_script_rw_t
+semanage fcontext -d "%{_localstatedir}/log/glpi(/.*)?"
 # New File context
 semanage fcontext -a -s system_u -t httpd_sys_script_rw_t -r s0 "%{_sysconfdir}/glpi(/.*)?" 
-semanage fcontext -a -s system_u -t httpd_sys_script_rw_t -r s0 "%{_localstatedir}/log/glpi(/.*)?"
+semanage fcontext -a -s system_u -t httpd_log_t           -r s0 "%{_localstatedir}/log/glpi(/.*)?"
+# keep httpd_sys_script_rw_t (httpd_var_lib_t prevent dir creation)
 semanage fcontext -a -s system_u -t httpd_sys_script_rw_t -r s0 "%{_localstatedir}/lib/glpi(/.*)?"
 # files created by app
 restorecon -R %{_sysconfdir}/%{name}
@@ -193,6 +208,10 @@
 
 
 %changelog
+* Fri Jul 11 2008 Remi Collet <Fedora at FamilleCollet.com> - 0.71-1
+- update to 0.71 stable
+- fix bug #452353 (selinux)
+
 * Fri Apr 25 2008 Remi Collet <Fedora at FamilleCollet.com> - 0.70.2-3
 - remplace module policy by simple semanage (#442706)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glpi/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	28 Jan 2008 18:08:43 -0000	1.10
+++ sources	12 Jul 2008 07:21:33 -0000	1.11
@@ -1 +1 @@
-5e755472c887a54bc532569ec36add99  glpi-0.70.2.tar.gz
+9715471ac8e3be2a59f2888a180f26c2  glpi-0.71.tar.gz


--- glpi.patch DELETED ---