Compare commits

..

No commits in common. "master" and "1.1.19-4" have entirely different histories.

3 changed files with 6 additions and 20 deletions

1
.gitignore vendored
View File

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

View File

@ -7,14 +7,7 @@ SMEServer Koozali developed git repo for smeserver-cacti smecontribs
<br />https://wiki.koozali.org/Cacti/fr
## Bugzilla
Show list of outstanding bugs:
[All](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=UNCONFIRMED&bug_status=CONFIRMED&bug_status=NEEDINFO&bug_status=IN_PROGRESS&bug_status=RESOLVED&bug_status=VERIFIED&classification=Contribs&component=smeserver-cacti&list_id=105781&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&product=SME+Contribs&query_format=advanced)
[Confirmed](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=CONFIRMED&classification=Contribs&component=smeserver-cacti&list_id=105781&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&product=SME+Contribs&query_format=advanced)
[Unconfirmed](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=UNCONFIRMED&classification=Contribs&component=smeserver-cacti&list_id=105781&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&product=SME+Contribs&query_format=advanced)
[Need Info](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=NEEDINFO&classification=Contribs&component=smeserver-cacti&list_id=105781&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&product=SME+Contribs&query_format=advanced)
[In Progress](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=IN_PROGRESS&classification=Contribs&component=smeserver-cacti&list_id=105781&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&product=SME+Contribs&query_format=advanced)
[Verified](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=VERIFIED&classification=Contribs&component=smeserver-cacti&list_id=105781&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&product=SME+Contribs&query_format=advanced)
[Resolved](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=RESOLVED&classification=Contribs&component=smeserver-cacti&list_id=105781&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&product=SME+Contribs&query_format=advanced)
Show list of outstanding bugs: [here](https://bugs.koozali.org/buglist.cgi?component=smeserver-cacti&product=SME%20Contribs&query_format=advanced&limit=0&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=CONFIRMED)
## Description

View File

@ -6,7 +6,7 @@ Summary: Cacti for smeserver
%define name smeserver-cacti
Name: %{name}
%define version 1.1.19
%define release 6
%define release 4
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: smeserver-devtools
BuildRequires: e-smith-devtools
BuildArchitectures: noarch
Requires: smeserver-release >= 10 , rrdtool >= 1
Requires: cacti >= 1.2.21
Requires: cacti-spine
Requires: smeserver-apache >= 2.6.0-19
Requires: e-smith-apache >= 2.6.0-19
Requires: smeserver-php >= 3.0.0-43
Requires: php74-php-gmp
Requires: php-gmp
@ -27,12 +27,6 @@ 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]
@ -110,8 +104,8 @@ SME server - Cacti
%setup
mkdir -p root/var/log/php/cacti
mkdir -p root/var/lib/php/cacti/{opcache,session,tmp}
rm -f root/etc/e-smith/db/configuration/migrate/80cacti_sme.sql
rm -f root/etc/e-smith/templates/etc/cacti/db.php/40DB
rm root/etc/e-smith/db/configuration/migrate/80cacti_sme.sql
rm root/etc/e-smith/templates/etc/cacti/db.php/40DB
%build
perl createlinks