rpms/glpi/F-10 glpi-config_path.php, 1.2, 1.3 glpi.spec, 1.23, 1.24 sources, 1.17, 1.18 glpi-check.patch, 1.1, NONE
Remi Collet
remi at fedoraproject.org
Wed Sep 9 16:21:34 UTC 2009
Author: remi
Update of /cvs/extras/rpms/glpi/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1348
Modified Files:
glpi-config_path.php glpi.spec sources
Removed Files:
glpi-check.patch
Log Message:
update to 0.72.21
Index: glpi-config_path.php
===================================================================
RCS file: /cvs/extras/rpms/glpi/F-10/glpi-config_path.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- glpi-config_path.php 12 Jul 2008 07:21:33 -0000 1.2
+++ glpi-config_path.php 9 Sep 2009 16:21:34 -0000 1.3
@@ -11,6 +11,8 @@ define("GLPI_SESSION_DIR", "/var/lib/
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");
+
+define("GLPI_CACHE_LITE_DIR", "Cache");
+define("GLPI_PHPMAILER_DIR", "PHPMailer");
?>
Index: glpi.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi/F-10/glpi.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- glpi.spec 2 Jun 2009 15:38:57 -0000 1.23
+++ glpi.spec 9 Sep 2009 16:21:34 -0000 1.24
@@ -1,11 +1,13 @@
%if %{?fedora}%{?rhel} >= 5
-%define useselinux 1
+%global useselinux 1
%else
-%define useselinux 0
+%global useselinux 0
%endif
+%global tarballversion 0.72.21
+
Name: glpi
-Version: 0.71.6
+Version: 0.72.2.1
Release: 1%{?dist}
Summary: Free IT asset management software
Summary(fr): Gestion Libre de Parc Informatique
@@ -13,26 +15,18 @@ Summary(fr): Gestion Libre de Parc In
Group: Applications/Internet
License: GPLv2+
URL: http://www.glpi-project.org/
-Source0: http://www.glpi-project.org/IMG/gz/%{name}-%{version}.tar.gz
+Source0: http://www.glpi-project.org/IMG/gz/%{name}-%{tarballversion}.tar.gz
Source1: glpi-httpd.conf
Source2: glpi-config_path.php
Source3: glpi-logrotate
-# Avoid SELinux AVC when testing write access to log file.
-# backport from 0.72 (Changeset 7208)
-Patch0: glpi-check.patch
-
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-Requires: php, php-mysql, httpd, php-gd, php-ldap, php-imap, php-mbstring
-%if 0%{?rhel} == 4
-Requires: php-domxml
-%else
-Requires: php-xml
+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
-%endif
+Requires: php-PHPMailer
Requires: %{_sysconfdir}/logrotate.d
Requires(postun): /sbin/service
Requires(post): /sbin/service
@@ -65,27 +59,25 @@ techniciens grâce à une maintenance pl
%prep
%setup -q -n glpi
-%patch0 -p0
-
-%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
+rm -rf lib/phpmailer
-%endif
+cp %{SOURCE2} config/config_path.php
-mv lib/phpmailer/LICENSE LICENSE.phpmailer
mv lib/tiny_mce/license.txt LICENSE.tiny_mce
-dos2unix -o LICENSE.phpmailer LICENSE.tiny_mce
-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
+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/COPYRIGHT LICENSE.phpcas
+mv lib/phpcas/README README.phpcas
+rm scripts/glpi_cron_curl.sh
+
+dos2unix -o LICENSE.tiny_mce
+for fic in LISEZMOI.txt README.txt
+do
+ iconv -f ISO-8859-15 -t UTF-8 $fic >a && mv a $fic
+done
cat >cron <<EOF
# GLPI core
@@ -103,9 +95,9 @@ rm -rf %{buildroot}
# ===== application =====
mkdir -p %{buildroot}/%{_datadir}/%{name}
-cp -a *.php *.js %{buildroot}/%{_datadir}/%{name}/
+cp -a COPYING.txt *.php *.js %{buildroot}/%{_datadir}/%{name}/
-for i in ajax css front help inc install lib locales pics plugins scripts
+for i in ajax css front inc install lib locales pics plugins scripts
do cp -ar $i %{buildroot}/%{_datadir}/%{name}/$i
done
@@ -164,10 +156,6 @@ rm -rf %{buildroot}
%post
%if %{useselinux}
(
-# 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_log_t -r s0 "%{_localstatedir}/log/glpi(/.*)?"
@@ -198,7 +186,7 @@ fi
%files -f %{name}.lang
%defattr(-,root,root,-)
-%doc *.txt LICENSE.*
+%doc *.txt LICENSE.* README.*
%attr(750,apache,root) %dir %{_sysconfdir}/%{name}
%ghost %config(noreplace,missingok) %{_sysconfdir}/%{name}/config_db.php
@@ -213,11 +201,12 @@ fi
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/*.php
%{_datadir}/%{name}/*.js
+# License file required by installation process
+%{_datadir}/%{name}/COPYING.txt
%{_datadir}/%{name}/ajax
%{_datadir}/%{name}/config
%{_datadir}/%{name}/css
%{_datadir}/%{name}/front
-%{_datadir}/%{name}/help
%{_datadir}/%{name}/inc
%{_datadir}/%{name}/install
%{_datadir}/%{name}/lib
@@ -229,6 +218,11 @@ fi
%changelog
+* Wed Sep 09 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.72.2.1-1
+- update to 0.72.21
+- use system PHPMailer
+- now requires php > 5
+
* Mon Jun 02 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.71.6-1
- update to 0.71.6 (Bugfix Release)
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glpi/F-10/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources 2 Jun 2009 15:38:57 -0000 1.17
+++ sources 9 Sep 2009 16:21:34 -0000 1.18
@@ -1 +1 @@
-d7137027c2a9f79cadd193bbe6ebab92 glpi-0.71.6.tar.gz
+495eacd40c30ccb9cd71e85f3af82009 glpi-0.72.21.tar.gz
--- glpi-check.patch DELETED ---
More information about the fedora-extras-commits
mailing list