diff options
Diffstat (limited to 'glpi.spec')
| -rw-r--r-- | glpi.spec | 27 |
1 files changed, 18 insertions, 9 deletions
@@ -43,7 +43,7 @@ Name: %{gh_project} Version: 9.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Free IT asset management software Summary(fr): Gestion Libre de Parc Informatique @@ -54,14 +54,19 @@ URL: http://www.glpi-project.org/ Source0: https://github.com/%{gh_owner}/%{name}/archive/%{gh_commit}/%{name}-%{version}%{?prever}-%{gh_short}.tar.gz Source1: %{name}-httpd.conf -Source2: %{name}-9.1-config_path.php -Source12: %{name}-9.1-config_path_test.php +Source2: %{name}-9.2-config_path.php +Source12: %{name}-9.2-config_path_test.php Source3: %{name}-logrotate Source4: %{name}-nginx.conf Source5: %{name}-fedora-autoloader.php # Temporary minify script, waiting for consolidation/robo Source6: %{name}-minify.php +# Upstream to use local_define.php and inc/downstream.php +Patch0: https://github.com/glpi-project/glpi/commit/457e348266100a8d43720b614e898552d1fe24e5.patch +# RPM patch to use /etc/glpi/local_define.php +Patch1: glpi-localdef.patch + BuildArch: noarch BuildRequires: gettext %if %{with_tests} @@ -213,6 +218,8 @@ techniciens grâce à une maintenance plus cohérente. %prep %setup -q -n %{name}-%{gh_commit} +%patch0 -p1 +%patch1 -p1 grep %{version} inc/define.php @@ -233,7 +240,7 @@ ln -s /usr/share/fonts/fontawesome/fontawesome-webfont.ttf lib/font-awesome-4.7. : bundled JS libraries ls lib -cp %{SOURCE2} config/config_path.php +cp %{SOURCE2} inc/downstream.php cp %{SOURCE6} tools/minify.php mkdir vendor @@ -296,10 +303,9 @@ install -Dpm 0644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/nginx/default.d/glpi.co %endif # ===== config ===== -cp -ar config %{buildroot}/%{_datadir}/%{name}/config - mkdir -p %{buildroot}/%{_sysconfdir}/%{name} touch %{buildroot}%{_sysconfdir}/%{name}/config_db.php +touch %{buildroot}%{_sysconfdir}/%{name}/local_define.php # ===== files ===== mkdir -p %{buildroot}/%{_localstatedir}/lib/%{name} @@ -327,7 +333,6 @@ 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 @@ -395,7 +400,7 @@ while [ $n -gt 0 ]; do done : Set tests configuration -cp %{SOURCE12} config/config_path.php +cp %{SOURCE12} inc/downstream.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 @@ -463,6 +468,7 @@ fi %attr(2770,root,apache) %dir %{_sysconfdir}/%{name} %ghost %config(noreplace,missingok) %{_sysconfdir}/%{name}/config_db.php +%ghost %config(noreplace,missingok) %{_sysconfdir}/%{name}/local_define.php %config(noreplace) %{_sysconfdir}/httpd/conf.d/glpi.conf %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %config(noreplace) %{_sysconfdir}/cron.d/%{name} @@ -480,7 +486,6 @@ fi # 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 @@ -497,6 +502,10 @@ fi %changelog +* Wed Oct 11 2017 Remi Collet <remi@remirepo.net> - 9.2-4 +- move config/config_path.php to inc/downstream.php +- use /etc/glpi/local_define.php to allow local path change + * Wed Sep 27 2017 Remi Collet <remi@remirepo.net> - 9.2-3 - add missing minified JS and CSS files |