Add -f to rm in spec so that it builds

.gitignore

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

smeserver-cacti.spec

@@ -6,7 +6,7 @@ Summary: Cacti for smeserver
 %define name smeserver-cacti
 Name: %{name}
 %define version 1.1.19
-%define release 4
+%define release 6
 Version: %{version}
 Release: %{release}%{?dist}
 License: Freely distributable
@@ -14,12 +14,12 @@ Group: Apache
 Source: %{name}-%{version}.tar.xz
 
 BuildRoot: /var/tmp/e-smith-buildroot
-BuildRequires: e-smith-devtools
+BuildRequires: smeserver-devtools
 BuildArchitectures: noarch
 Requires: smeserver-release >= 10 , rrdtool >= 1
 Requires: cacti >= 1.2.21
 Requires: cacti-spine
-Requires: e-smith-apache >= 2.6.0-19
+Requires: smeserver-apache >= 2.6.0-19
 Requires: smeserver-php >= 3.0.0-43
 Requires: php74-php-gmp
 Requires: php-gmp
@@ -27,6 +27,12 @@ Requires: php-gmp
 AutoReqProv: no
 
 %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
+- Fix e-smith references in smeserver-cacti [SME: 12732]
+
 * Sat Sep 07 2024 cvs2git.sh aka Brian Read <brianr@koozali.org> 1.1.19-4.sme
 - Roll up patches and move to git repo [SME: 12338]
 
@@ -104,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