[glpi/el5/master] switch to system phpCas
Remi Collet
remi at fedoraproject.org
Thu Oct 28 06:29:06 UTC 2010
commit 3cf29e779fe8da2adae826dc03b515acb05daadb
Author: remi <fedora at famillecollet.com>
Date: Thu Oct 28 08:17:38 2010 +0200
switch to system phpCas
glpi.spec | 21 +++++++++++++--------
sources | 2 +-
2 files changed, 14 insertions(+), 9 deletions(-)
---
diff --git a/glpi.spec b/glpi.spec
index d6d18f7..1f2bd82 100644
--- a/glpi.spec
+++ b/glpi.spec
@@ -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 plus cohérente.
# 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_mce
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)
diff --git a/sources b/sources
index 759f3fc..42d842f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-778a2deafa249235ca105922f5fb6470 glpi-0.72.4-11035.tar.gz
+91c9aef1d7b886041fd802a49cf45893 glpi-0.72.4-11497.tar.gz
More information about the scm-commits
mailing list