Add -f to rm in spec so that it builds

This commit is contained in:
Brian Read 2024-09-08 15:49:42 +01:00
parent 8ae8da76f6
commit fb9f1c44ac
2 changed files with 7 additions and 3 deletions

1
.gitignore vendored
View File

@ -2,3 +2,4 @@
*.log *.log
*spec-20* *spec-20*
*.tar.gz *.tar.gz
*.tar.xz

View File

@ -6,7 +6,7 @@ Summary: Cacti for smeserver
%define name smeserver-cacti %define name smeserver-cacti
Name: %{name} Name: %{name}
%define version 1.1.19 %define version 1.1.19
%define release 5 %define release 6
Version: %{version} Version: %{version}
Release: %{release}%{?dist} Release: %{release}%{?dist}
License: Freely distributable License: Freely distributable
@ -27,6 +27,9 @@ Requires: php-gmp
AutoReqProv: no AutoReqProv: no
%changelog %changelog
* Sun Sep 08 2024 Brian Read <brianr@koozali.org> 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 <trevor@batley.id.au> 1.1.19-5.sme * Sun Sep 08 2024 fix-e-smith-pkg.sh by Trevor Batley <trevor@batley.id.au> 1.1.19-5.sme
- Fix e-smith references in smeserver-cacti [SME: 12732] - Fix e-smith references in smeserver-cacti [SME: 12732]
@ -107,8 +110,8 @@ SME server - Cacti
%setup %setup
mkdir -p root/var/log/php/cacti mkdir -p root/var/log/php/cacti
mkdir -p root/var/lib/php/cacti/{opcache,session,tmp} mkdir -p root/var/lib/php/cacti/{opcache,session,tmp}
rm root/etc/e-smith/db/configuration/migrate/80cacti_sme.sql rm -f 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/templates/etc/cacti/db.php/40DB
%build %build
perl createlinks perl createlinks