diff --git a/.gitignore b/.gitignore index cbb3a13..7510716 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ *.log *spec-20* *.tar.gz +*.tar.xz diff --git a/smeserver-cacti.spec b/smeserver-cacti.spec index f8033f2..8f5c731 100644 --- a/smeserver-cacti.spec +++ b/smeserver-cacti.spec @@ -6,7 +6,7 @@ Summary: Cacti for smeserver %define name smeserver-cacti Name: %{name} %define version 1.1.19 -%define release 5 +%define release 6 Version: %{version} Release: %{release}%{?dist} License: Freely distributable @@ -27,6 +27,9 @@ Requires: php-gmp AutoReqProv: no %changelog +* Sun Sep 08 2024 Brian Read 1.1.19-6.sme +- Add -f to rm in spec so it builds + * Sun Sep 08 2024 fix-e-smith-pkg.sh by Trevor Batley 1.1.19-5.sme - Fix e-smith references in smeserver-cacti [SME: 12732] @@ -107,8 +110,8 @@ SME server - Cacti %setup mkdir -p root/var/log/php/cacti mkdir -p root/var/lib/php/cacti/{opcache,session,tmp} -rm root/etc/e-smith/db/configuration/migrate/80cacti_sme.sql -rm root/etc/e-smith/templates/etc/cacti/db.php/40DB +rm -f root/etc/e-smith/db/configuration/migrate/80cacti_sme.sql +rm -f root/etc/e-smith/templates/etc/cacti/db.php/40DB %build perl createlinks