diff options
| -rw-r--r-- | glpi-0.85-config_path.php | 35 | ||||
| -rw-r--r-- | glpi-0.85-cron.patch | 28 | ||||
| -rw-r--r-- | glpi-dev.spec | 623 | ||||
| -rw-r--r-- | glpi.spec | 44 |
4 files changed, 28 insertions, 702 deletions
diff --git a/glpi-0.85-config_path.php b/glpi-0.85-config_path.php deleted file mode 100644 index eca3801..0000000 --- a/glpi-0.85-config_path.php +++ /dev/null @@ -1,35 +0,0 @@ -<?php -// for Redhat/Fedora RPM defaults - -// Config -define('GLPI_CONFIG_DIR', '/etc/glpi'); - -// Runtime Data -define('GLPI_DOC_DIR', '/var/lib/glpi/files'); -define('GLPI_DUMP_DIR', '/var/lib/glpi/files/_dumps'); -define('GLPI_CACHE_DIR', '/var/lib/glpi/files/_cache/'); -define('GLPI_CRON_DIR', '/var/lib/glpi/files/_cron'); -define('GLPI_SESSION_DIR', '/var/lib/glpi/files/_sessions'); -define('GLPI_PLUGIN_DOC_DIR', '/var/lib/glpi/files/_plugins'); -define('GLPI_LOCK_DIR', '/var/lib/glpi/files/_lock'); -define('GLPI_GRAPH_DIR', '/var/lib/glpi/files/_graphs'); -define('GLPI_TMP_DIR', '/var/lib/glpi/files/_tmp'); -define('GLPI_RSS_DIR', '/var/lib/glpi/files/_rss'); -define('GLPI_UPLOAD_DIR', '/var/lib/glpi/files/_uploads'); -define('GLPI_PICTURE_DIR', '/var/lib/glpi/files/_pictures'); - -// Log -define('GLPI_LOG_DIR', '/var/log/glpi'); - -// System libraries -define('GLPI_PHPMAILER_DIR', '/usr/share/php/PHPMailer'); -define('GLPI_EZC_BASE', '/usr/share/php/ezc/Base/base.php'); -define('GLPI_PHPCAS', '/usr/share/pear/CAS.php'); -define('GLPI_HTMLAWED', '/usr/share/php/htmLawed/htmLawed.php'); -define('GLPI_ZEND_PATH', '/usr/share/php/Zend'); -define('GLPI_SIMPLEPIE_PATH', '/usr/share/php/php-simplepie'); -define('GLPI_TCPDF_DIR', '/usr/share/php/tcpdf'); -define('GLPI_PASSWORD_COMPAT','/usr/share/php/password_compat/password.php'); - -// Fonts -define('GLPI_FONT_FREESANS', '/usr/share/fonts/gnu-free/FreeSans.ttf'); diff --git a/glpi-0.85-cron.patch b/glpi-0.85-cron.patch deleted file mode 100644 index a84650c..0000000 --- a/glpi-0.85-cron.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -up install/install.php.rpm install/install.php ---- install/install.php.rpm 2014-12-17 13:36:22.420558338 +0100 -+++ install/install.php 2014-12-17 13:38:45.278209044 +0100 -@@ -347,6 +347,10 @@ function step4 ($databasename, $newdatab - $query = "UPDATE `glpi_users` - SET `language` = NULL"; - $DB->queryOrDie($query, "4203"); -+ -+ // RPM provides a good system cron -+ $query = "UPDATE `glpi_crontasks` SET `mode`=2 WHERE `name`!='watcher' AND (`allowmode` & 2)"; -+ $DB->queryOrDie($query, "4203"); - } - - //Check if the port is in url -diff -up install/update.php.rpm install/update.php ---- install/update.php.rpm 2014-12-11 14:16:55.000000000 +0100 -+++ install/update.php 2014-12-17 13:36:22.420558338 +0100 -@@ -808,6 +808,10 @@ function updateDbUpTo031() { - $plugin = new Plugin(); - $plugin->unactivateAll(); - -+ // RPM provides a good system cron -+ $query = "UPDATE `glpi_crontasks` SET `mode`=2 WHERE `name`!='watcher' AND (`allowmode` & 2)"; -+ $DB->queryOrDie($query); -+ - DBmysql::optimize_tables($migration); - - return $ret; diff --git a/glpi-dev.spec b/glpi-dev.spec deleted file mode 100644 index a941e95..0000000 --- a/glpi-dev.spec +++ /dev/null @@ -1,623 +0,0 @@ -# Fedora/remirepo spec file for glpi -# -# Copyright (c) 2007-2015 Remi Collet -# License: CC-BY-SA -# http://creativecommons.org/licenses/by-sa/4.0/ -# -# Please, preserve the changelog entries -# - -%if 0%{?fedora} < 20 -# See https://bugzilla.redhat.com/1033025 -# selinux-policy : Please include policy for GLPI -%global useselinux 1 -%else -# System policy includes GLPI rules -%global useselinux 0 -%endif - -%if 0%{?fedora} >= 21 -# nginx 1.6 with nginx-filesystem -%global with_nginx 1 -# httpd 2.4 with httpd-filesystem -%global with_httpd 1 -%else -%global with_nginx 0 -%global with_httpd 0 -%endif - -Name: glpi -Version: 0.90.1 -Release: 3%{?dist} -Summary: Free IT asset management software -Summary(fr): Gestion Libre de Parc Informatique - -Group: Applications/Internet -License: GPLv2+ and GPLv3+ -URL: http://www.glpi-project.org/ -# Upstream sources (not the github auto-generated archive) -Source0: https://github.com/glpi-project/%{name}/releases/download/%{version}%{?prever}/glpi-%{version}%{?prever}.tar.gz - -Source1: glpi-httpd.conf -Source2: glpi-0.90-config_path.php -Source3: glpi-logrotate -Source4: glpi-nginx.conf - -# Switch all internal cron tasks to system -Patch0: glpi-0.90-cron.patch -# Fix autoloader -Patch1: glpi-0.90-autoload.patch - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch -BuildRequires: gettext - -%if %{with_nginx} -Requires: nginx-filesystem -%endif -%if %{with_httpd} -Requires: httpd-filesystem -%endif -%if %{with_httpd} || %{with_nginx} -Requires: webserver -Requires: php(httpd) -%else -Requires: httpd, mod_php -%endif -Requires: php(language) >= 5.4 -Requires: php-date -Requires: php-gd -Requires: php-fileinfo -Requires: php-imap -Requires: php-json -Requires: php-ldap -Requires: php-mbstring -Requires: php-mysqli -Requires: php-pcre -Requires: php-session -Requires: php-xml -Requires: php-PHPMailer -Requires: php-tcpdf -Requires: php-pear-CAS >= 1.2.0 -Requires: php-htmLawed -Requires: php-simplepie -Requires: php-composer(zendframework/zend-cache) -Requires: php-composer(zendframework/zend-i18n) -Requires: php-composer(zendframework/zend-loader) -Requires: php-composer(zendframework/zend-version) -Requires: php-composer(ircmaxell/password-compat) -%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6 -Requires: php-composer(zetacomponents/graph) -Requires: gnu-free-sans-fonts -%else -Requires: freefont -%endif -Requires: %{_sysconfdir}/logrotate.d -Requires(postun): /sbin/service -Requires(post): /sbin/service -%if %{useselinux} -Requires(post): /sbin/restorecon -Requires(post): /usr/sbin/semanage -Requires(postun): /usr/sbin/semanage -%endif -Requires: crontabs - - -%description -GLPI is the Information Resource-Manager with an additional Administration- -Interface. You can use it to build up a database with an inventory for your -company (computer, software, printers...). It has enhanced functions to make -the daily life for the administrators easier, like a job-tracking-system with -mail-notification and methods to build a database with basic information -about your network-topology. - - -%description -l fr -GLPI est une application libre, distribuée sous licence GPL destinée à la -gestion de parc informatique et de helpdesk. - -GLPI est composé d’un ensemble de services web écrits en PHP qui permettent -de recenser et de gérer l’intégralité des composantes matérielles ou -logicielles d’un parc informatique, et ainsi d’optimiser le travail des -techniciens grâce à une maintenance plus cohérente. - - -%prep -%setup -q -n glpi - -%patch0 -p0 -%patch1 -p0 - -find . -name \*.orig -exec rm {} \; -print - -# Drop bundled Flash files -find lib -name \*.swf -exec rm {} \; -print - -# Use system lib -rm -rf lib/phpmailer -rm -rf lib/phpcas -rm -rf lib/htmlawed -rm -rf lib/Zend -rm -rf lib/simplepie -rm -rf lib/tcpdf -rm -rf lib/password_compat -%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6 -rm -rf lib/zeta -%endif -rm -rf lib/FreeSans.ttf -: bundled JS libraries -ls lib - -%if 0%{?fedora} < 9 && 0%{?rhel} < 6 -# fix font path on old version -sed -e '/GLPI_FONT_FREESANS/s/gnu-free/freefont/' \ - %{SOURCE2} >config/config_path.php -%else -cp %{SOURCE2} config/config_path.php -%endif - -mv lib/tiny_mce/license.txt LICENSE.tiny_mce -mv lib/icalcreator/lgpl.txt LICENSE.icalcreator -rm scripts/glpi_cron_*.sh - -sed -i -e 's/\r//' 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 -# Run cron to execute task even when no user connected -* * * * * apache %{_bindir}/php %{_datadir}/%{name}/front/cron.php -EOF - - -%build -# Regenerate the locales -for po in locales/*.po -do - msgfmt $po -o $(dirname $po)/$(basename $po .po).mo -done - - -%install -rm -rf %{buildroot} - -# ===== application ===== -mkdir -p %{buildroot}/%{_datadir}/%{name} -cp -a COPYING.txt *.php *.js %{buildroot}/%{_datadir}/%{name}/ - -for i in ajax css front inc install lib locales pics plugins scripts -do cp -ar $i %{buildroot}/%{_datadir}/%{name}/$i -done - -find %{buildroot}/%{_datadir}/%{name} -type f -exec chmod 644 {} \; - -# ===== apache ===== -install -Dpm 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/httpd/conf.d/glpi.conf - -# ===== Nginx ===== -%if %{with_nginx} -install -Dpm 0644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/nginx/default.d/glpi.conf -%endif - -# ===== config ===== -cp -ar config %{buildroot}/%{_datadir}/%{name}/config - -mkdir -p %{buildroot}/%{_sysconfdir}/%{name} -touch %{buildroot}%{_sysconfdir}/%{name}/config_db.php - -# ===== files ===== -mkdir -p %{buildroot}/%{_localstatedir}/lib/%{name} -cp -ar files %{buildroot}/%{_localstatedir}/lib/%{name}/files - -# ===== log ===== -mkdir -p %{buildroot}%{_localstatedir}/log -mv %{buildroot}/%{_localstatedir}/lib/%{name}/files/_log %{buildroot}%{_localstatedir}/log/%{name} - -install -Dpm 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} - -# ====== Cron ===== -install -Dpm 0644 cron %{buildroot}%{_sysconfdir}/cron.d/%{name} - -# cleanup -find %{buildroot} -name remove.txt -exec rm -f {} \; -print - -# Directories not in apache space -rm -f %{buildroot}%{_localstatedir}/lib/%{name}/files/.htaccess -# Proctection in /etc/httpd/conf.d/glpi.conf -rm -f %{buildroot}%{_datadir}/%{name}/install/mysql/.htaccess -rm -f %{buildroot}%{_datadir}/%{name}/locales/.htaccess -rm -f %{buildroot}%{_datadir}/%{name}/config/.htaccess -rm -f %{buildroot}%{_datadir}/%{name}/scripts/.htaccess - - -# Lang -for i in %{buildroot}%{_datadir}/%{name}/locales/* -do - lang=$(basename $i) - echo "%lang(${lang:0:2}) %{_datadir}/%{name}/locales/${lang}" -done >%{name}.lang - - -%clean -rm -rf %{buildroot} - - -%post -%if %{useselinux} -( -# New File context -%if 0%{?rhel} == 5 -semanage fcontext -a -s system_u -t httpd_sys_script_rw_t -r s0 "%{_sysconfdir}/%{name}(/.*)?" -semanage fcontext -a -s system_u -t httpd_sys_script_rw_t -r s0 "%{_localstatedir}/lib/%{name}(/.*)?" -%else -semanage fcontext -a -s system_u -t httpd_sys_rw_content_t -r s0 "%{_sysconfdir}/%{name}(/.*)?" -semanage fcontext -a -s system_u -t httpd_var_lib_t -r s0 "%{_localstatedir}/lib/%{name}(/.*)?" -%endif -semanage fcontext -a -s system_u -t httpd_sys_content_t -r s0 "%{_datadir}/%{name}(/.*)?" -semanage fcontext -a -s system_u -t httpd_log_t -r s0 "%{_localstatedir}/log/%{name}(/.*)?" -# files created by app -restorecon -R %{_sysconfdir}/%{name} -restorecon -R %{_datadir}/%{name} -restorecon -R %{_localstatedir}/lib/%{name} -restorecon -R %{_localstatedir}/log/%{name} -) &>/dev/null -%endif -/sbin/service httpd condrestart > /dev/null 2>&1 || : - - -%postun -%if %{useselinux} -if [ "$1" -eq "0" ]; then - # Remove the File Context - ( - semanage fcontext -d "%{_sysconfdir}/%{name}(/.*)?" - semanage fcontext -d "%{_datadir}/%{name}(/.*)?" - semanage fcontext -d "%{_localstatedir}/log/%{name}(/.*)?" - semanage fcontext -d "%{_localstatedir}/lib/%{name}(/.*)?" - ) &>/dev/null -fi -%endif -/sbin/service httpd condrestart > /dev/null 2>&1 || : - - -%files -f %{name}.lang -%defattr(-,root,root,-) -%doc *.txt LICENSE.* - -%attr(770,root,apache) %dir %{_sysconfdir}/%{name} -%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} -%if %{with_nginx} -%config(noreplace) %{_sysconfdir}/nginx/default.d/glpi.conf -%endif - -# This folder can contain private information (sessions, docs, ...) -%dir %_localstatedir/lib/%{name} -%attr(770,root,apache) %{_localstatedir}/lib/%{name}/files - -%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}/inc -%{_datadir}/%{name}/install -%{_datadir}/%{name}/lib -%{_datadir}/%{name}/pics -%{_datadir}/%{name}/plugins -%{_datadir}/%{name}/scripts -%attr(770,root,apache) %dir %{_localstatedir}/log/%{name} -%dir %{_datadir}/%{name}/locales - - -%changelog -* Thu Feb 18 2016 Remi Collet <remi@fedoraproject.org> - 0.90.1-3 -- fix Zend autoloader (to allow ZF 2.5) - -* Fri Nov 27 2015 Remi Collet <remi@fedoraproject.org> - 0.90.1-1 -- update to 0.90.1 - -* Thu Oct 8 2015 Remi Collet <remi@fedoraproject.org> - 0.90-1 -- update to 0.90 - -* Tue Oct 6 2015 Remi Collet <remi@fedoraproject.org> - 0.90-0.1.RC2 -- update to 0.90-RC2 - -* Wed Sep 16 2015 Remi Collet <remi@fedoraproject.org> - 0.85.5-1 -- update to 0.85.5 - https://github.com/glpi-project/glpi/issues?q=milestone:0.85.5 -- use system ircmaxell/password-compat - -* Wed Jun 3 2015 Remi Collet <remi@fedoraproject.org> - 0.85.4-2 -- switch from eZ component to Zeta component - -* Mon May 4 2015 Remi Collet <remi@fedoraproject.org> - 0.85.4-1 -- update to 0.85.4 - https://forge.indepnet.net/versions/1136 -- fix SELinux context on EL-5 - -* Fri Apr 17 2015 Remi Collet <remi@fedoraproject.org> - 0.85.3-1 -- update to 0.85.3 - https://forge.indepnet.net/versions/1118 - -* Fri Feb 27 2015 Remi Collet <remi@fedoraproject.org> - 0.85.2-2 -- add security fix https://forge.indepnet.net/issues/5218 -- add fix for temporary directory relocation - -* Wed Jan 21 2015 Remi Collet <remi@fedoraproject.org> - 0.85.2-1 -- update to 0.85.2 - https://forge.indepnet.net/versions/1110 - -* Mon Dec 22 2014 Remi Collet <remi@fedoraproject.org> - 0.85.1-2 -- increase system cron frequency and limit -- cleanup patched files - -* Wed Dec 17 2014 Remi Collet <remi@fedoraproject.org> - 0.85.1-1 -- update to 0.85.1 - 0.85 https://forge.indepnet.net/versions/539 - 0.85.1 https://forge.indepnet.net/versions/1071 -- drop dependency on pear/Cache_Lite -- add dependency on php-tcpdf - -* Fri Nov 7 2014 Remi Collet <remi@fedoraproject.org> - 0.84.8-2 -- use httpd_var_lib_t selinux context for /var/lib/glpi -- don't rely on system selinux policy in EPEL-7 -- fix apache configuration when mod_php not enabled - -* Fri Oct 17 2014 Remi Collet <remi@fedoraproject.org> - 0.84.8-1 -- update to 0.84.8 - https://forge.indepnet.net/versions/1072 - -* Sun Oct 5 2014 Remi Collet <remi@fedoraproject.org> - 0.84.7-2 -- provide nginx configuration (Fedora >= 21) -- rely on system SELinux policy (Fedora >= 20, EPEL-7) - -* Fri Jul 11 2014 Remi Collet <remi@fedoraproject.org> - 0.84.7-1 -- update to 0.84.7 - https://forge.indepnet.net/versions/1068 - -* Wed Jun 18 2014 Remi Collet <remi@fedoraproject.org> - 0.84.6-1 -- update to 0.84.6 - https://forge.indepnet.net/versions/1028 - -* Wed Feb 26 2014 Remi Collet <remi@fedoraproject.org> - 0.84.5-1 -- update to 0.84.5 - https://forge.indepnet.net/projects/glpi/versions/1011 - -* Wed Jan 22 2014 Remi Collet <remi@fedoraproject.org> - 0.84.4-1 -- update to 0.84.4 - https://forge.indepnet.net/projects/glpi/versions/993 - -* Thu Nov 21 2013 Remi Collet <remi@fedoraproject.org> - 0.84.3-2 -- fix SELinux context #1032995 - use httpd_sys_rw_content_t instead of httpd_sys_script_rw_t - -* Sun Nov 3 2013 Remi Collet <remi@fedoraproject.org> - 0.84.3-1 -- update to 0.84.3 - https://forge.indepnet.net/projects/glpi/versions/973 - -* Wed Oct 2 2013 Remi Collet <remi@fedoraproject.org> - 0.84.2-1 -- update to 0.84.2 -- add upstream patch for Zend autoload -- use system ZendFramework2 and SimplePie - -* Thu Sep 12 2013 Remi Collet <remi@fedoraproject.org> - 0.83.9.1-4 -- restrict access for install to local for security - -* Fri Aug 23 2013 Remi Collet <remi@fedoraproject.org> - 0.83.9.1-3 -- drop bundled Flash files files, #1000251 - -* Sat Jul 27 2013 Jóhann B. Guðmundsson <johannbg@fedoraproject.org> - 0.83.9.1-2 -- Add a missing requirement on crontabs to spec file - -* Tue Jun 25 2013 Remi Collet <remi@fedoraproject.org> - 0.83.9.1-1 -- version 0.83.91 released (security) - https://forge.indepnet.net/versions/show/928 - -* Thu Jun 20 2013 Remi Collet <remi@fedoraproject.org> - 0.83.9-1 -- version 0.83.9 released (security and bugfix) - https://forge.indepnet.net/projects/glpi/versions/915 - -* Tue Apr 2 2013 Remi Collet <remi@fedoraproject.org> - 0.83.8-1 -- version 0.83.8 released (bugfix) - https://forge.indepnet.net/projects/glpi/versions/866 - -* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.83.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Tue Dec 4 2012 Remi Collet <remi@fedoraproject.org> - 0.83.7-1 -- version 0.83.7 released (bugfix) - https://forge.indepnet.net/projects/glpi/versions/843 - -* Tue Oct 16 2012 Remi Collet <remi@fedoraproject.org> - 0.83.6-1 -- version 0.83.6 released (bugfix) - https://forge.indepnet.net/projects/glpi/versions/841 - -* Tue Oct 9 2012 Remi Collet <remi@fedoraproject.org> - 0.83.5-1 -- version 0.83.5 released (bugfix) - https://forge.indepnet.net/projects/glpi/versions/800 - -* Fri Jul 27 2012 Remi Collet <remi@fedoraproject.org> - 0.83.4-1 -- version 0.83.4 released (bugfix) - https://forge.indepnet.net/projects/glpi/versions/777 - -* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.83.3.1-1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Thu Jul 12 2012 Remi Collet <remi@fedoraproject.org> - 0.83.3.1-1 -- version 0.83.3 released (bugfix + security) - https://forge.indepnet.net/projects/glpi/versions/771 -- new dependency on htmLawed - -* Thu May 31 2012 Remi Collet <remi@fedoraproject.org> - 0.83.2-1 -- version 0.83.2 released - https://forge.indepnet.net/projects/glpi/versions/750 - -* Thu Apr 19 2012 Remi Collet <remi@fedoraproject.org> - 0.83.1-2 -- fix cron patch - -* Wed Apr 18 2012 Remi Collet <remi@fedoraproject.org> - 0.83.1-1 -- version 0.83.1 released - 0.83.1 https://forge.indepnet.net/projects/glpi/versions/696 - 0.83 https://forge.indepnet.net/projects/glpi/versions/538 -- adapt config for httpd 2.4 - -* Thu Feb 09 2012 Remi Collet <remi@fedoraproject.org> - 0.80.7-1 -- version 0.80.7 released (security) - https://forge.indepnet.net/projects/glpi/versions/685 - -* Thu Jan 05 2012 Remi Collet <remi@fedoraproject.org> - 0.80.6.1-1 -- version 0.80.61 released (bugfix) - https://forge.indepnet.net/projects/glpi/versions/677 - -* Thu Jan 05 2012 Remi Collet <remi@fedoraproject.org> - 0.80.6-1 -- version 0.80.6 released (bugfix) - https://forge.indepnet.net/projects/glpi/versions/657 -- add patch for https://forge.indepnet.net/issues/3299 - -* Wed Nov 30 2011 Remi Collet <remi@fedoraproject.org> - 0.80.5-1 -- version 0.80.5 released (bugfix) - 0.80.5 https://forge.indepnet.net/projects/glpi/versions/643 - 0.80.4 https://forge.indepnet.net/projects/glpi/versions/632 - 0.80.3 https://forge.indepnet.net/projects/glpi/versions/621 - 0.80.2 https://forge.indepnet.net/projects/glpi/versions/605 - 0.80.1 https://forge.indepnet.net/projects/glpi/versions/575 - 0.80 https://forge.indepnet.net/projects/glpi/versions/466 -- increase cron run frequency (3 tasks each 3 minutes) - -* Sun Jul 24 2011 Remi Collet <Fedora@FamilleCollet.com> - 0.78.5-3.svn14966 -- use system EZC only if available (not in EL-5) - -* Fri Jul 22 2011 Remi Collet <Fedora@FamilleCollet.com> - 0.78.5-2.svn14966 -- bug and security fix from SVN. - -* Sat Jun 11 2011 Remi Collet <Fedora@FamilleCollet.com> - 0.78.5-1 -- version 0.78.5 released - -* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.72.4-4.svn11497 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Thu May 20 2010 Remi Collet <Fedora@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@FamilleCollet.com> - 0.72.4-2.svn11035 -- update embedded phpCAS to 1.1.0RC7 (security fix - #575906) - -* Tue Mar 2 2010 Remi Collet <Fedora@FamilleCollet.com> - 0.72.4-1 -- update to 0.72.4 - -* Tue Oct 27 2009 Remi Collet <Fedora@FamilleCollet.com> - 0.72.3-1 -- update to 0.72.3 - -* Wed Sep 09 2009 Remi Collet <Fedora@FamilleCollet.com> - 0.72.2.1-1 -- update to 0.72.21 - -* Tue Aug 18 2009 Remi Collet <Fedora@FamilleCollet.com> - 0.72.1-1.svn8743 -- update to 0.72.1 svn revision 8743 -- use system PHPMailer -- now requires php > 5 - -* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.71.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Tue Jun 02 2009 Remi Collet <Fedora@FamilleCollet.com> - 0.71.6-1 -- update to 0.71.6 (Bugfix Release) - -* Fri May 22 2009 Remi Collet <Fedora@FamilleCollet.com> - 0.71.5-4 -- post 0.71.5 patches (7910=>8321) - -* Sun Apr 26 2009 Remi Collet <Fedora@FamilleCollet.com> - 0.71.5-3 -- post 0.71.5 patches (7910=>8236) - -* Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.71.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Mon Jan 26 2009 Remi Collet <Fedora@FamilleCollet.com> - 0.71.5-1 -- update to 0.71.5 (Fix regression in 0.71.4) - -* Mon Jan 26 2009 Remi Collet <Fedora@FamilleCollet.com> - 0.71.4-1 -- update to 0.71.4 (Security Release) - -* Sun Nov 30 2008 Remi Collet <Fedora@FamilleCollet.com> - 0.71.3-1 -- update to 0.71.3 (bugfix release) - -* Sun Sep 28 2008 Remi Collet <Fedora@FamilleCollet.com> - 0.71.2-1.el4.1 -- Fix MySQL 4.1 compatibility issue - -* Mon Sep 15 2008 Remi Collet <Fedora@FamilleCollet.com> - 0.71.2-1 -- update to 0.71.2 bugfix - -* Sat Aug 09 2008 Remi Collet <Fedora@FamilleCollet.com> - 0.71.1-2 -- fix SElinux bug on install test (glpi-check.patch) -- add create option on logrotate conf - -* Fri Aug 01 2008 Remi Collet <Fedora@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@FamilleCollet.com> - 0.71-1 -- update to 0.71 stable -- fix bug #452353 (selinux) - -* Fri Apr 25 2008 Remi Collet <Fedora@FamilleCollet.com> - 0.70.2-3 -- remplace module policy by simple semanage (#442706) - -* Mon Jan 28 2008 Remi Collet <Fedora@FamilleCollet.com> - 0.70.2-2 -- rebuild (fix sources tarball) - -* Sun Jan 27 2008 Remi Collet <Fedora@FamilleCollet.com> - 0.70.2-1 -- bugfixes update - -* Tue Jan 15 2008 Remi Collet <Fedora@FamilleCollet.com> - 0.70.1a-1 -- update - -* Sun Jan 13 2008 Remi Collet <Fedora@FamilleCollet.com> - 0.70.1-2 -- fix typo in lang files - -* Sun Jan 13 2008 Remi Collet <Fedora@FamilleCollet.com> - 0.70.1-1 -- update to 0.70.1 (0.70 + bugfixes) - -* Thu Jan 03 2008 Remi Collet <Fedora@FamilleCollet.com> - 0.70-4 -- Changeset 6226 + 6228 -- disable SELinux in EL-5 - -* Sat Dec 29 2007 Remi Collet <Fedora@FamilleCollet.com> - 0.70-3 -- Changeset 6191 + 6194 + 6196 - -* Fri Dec 28 2007 Remi Collet <Fedora@FamilleCollet.com> - 0.70-2 -- Changeset 6190 - -* Fri Dec 21 2007 Remi Collet <Fedora@FamilleCollet.com> - 0.70-1 -- 0.70 final - -* Fri Nov 16 2007 Remi Collet <Fedora@FamilleCollet.com> - 0.70-0.4.rc3 -- Release Candidate 3 - -* Thu Nov 01 2007 Remi Collet <Fedora@FamilleCollet.com> - 0.70-0.3.rc2 -- correct source - -* Thu Nov 01 2007 Remi Collet <Fedora@FamilleCollet.com> - 0.70-0.2.rc2 -- Release Candidate 2 - -* Mon Oct 08 2007 Remi Collet <Fedora@FamilleCollet.com> - 0.70-0.2.rc1 -- From review #322781 : fix Source0 and macros -- Requires php-domxml for EL4 - -* Sun Sep 30 2007 Remi Collet <Fedora@FamilleCollet.com> - 0.70-0.1.rc1 -- GLPI Version 0.7-RC1 -- initial SPEC for Fedora Review - -* Thu May 03 2007 Remi Collet <RPMS@FamilleCollet.com> - 0.70-0.beta.20070503 -- initial RPM - @@ -27,8 +27,8 @@ %endif Name: glpi -Version: 0.85.5 -Release: 1%{?dist} +Version: 0.90.1 +Release: 3%{?dist} Summary: Free IT asset management software Summary(fr): Gestion Libre de Parc Informatique @@ -36,15 +36,17 @@ Group: Applications/Internet License: GPLv2+ and GPLv3+ URL: http://www.glpi-project.org/ # Upstream sources (not the github auto-generated archive) -Source0: https://github.com/glpi-project/%{name}/releases/download/%{version}/glpi-%{version}.tar.gz +Source0: https://github.com/glpi-project/%{name}/releases/download/%{version}%{?prever}/glpi-%{version}%{?prever}.tar.gz Source1: glpi-httpd.conf -Source2: glpi-0.85-config_path.php +Source2: glpi-0.90-config_path.php Source3: glpi-logrotate Source4: glpi-nginx.conf # Switch all internal cron tasks to system -Patch0: glpi-0.85-cron.patch +Patch0: glpi-0.90-cron.patch +# Fix autoloader +Patch1: glpi-0.90-autoload.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -62,7 +64,7 @@ Requires: php(httpd) %else Requires: httpd, mod_php %endif -Requires: php(language) >= 5.3 +Requires: php(language) >= 5.4 Requires: php-date Requires: php-gd Requires: php-fileinfo @@ -79,13 +81,10 @@ Requires: php-tcpdf Requires: php-pear-CAS >= 1.2.0 Requires: php-htmLawed Requires: php-simplepie -Requires: php-ZendFramework2-Cache -Requires: php-ZendFramework2-Cache-apc -Requires: php-ZendFramework2-I18n -Requires: php-ZendFramework2-Loader -Requires: php-ZendFramework2-ServiceManager -Requires: php-ZendFramework2-Stdlib -Requires: php-ZendFramework2-Version +Requires: php-composer(zendframework/zend-cache) +Requires: php-composer(zendframework/zend-i18n) +Requires: php-composer(zendframework/zend-loader) +Requires: php-composer(zendframework/zend-version) Requires: php-composer(ircmaxell/password-compat) %if 0%{?fedora} >= 11 || 0%{?rhel} >= 6 Requires: php-composer(zetacomponents/graph) @@ -127,6 +126,7 @@ techniciens grâce à une maintenance plus cohérente. %setup -q -n glpi %patch0 -p0 +%patch1 -p0 find . -name \*.orig -exec rm {} \; -print @@ -287,7 +287,7 @@ fi %defattr(-,root,root,-) %doc *.txt LICENSE.* -%attr(750,apache,root) %dir %{_sysconfdir}/%{name} +%attr(770,root,apache) %dir %{_sysconfdir}/%{name} %ghost %config(noreplace,missingok) %{_sysconfdir}/%{name}/config_db.php %config(noreplace) %{_sysconfdir}/httpd/conf.d/glpi.conf %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} @@ -298,7 +298,7 @@ fi # This folder can contain private information (sessions, docs, ...) %dir %_localstatedir/lib/%{name} -%attr(750,apache,root) %{_localstatedir}/lib/%{name}/files +%attr(770,root,apache) %{_localstatedir}/lib/%{name}/files %dir %{_datadir}/%{name} %{_datadir}/%{name}/*.php @@ -315,11 +315,23 @@ fi %{_datadir}/%{name}/pics %{_datadir}/%{name}/plugins %{_datadir}/%{name}/scripts -%attr(750,apache,root) %dir %{_localstatedir}/log/%{name} +%attr(770,root,apache) %dir %{_localstatedir}/log/%{name} %dir %{_datadir}/%{name}/locales %changelog +* Thu Feb 18 2016 Remi Collet <remi@fedoraproject.org> - 0.90.1-3 +- fix Zend autoloader (to allow ZF 2.5) + +* Fri Nov 27 2015 Remi Collet <remi@fedoraproject.org> - 0.90.1-1 +- update to 0.90.1 + +* Thu Oct 8 2015 Remi Collet <remi@fedoraproject.org> - 0.90-1 +- update to 0.90 + +* Tue Oct 6 2015 Remi Collet <remi@fedoraproject.org> - 0.90-0.1.RC2 +- update to 0.90-RC2 + * Wed Sep 16 2015 Remi Collet <remi@fedoraproject.org> - 0.85.5-1 - update to 0.85.5 https://github.com/glpi-project/glpi/issues?q=milestone:0.85.5 |