diff options
| -rw-r--r-- | glpi-0.90-autoload.patch | 18 | ||||
| -rw-r--r-- | glpi-0.90-config_path.php | 34 | ||||
| -rw-r--r-- | glpi-0.90-cron.patch | 28 | ||||
| -rw-r--r-- | glpi-0.90-upstream.patch | 36 | ||||
| -rw-r--r-- | glpi-dev.spec | 826 | ||||
| -rw-r--r-- | glpi.spec | 250 |
6 files changed, 204 insertions, 988 deletions
diff --git a/glpi-0.90-autoload.patch b/glpi-0.90-autoload.patch deleted file mode 100644 index 898b286..0000000 --- a/glpi-0.90-autoload.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -up inc/autoload.function.php.old inc/autoload.function.php ---- inc/autoload.function.php.old 2016-02-18 14:45:41.167015090 +0100 -+++ inc/autoload.function.php 2016-02-18 14:47:19.277404208 +0100 -@@ -332,10 +332,14 @@ function glpi_autoload($classname) { - // Use spl autoload to allow stackable autoload. - spl_autoload_register('glpi_autoload'); - -+if (file_exists(GLPI_ZEND_PATH . '/autoload.php')) { -+ require_once (GLPI_ZEND_PATH . '/autoload.php'); -+} else { - require_once (GLPI_ZEND_PATH . '/Loader/StandardAutoloader.php'); - $option = array(Zend\Loader\StandardAutoloader::LOAD_NS => array('Zend' => GLPI_ZEND_PATH)); - $loader = new Zend\Loader\StandardAutoloader($option); - $loader->register(); -+} - - // SimplePie autoloader - spl_autoload_register(array(new SimplePie_Autoloader(), 'autoload')); diff --git a/glpi-0.90-config_path.php b/glpi-0.90-config_path.php deleted file mode 100644 index 39802b0..0000000 --- a/glpi-0.90-config_path.php +++ /dev/null @@ -1,34 +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_CRON_DIR', '/var/lib/glpi/files/_cron'); -define('GLPI_DUMP_DIR', '/var/lib/glpi/files/_dumps'); -define('GLPI_GRAPH_DIR', '/var/lib/glpi/files/_graphs'); -define('GLPI_LOCK_DIR', '/var/lib/glpi/files/_lock'); -define('GLPI_PICTURE_DIR', '/var/lib/glpi/files/_pictures'); -define('GLPI_PLUGIN_DOC_DIR', '/var/lib/glpi/files/_plugins'); -define('GLPI_RSS_DIR', '/var/lib/glpi/files/_rss'); -define('GLPI_SESSION_DIR', '/var/lib/glpi/files/_sessions'); -define('GLPI_TMP_DIR', '/var/lib/glpi/files/_tmp'); -define('GLPI_UPLOAD_DIR', '/var/lib/glpi/files/_uploads'); - -// 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.90-cron.patch b/glpi-0.90-cron.patch deleted file mode 100644 index 8cde99c..0000000 --- a/glpi-0.90-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 -@@ -383,6 +383,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 -@@ -830,6 +830,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-0.90-upstream.patch b/glpi-0.90-upstream.patch deleted file mode 100644 index 213f8e2..0000000 --- a/glpi-0.90-upstream.patch +++ /dev/null @@ -1,36 +0,0 @@ -Adapted for 0.90 from: - - -From efdec2554b4b65e72de049ea9897ddab5a2b7971 Mon Sep 17 00:00:00 2001 -From: Remi Collet <fedora@famillecollet.com> -Date: Tue, 19 Apr 2016 11:30:16 +0200 -Subject: [PATCH] Drop Zend\Version usage - -This component is no more relevant as it reports its -own version, not the one of the framework. ---- - inc/config.class.php | 3 +- - lib/Zend/Version/README.md | 15 --- - lib/Zend/Version/Version.php | 226 ----------------------------------------- - lib/Zend/Version/composer.json | 32 ------ - tools/composer.json | 1 - - 5 files changed, 1 insertion(+), 276 deletions(-) - delete mode 100644 lib/Zend/Version/README.md - delete mode 100644 lib/Zend/Version/Version.php - delete mode 100644 lib/Zend/Version/composer.json - -diff --git a/inc/config.class.php b/inc/config.class.php -index 477ded2..f1008db 100644 ---- a/inc/config.class.php -+++ b/inc/config.class.php -@@ -1553,8 +1553,7 @@ static function showLibrariesInformation() { - "): ".(class_exists('ezcGraph') ? 'OK' : 'KO'). "\n"; - - // Zend -- $zv = new Zend\Version\Version; -- echo "Zend Framework version " . $zv::VERSION . " in (" . realpath(GLPI_ZEND_PATH) . ")\n"; -+ echo "Zend Framework in (" . realpath(GLPI_ZEND_PATH) . ")\n"; - - // SimplePie : - $sp = new SimplePie(); - diff --git a/glpi-dev.spec b/glpi-dev.spec deleted file mode 100644 index be38042..0000000 --- a/glpi-dev.spec +++ /dev/null @@ -1,826 +0,0 @@ -# Fedora/remirepo spec file for glpi -# -# Copyright (c) 2007-2017 Remi Collet -# License: CC-BY-SA -# http://creativecommons.org/licenses/by-sa/4.0/ -# -# Please, preserve the changelog entries -# - -%global gh_commit 3dedf3453ae2f4b3e0e26772e7ce00182aeb4e5d -%global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -#global gh_date 20160923 -%global gh_owner glpi-project -%global gh_project glpi - - -%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 -# remirepo:4 -%if 0%{?fedora} < 19 && 0%{?rhel} < 7 -# MySQL need another bootstrap method -%global with_tests 0%{?_with_tests:1} -%else -%global with_tests 0%{!?_without_tests:1} -# remirepo:1 -%endif - -Name: %{gh_project} -Version: 9.1.2 -%global schema 9.1.1 -Release: 1%{?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/%{gh_owner}/%{name}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz - -Source1: %{name}-httpd.conf -Source2: %{name}-9.1-config_path.php -Source12: %{name}-9.1-config_path_test.php -Source3: %{name}-logrotate -Source4: %{name}-nginx.conf -Source5: %{name}-fedora-autoloader.php - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch -BuildRequires: gettext -%if %{with_tests} -BuildRequires: php-cli -BuildRequires: %{_bindir}/phpunit -BuildRequires: mariadb-server -#PHP libs -BuildRequires: php-htmLawed -BuildRequires: php-composer(zendframework/zend-cache) >= 2.4 -BuildRequires: php-composer(zendframework/zend-i18n) >= 2.4 -BuildRequires: php-composer(zendframework/zend-loader) >= 2.4 -BuildRequires: php-composer(guzzlehttp/guzzle) >= 5 -BuildRequires: php-composer(guzzlehttp/guzzle) < 6 -BuildRequires: php-composer(jasig/phpcas) >= 1.3 -BuildRequires: php-composer(iamcal/lib_autolink) >= 1.7 -BuildRequires: php-composer(sabre/vobject) >= 3.4 -BuildRequires: php-composer(michelf/php-markdown) >= 1.6 -BuildRequires: php-composer(true/punycode) >= 2 -# See https://bugzilla.redhat.com/1353451 -BuildRequires: php-simplepie -# remirepo:1 -BuildRequires: php-composer(simplepie/simplepie) >= 1.4 -BuildRequires: php-composer(phpmailer/phpmailer) >= 5.2 -# 6.2.13 to ensure we have the classmap autoloader -BuildRequires: php-composer(tecnickcom/tcpdf) >= 6.2.13 -BuildRequires: php-mysqli -BuildRequires: php-xmlrpc -#Missing in mariadb -BuildRequires: hostname -# remirepo:1 -%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6 -BuildRequires: php-composer(zetacomponents/graph) -# remirepo:1 -%endif -%endif - -%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 -# use 5.5+ to avoid dependency on ircmaxell/password-compat and ramsey/array_column -Requires: php(language) >= 5.5 -Requires: php-ctype -Requires: php-curl -Requires: php-date -Requires: php-exif -Requires: php-fileinfo -Requires: php-gd -Requires: php-imap -Requires: php-json -Requires: php-ldap -Requires: php-mbstring -Requires: php-mysqli -Requires: php-pcre -Requires: php-session -Requires: php-simplexml -Requires: php-wddx -Requires: php-xmlrpc -Requires: php-zlib -Requires: php-htmLawed -Requires: php-composer(zendframework/zend-cache) >= 2.4 -Requires: php-composer(zendframework/zend-i18n) >= 2.4 -Requires: php-composer(zendframework/zend-loader) >= 2.4 -Requires: php-composer(jasig/phpcas) >= 1.3 -Requires: php-composer(iamcal/lib_autolink) >= 1.7 -Requires: php-composer(sabre/vobject) >= 3.4 -Requires: php-composer(michelf/php-markdown) >= 1.6 -# upstream ask 2.1, compatibility with 2.0 ensure by autoloader -Requires: php-composer(true/punycode) >= 2.1 -# See https://bugzilla.redhat.com/1353451 -Requires: php-simplepie -# remirepo:1 -Requires: php-composer(simplepie/simplepie) >= 1.4 -Requires: php-composer(phpmailer/phpmailer) >= 5.2 -# 6.2.13 to ensure we have the classmap autoloader -Requires: php-composer(tecnickcom/tcpdf) >= 6.2.13 - -# remirepo:1 -%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6 -Requires: php-composer(zetacomponents/graph) -Requires: gnu-free-sans-fonts -# remirepo:3 -%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 -%if 0%{?fedora} >= 22 -Recommends: php-pecl-apcu -%endif - - -%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 %{name}-%{gh_commit} - -grep %{version} config/define.php - -find . -name \*.orig -exec rm {} \; -print - -# Drop bundled Flash files -find lib -name \*.swf -exec rm {} \; -print - -# Use system lib -rm -rf lib/htmlawed -: bundled JS libraries -ls lib - -# remirepo:5 -%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 -# remirepo:1 -%endif - -mkdir vendor -sed -e "s,##DATADIR##,%{_datadir}," \ - %{SOURCE5} > vendor/autoload.php - -mv lib/tiny_mce/license.txt LICENSE.tiny_mce -rm scripts/glpi_cron_*.sh - -sed -i -e 's/\r//' LICENSE.tiny_mce -for fic in LISEZMOI.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 - -# We only need 1 sql sdchema -if [ "%{version}" != "%{schema}" -a -f install/mysql/glpi-%{version}-empty.sql ]; then - echo -e "\n*** check schema version as glpi-%{version}-empty.sql exists***\n" - exit 1; -fi -mv install/mysql/glpi-%{schema}-empty.sql . -rm install/mysql/*.sql -mv glpi-%{schema}-empty.sql install/mysql/ - - -%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 apirest.md %{buildroot}/%{_datadir}/%{name}/ - -for i in ajax css front inc install lib locales pics plugins scripts vendor -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} -# remirepo:4 -%if 0%{?rhel} == 5 || 0%{?rhel} == 6 -: Remove "su" option from logrotate configuration file - requires logrotate 3.8+ -sed -e '/su /d' -i %{buildroot}%{_sysconfdir}/logrotate.d/%{name} -%endif - -# ====== 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 - - -%check -%if %{with_tests} -RET=0 -: Hack for vendor -sed -e '/Development dependencies/s:^://:' -i tests/bootstrap.php - -: Ignore bad date -sed -e 's/testGetCopyrightMessage/skipGetCopyrightMessage/' -i tests/HtmlTest.php - -: Add developement dependecies -cat << 'EOF' | tee -a vendor/autoload.php -// "guzzlehttp/guzzle": "~5" -require_once $vendor . '/GuzzleHttp/autoload.php'; -EOF - -: Running a PHP server -sed -e 's/localhost:8088/127.0.0.1:8089/' phpunit.xml.dist >phpunit.xml - -%{_bindir}/php -S 127.0.0.1:8089 tests/router.php &>/dev/null & - -PHPPID=$! - -: Running a MariaDB server -MYSQL_TEST_HOST=127.0.0.1 -MYSQL_TEST_PORT=3308 -MYSQL_TEST_SOCKET=$PWD/mysql.sock -MYSQL_PID_FILE=$PWD/mysql.pid - -rm -rf data -mkdir data -%{_bindir}/mysql_install_db \ - --datadir=$PWD/data - -%{_libexecdir}/mysqld \ - --socket=$MYSQL_TEST_SOCKET \ - --log-error=$PWD/mysql.log \ - --pid-file=$MYSQL_PID_FILE \ - --port=$MYSQL_TEST_PORT \ - --datadir=$PWD/data & - -n=15 -while [ $n -gt 0 ]; do - RESPONSE=$(%{_bindir}/mysqladmin --no-defaults --socket="$MYSQL_TEST_SOCKET" --user=root ping 2>&1 || :) - if [ "$RESPONSE" == "mysqld is alive" ]; then - break - fi - n=$(expr $n - 1) - sleep 1 -done - -: Set tests configuration -cp %{SOURCE12} config/config_path.php - -: Run upstream test suite -php tools/cliinstall.php --host=127.0.0.1:3308 --db=glpitest --user=root --tests --force --lang=en_GB || RET=1 - -%{_bindir}/phpunit --verbose || RET=1 - -: Cleanup -if [ -s $MYSQL_PID_FILE ]; then - kill $(cat $MYSQL_PID_FILE) -fi -kill $PHPPID - -exit $RET -%else -: Test disabled -%endif - - -%clean -rm -rf %{buildroot} - - -%post -%if %{useselinux} -( -# New File context -# remirepo:4 -%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}(/.*)?" -# remirepo:1 -%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(2770,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(2770,root,apache) %{_localstatedir}/lib/%{name}/files - -%dir %{_datadir}/%{name} -%{_datadir}/%{name}/*.php -%{_datadir}/%{name}/*.js -%{_datadir}/%{name}/apirest.md -# 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 -%{_datadir}/%{name}/vendor -%attr(2770,root,apache) %dir %{_localstatedir}/log/%{name} -%dir %{_datadir}/%{name}/locales - - -%changelog -* Mon Jan 23 2017 Johan Cwiklinski <jcwiklinski AT teclib DOT com> - 9.1.2-1 -- update to 9.1.2 -- add missing hostname BR from MariaDB package - -* Mon Jan 9 2017 Remi Collet <remi@fedoraproject.org> - 9.1.1-3 -- use new tcpdf classmap autoloader - -* Tue Nov 15 2016 Remi Collet <remi@fedoraproject.org> - 9.1.1-2 -- update to 9.1.1 -- drop runtime dependency on guzzlehttp/guzzle - -* Wed Sep 28 2016 Remi Collet <remi@fedoraproject.org> - 9.1-2 -- missing API documentation - -* Mon Sep 26 2016 Remi Collet <remi@fedoraproject.org> - 9.1-1 -- update to 9.1 - https://github.com/glpi-project/glpi/milestone/2?closed=1 -- add patch to ensure correct autolading - open https://github.com/glpi-project/glpi/pull/1056 -- add patch to ensure test suite use local server - open https://github.com/glpi-project/glpi/pull/1058 - -* Fri Sep 23 2016 Johan Cwiklinski <jcwiklinski@teclib.com> - 9.1-0.1.20160922gitf4143e3 -- First pre-build for 9.1 series -- Drop upstream patches -- Add unit tests - -* Wed Jul 27 2016 Remi Collet <remi@fedoraproject.org> - 0.90.5-1 -- update to 0.90.5 - https://github.com/glpi-project/glpi/issues?q=milestone:0.90.5 - -* Sat Jul 23 2016 Remi Collet <remi@fedoraproject.org> - 0.90.4-2 -- fix regression in document form, adding upstream patch - -* Tue Jul 19 2016 Remi Collet <remi@fedoraproject.org> - 0.90.4-1 -- update to 0.90.4 - https://github.com/glpi-project/glpi/issues?q=milestone:0.90.4 - -* Wed Jun 22 2016 Remi Collet <remi@fedoraproject.org> - 0.90.3-2 -- add upstream patch, drop dependency on zend-version - -* Tue Apr 12 2016 Remi Collet <remi@fedoraproject.org> - 0.90.3-1 -- update to 0.90.3 - https://github.com/glpi-project/glpi/issues?q=milestone:0.90.3 - -* Tue Apr 5 2016 Remi Collet <remi@fedoraproject.org> - 0.90.2-2 -- fix logrotate configuration for recent version - -* Fri Apr 1 2016 Remi Collet <remi@fedoraproject.org> - 0.90.2-1 -- update to 0.90.2 - -* Thu Mar 24 2016 Remi Collet <remi@fedoraproject.org> - 0.90.1-4 -- add upstream patch to fix compatibility with ZF 2.5 -- recommend APCu - -* 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 - @@ -7,6 +7,13 @@ # Please, preserve the changelog entries # +%global gh_commit 3dedf3453ae2f4b3e0e26772e7ce00182aeb4e5d +%global gh_short %(c=%{gh_commit}; echo ${c:0:7}) +#global gh_date 20160923 +%global gh_owner glpi-project +%global gh_project glpi + + %if 0%{?fedora} < 20 # See https://bugzilla.redhat.com/1033025 # selinux-policy : Please include policy for GLPI @@ -25,9 +32,18 @@ %global with_nginx 0 %global with_httpd 0 %endif +# remirepo:4 +%if 0%{?fedora} < 19 && 0%{?rhel} < 7 +# MySQL need another bootstrap method +%global with_tests 0%{?_with_tests:1} +%else +%global with_tests 0%{!?_without_tests:1} +# remirepo:1 +%endif -Name: glpi -Version: 0.90.5 +Name: %{gh_project} +Version: 9.1.2 +%global schema 9.1.1 Release: 1%{?dist} Summary: Free IT asset management software Summary(fr): Gestion Libre de Parc Informatique @@ -36,23 +52,51 @@ 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 +Source0: https://github.com/%{gh_owner}/%{name}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz -# Switch all internal cron tasks to system -Patch0: glpi-0.90-cron.patch -# Fix autoloader -Patch1: glpi-0.90-autoload.patch -# Upstream patches -Patch2: glpi-0.90-upstream.patch +Source1: %{name}-httpd.conf +Source2: %{name}-9.1-config_path.php +Source12: %{name}-9.1-config_path_test.php +Source3: %{name}-logrotate +Source4: %{name}-nginx.conf +Source5: %{name}-fedora-autoloader.php BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: gettext +%if %{with_tests} +BuildRequires: php-cli +BuildRequires: %{_bindir}/phpunit +BuildRequires: mariadb-server +# Missing in mariadb +BuildRequires: hostname +# PHP libs +BuildRequires: php-htmLawed +BuildRequires: php-composer(zendframework/zend-cache) >= 2.4 +BuildRequires: php-composer(zendframework/zend-i18n) >= 2.4 +BuildRequires: php-composer(zendframework/zend-loader) >= 2.4 +BuildRequires: php-composer(guzzlehttp/guzzle) >= 5 +BuildRequires: php-composer(guzzlehttp/guzzle) < 6 +BuildRequires: php-composer(jasig/phpcas) >= 1.3 +BuildRequires: php-composer(iamcal/lib_autolink) >= 1.7 +BuildRequires: php-composer(sabre/vobject) >= 3.4 +BuildRequires: php-composer(michelf/php-markdown) >= 1.6 +BuildRequires: php-composer(true/punycode) >= 2 +# See https://bugzilla.redhat.com/1353451 +BuildRequires: php-simplepie +# remirepo:1 +BuildRequires: php-composer(simplepie/simplepie) >= 1.4 +BuildRequires: php-composer(phpmailer/phpmailer) >= 5.2 +# 6.2.13 to ensure we have the classmap autoloader +BuildRequires: php-composer(tecnickcom/tcpdf) >= 6.2.13 +BuildRequires: php-mysqli +BuildRequires: php-xmlrpc +# remirepo:1 +%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6 +BuildRequires: php-composer(zetacomponents/graph) +# remirepo:1 +%endif +%endif %if %{with_nginx} Requires: nginx-filesystem @@ -66,7 +110,8 @@ Requires: php(httpd) %else Requires: httpd, mod_php %endif -Requires: php(language) >= 5.4 +# use 5.5+ to avoid dependency on ircmaxell/password-compat and ramsey/array_column +Requires: php(language) >= 5.5 Requires: php-ctype Requires: php-curl Requires: php-date @@ -84,18 +129,29 @@ Requires: php-simplexml Requires: php-wddx Requires: php-xmlrpc Requires: php-zlib -Requires: php-PHPMailer -Requires: php-tcpdf -Requires: php-pear-CAS >= 1.2.0 Requires: php-htmLawed +Requires: php-composer(zendframework/zend-cache) >= 2.4 +Requires: php-composer(zendframework/zend-i18n) >= 2.4 +Requires: php-composer(zendframework/zend-loader) >= 2.4 +Requires: php-composer(jasig/phpcas) >= 1.3 +Requires: php-composer(iamcal/lib_autolink) >= 1.7 +Requires: php-composer(sabre/vobject) >= 3.4 +Requires: php-composer(michelf/php-markdown) >= 1.6 +# upstream ask 2.1, compatibility with 2.0 ensure by autoloader +Requires: php-composer(true/punycode) >= 2.1 +# See https://bugzilla.redhat.com/1353451 Requires: php-simplepie -Requires: php-composer(zendframework/zend-cache) -Requires: php-composer(zendframework/zend-i18n) -Requires: php-composer(zendframework/zend-loader) -Requires: php-composer(ircmaxell/password-compat) +# remirepo:1 +Requires: php-composer(simplepie/simplepie) >= 1.4 +Requires: php-composer(phpmailer/phpmailer) >= 5.2 +# 6.2.13 to ensure we have the classmap autoloader +Requires: php-composer(tecnickcom/tcpdf) >= 6.2.13 + +# remirepo:1 %if 0%{?fedora} >= 11 || 0%{?rhel} >= 6 Requires: php-composer(zetacomponents/graph) Requires: gnu-free-sans-fonts +# remirepo:3 %else Requires: freefont %endif @@ -133,48 +189,39 @@ techniciens grâce à une maintenance plus cohérente. %prep -%setup -q -n glpi +%setup -q -n %{name}-%{gh_commit} grep %{version} config/define.php -%patch0 -p0 -%patch1 -p0 -%patch2 -p1 - 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 +# remirepo:5 %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 +# remirepo:1 %endif +mkdir vendor +sed -e "s,##DATADIR##,%{_datadir}," \ + %{SOURCE5} > vendor/autoload.php + 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 +for fic in LISEZMOI.txt do iconv -f ISO-8859-15 -t UTF-8 $fic >a && mv a $fic done @@ -185,6 +232,15 @@ cat >cron <<EOF * * * * * apache %{_bindir}/php %{_datadir}/%{name}/front/cron.php EOF +# We only need 1 sql sdchema +if [ "%{version}" != "%{schema}" -a -f install/mysql/glpi-%{version}-empty.sql ]; then + echo -e "\n*** check schema version as glpi-%{version}-empty.sql exists***\n" + exit 1; +fi +mv install/mysql/glpi-%{schema}-empty.sql . +rm install/mysql/*.sql +mv glpi-%{schema}-empty.sql install/mysql/ + %build # Regenerate the locales @@ -195,13 +251,13 @@ done %install -rm -rf %{buildroot} +rm -rf %{buildroot} # ===== application ===== mkdir -p %{buildroot}/%{_datadir}/%{name} -cp -a COPYING.txt *.php *.js %{buildroot}/%{_datadir}/%{name}/ +cp -a COPYING.txt *.php *.js apirest.md %{buildroot}/%{_datadir}/%{name}/ -for i in ajax css front inc install lib locales pics plugins scripts +for i in ajax css front inc install lib locales pics plugins scripts vendor do cp -ar $i %{buildroot}/%{_datadir}/%{name}/$i done @@ -230,6 +286,7 @@ 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} +# remirepo:4 %if 0%{?rhel} == 5 || 0%{?rhel} == 6 : Remove "su" option from logrotate configuration file - requires logrotate 3.8+ sed -e '/su /d' -i %{buildroot}%{_sysconfdir}/logrotate.d/%{name} @@ -258,20 +315,92 @@ do done >%{name}.lang +%check +%if %{with_tests} +RET=0 +: Hack for vendor +sed -e '/Development dependencies/s:^://:' -i tests/bootstrap.php + +: Ignore bad date +sed -e 's/testGetCopyrightMessage/skipGetCopyrightMessage/' -i tests/HtmlTest.php + +: Add developement dependecies +cat << 'EOF' | tee -a vendor/autoload.php +// "guzzlehttp/guzzle": "~5" +require_once $vendor . '/GuzzleHttp/autoload.php'; +EOF + +: Running a PHP server +sed -e 's/localhost:8088/127.0.0.1:8089/' phpunit.xml.dist >phpunit.xml + +%{_bindir}/php -S 127.0.0.1:8089 tests/router.php &>/dev/null & + +PHPPID=$! + +: Running a MariaDB server +MYSQL_TEST_HOST=127.0.0.1 +MYSQL_TEST_PORT=3308 +MYSQL_TEST_SOCKET=$PWD/mysql.sock +MYSQL_PID_FILE=$PWD/mysql.pid + +rm -rf data +mkdir data +%{_bindir}/mysql_install_db \ + --datadir=$PWD/data + +%{_libexecdir}/mysqld \ + --socket=$MYSQL_TEST_SOCKET \ + --log-error=$PWD/mysql.log \ + --pid-file=$MYSQL_PID_FILE \ + --port=$MYSQL_TEST_PORT \ + --datadir=$PWD/data & + +n=15 +while [ $n -gt 0 ]; do + RESPONSE=$(%{_bindir}/mysqladmin --no-defaults --socket="$MYSQL_TEST_SOCKET" --user=root ping 2>&1 || :) + if [ "$RESPONSE" == "mysqld is alive" ]; then + break + fi + n=$(expr $n - 1) + sleep 1 +done + +: Set tests configuration +cp %{SOURCE12} config/config_path.php + +: Run upstream test suite +php tools/cliinstall.php --host=127.0.0.1:3308 --db=glpitest --user=root --tests --force --lang=en_GB || RET=1 + +%{_bindir}/phpunit --verbose || RET=1 + +: Cleanup +if [ -s $MYSQL_PID_FILE ]; then + kill $(cat $MYSQL_PID_FILE) +fi +kill $PHPPID + +exit $RET +%else +: Test disabled +%endif + + %clean -rm -rf %{buildroot} +rm -rf %{buildroot} %post %if %{useselinux} ( # New File context +# remirepo:4 %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}(/.*)?" +# remirepo:1 %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}(/.*)?" @@ -304,7 +433,7 @@ fi %defattr(-,root,root,-) %doc *.txt LICENSE.* -%attr(770,root,apache) %dir %{_sysconfdir}/%{name} +%attr(2770,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} @@ -315,11 +444,12 @@ fi # This folder can contain private information (sessions, docs, ...) %dir %_localstatedir/lib/%{name} -%attr(770,root,apache) %{_localstatedir}/lib/%{name}/files +%attr(2770,root,apache) %{_localstatedir}/lib/%{name}/files %dir %{_datadir}/%{name} %{_datadir}/%{name}/*.php %{_datadir}/%{name}/*.js +%{_datadir}/%{name}/apirest.md # License file required by installation process %{_datadir}/%{name}/COPYING.txt %{_datadir}/%{name}/ajax @@ -332,11 +462,39 @@ fi %{_datadir}/%{name}/pics %{_datadir}/%{name}/plugins %{_datadir}/%{name}/scripts -%attr(770,root,apache) %dir %{_localstatedir}/log/%{name} +%{_datadir}/%{name}/vendor +%attr(2770,root,apache) %dir %{_localstatedir}/log/%{name} %dir %{_datadir}/%{name}/locales %changelog +* Mon Jan 23 2017 Johan Cwiklinski <jcwiklinski AT teclib DOT com> - 9.1.2-1 +- update to 9.1.2 +- add missing hostname BR from MariaDB package + +* Mon Jan 9 2017 Remi Collet <remi@fedoraproject.org> - 9.1.1-3 +- use new tcpdf classmap autoloader + +* Tue Nov 15 2016 Remi Collet <remi@fedoraproject.org> - 9.1.1-2 +- update to 9.1.1 +- drop runtime dependency on guzzlehttp/guzzle + +* Wed Sep 28 2016 Remi Collet <remi@fedoraproject.org> - 9.1-2 +- missing API documentation + +* Mon Sep 26 2016 Remi Collet <remi@fedoraproject.org> - 9.1-1 +- update to 9.1 + https://github.com/glpi-project/glpi/milestone/2?closed=1 +- add patch to ensure correct autolading + open https://github.com/glpi-project/glpi/pull/1056 +- add patch to ensure test suite use local server + open https://github.com/glpi-project/glpi/pull/1058 + +* Fri Sep 23 2016 Johan Cwiklinski <jcwiklinski@teclib.com> - 9.1-0.1.20160922gitf4143e3 +- First pre-build for 9.1 series +- Drop upstream patches +- Add unit tests + * Wed Jul 27 2016 Remi Collet <remi@fedoraproject.org> - 0.90.5-1 - update to 0.90.5 https://github.com/glpi-project/glpi/issues?q=milestone:0.90.5 |