rpms/glpi/EL-6 glpi-config_path.php, 1.3, 1.4 glpi.spec, 1.30, 1.31 sources, 1.22, 1.23

[Remi Collet]

Author: remi

Update of /cvs/pkgs/rpms/glpi/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv11052

Modified Files:
	glpi-config_path.php glpi.spec sources 
Log Message:
use system phpCAS instead of bundled copy


Index: glpi-config_path.php
===================================================================
RCS file: /cvs/pkgs/rpms/glpi/EL-6/glpi-config_path.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- glpi-config_path.php	18 Aug 2009 15:36:30 -0000	1.3
+++ glpi-config_path.php	21 May 2010 17:23:56 -0000	1.4
@@ -13,6 +13,8 @@ define("GLPI_LOCK_DIR",       "/var/lib/
 
 define("GLPI_LOG_DIR",        "/var/log/glpi");
 
+// System libraries
 define("GLPI_CACHE_LITE_DIR", "Cache");
 define("GLPI_PHPMAILER_DIR",  "PHPMailer");
+define("GLPI_PHPCAS",         "CAS.php");
 ?>


Index: glpi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glpi/EL-6/glpi.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- glpi.spec	22 Mar 2010 19:22:28 -0000	1.30
+++ glpi.spec	21 May 2010 17:23:56 -0000	1.31
@@ -5,12 +5,12 @@
 %endif
 
 %global tarballversion 0.72.4
-%global svnrelease 11035
+%global svnrelease 11497
 
 Name:           glpi
 Version:        0.72.4
 %if 0%{?svnrelease}
-Release:        2.svn%{svnrelease}%{?dist}
+Release:        3.svn%{svnrelease}%{?dist}
 %else
 Release:        1%{?dist}
 %endif
@@ -21,13 +21,13 @@ Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://www.glpi-project.org/
 %if 0%{?svnrelease}
-# svn export -r 11035 https://forge.indepnet.net/svn/glpi/branches/0.72-bugfixes glpi
+# svn export -r 11497 https://forge.indepnet.net/svn/glpi/branches/0.72-bugfixes glpi
 # rm -rf glpi/tools
 # mv glpi/install/mysql/glpi-0.72.3-empty.sql .
-# rm glpi/install/mysql/*.sql
+# rm -f glpi/install/mysql/*.sql
 # mv glpi-0.72.3-empty.sql glpi/install/mysql/
-# tar czf glpi-0.72.4-11035.tar.gz glpi
-Source0:        glpi-0.72.4-11035.tar.gz
+# tar czf glpi-0.72.4-11497.tar.gz glpi
+Source0:        glpi-0.72.4-%{svnrelease}.tar.gz
 %else
 Source0:        https://forge.indepnet.net/attachments/download/597/glpi-0.72.4.tar.gz
 %endif
@@ -42,6 +42,7 @@ BuildArch:      noarch
 Requires:       php >= 5.0.0, php-mysql, httpd, php-gd, php-ldap, php-imap, php-mbstring, php-xml, php-json
 Requires:       php-pear(Cache_Lite) >= 1.7.4
 Requires:       php-PHPMailer
+Requires:       php-pear-CAS >= 1.1.0
 Requires:       %{_sysconfdir}/logrotate.d
 Requires(postun): /sbin/service
 Requires(post): /sbin/service
@@ -77,6 +78,7 @@ techniciens grâce à une maintenance pl
 # Use system lib
 rm -rf lib/cache_lite
 rm -rf lib/phpmailer
+rm -rf lib/phpcas
 
 cp %{SOURCE2} config/config_path.php 
 
@@ -84,7 +86,6 @@ mv lib/tiny_mce/license.txt LICENSE.tiny
 mv lib/extjs/license.txt    LICENSE.extjs
 rm lib/extjs/{CHANGES.html,INCLUDE_ORDER.txt}
 mv lib/icalcreator/lgpl.txt LICENSE.icalcreator
-mv lib/phpcas/README        README.phpcas
 rm scripts/glpi_cron_*.sh
 
 dos2unix -o LICENSE.tiny_mce
@@ -200,7 +201,7 @@ fi
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc *.txt LICENSE.* README.phpcas
+%doc *.txt LICENSE.*
 
 %attr(750,apache,root) %dir %{_sysconfdir}/%{name}
 %ghost %config(noreplace,missingok) %{_sysconfdir}/%{name}/config_db.php
@@ -232,6 +233,10 @@ fi
 
 
 %changelog
+* Thu May 20 2010 Remi Collet <Fedora at FamilleCollet.com> - 0.72.4-3.svn11497
+- use system phpCAS instead of bundled copy
+- minor bug fixes from SVN
+
 * Mon Mar 22 2010 Remi Collet <Fedora at FamilleCollet.com> - 0.72.4-2.svn11035
 - update embedded phpCAS to 1.1.0RC7 (security fix - #575906)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glpi/EL-6/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	22 Mar 2010 19:22:28 -0000	1.22
+++ sources	21 May 2010 17:23:56 -0000	1.23
@@ -1 +1 @@
-778a2deafa249235ca105922f5fb6470  glpi-0.72.4-11035.tar.gz
+91c9aef1d7b886041fd802a49cf45893  glpi-0.72.4-11497.tar.gz