- up to 0.8.7d

[packages/cacti.git] / cacti.spec

diff --git a/cacti.spec b/cacti.spec
index 73c1c14f82a84d05bacbb82335fa75f7f9256d4d..bcd7576839c6ec9890f93a671a12855db222958d 100644 (file)
--- a/cacti.spec
+++ b/cacti.spec
@@ -2,24 +2,26 @@
 Summary:       Cacti is a PHP frontend for rrdtool
 Summary(pl.UTF-8):     Cacti - frontend w PHP do rrdtoola
 Name:          cacti
 Summary:       Cacti is a PHP frontend for rrdtool
 Summary(pl.UTF-8):     Cacti - frontend w PHP do rrdtoola
 Name:          cacti

-Version:       0.8.7b
-Release:       9.21
+Version:       0.8.7d
+Release:       0.1

 License:       GPL
 Group:         Applications/WWW
 Source0:       http://www.cacti.net/downloads/%{name}-%{version}.tar.gz
 License:       GPL
 Group:         Applications/WWW
 Source0:       http://www.cacti.net/downloads/%{name}-%{version}.tar.gz

-# Source0-md5: 63ffca5735b60bc33c68bc880f0e8042
+# Source0-md5: 0822068bfa547278e94d3143ef9279e0

 Source1:       %{name}.cfg.php
 Source2:       %{name}.crontab
 Source1:       %{name}.cfg.php
 Source2:       %{name}.crontab

-Source3:       http://cactiusers.org/downloads/%{name}-plugin-arch.tar.gz
-# Source3-md5: 7079c1f366e8ea1b26c7e251e6373226
-Source4:       %{name}-apache.conf
-Source5:       %{name}-lighttpd.conf
-Patch1:                %{name}-upgrade_from_086k_fix.patch
-Patch2:                http://www.cacti.net/downloads/patches/0.8.7b/snmp_auth_none_notice.patch
-Patch3:                http://www.cacti.net/downloads/patches/0.8.7b/reset_each_patch.patch
-Patch4:                %{name}-config.patch
-Patch5:                %{name}-adodb.patch
-Patch6:                %{name}-ioerror.patch
+Source3:       %{name}-apache.conf
+Source4:       %{name}-lighttpd.conf
+Source5:       %{name}-rrdpath.sql
+Patch0:                cacti-plugin-%{version}-PA-v2.4.diff
+Patch1:                %{name}-config.patch
+Patch2:                %{name}-adodb.patch
+Patch3:                %{name}-ioerror.patch
+Patch4:                %{name}-webroot.patch
+Patch5:                %{name}-linux_memory.patch
+Patch6:                %{name}-log-verbosity.patch
+Patch7:                %{name}-ss_disk-array-indices.patch
+Patch8:                %{name}-rrdresourcecheck.patch

 URL:           http://www.cacti.net/
 BuildRequires: rpm-perlprov
 BuildRequires: sed >= 4.0
 URL:           http://www.cacti.net/
 BuildRequires: rpm-perlprov
 BuildRequires: sed >= 4.0


@@ -39,6 +41,9 @@ Requires:     php-cli
 Requires:      rrdtool
 Requires:      webapps
 Requires:      webserver
 Requires:      rrdtool
 Requires:      webapps
 Requires:      webserver

+Requires:      webserver(access)
+Requires:      webserver(alias)
+Requires:      webserver(indexfile)

 Requires:      webserver(php)
 Suggests:      cacti-spine
 Provides:      user(cacti)
 Requires:      webserver(php)
 Suggests:      cacti-spine
 Provides:      user(cacti)


@@ -82,46 +87,61 @@ Install this package to configure initial Cacti installation. You
 should uninstall this package when you're done, as it considered
 insecure to keep the setup files in place.
 
 should uninstall this package when you're done, as it considered
 insecure to keep the setup files in place.
 

+%description setup -l pl.UTF-8
+Ten pakiet należy zainstalować, aby wstępnie skonfigurować instalację
+Cacti. Po tym pakiet powinien zostać odinstalowany, jako że jego
+obecność może być niebezpieczna.
+

 %package doc
 Summary:       HTML Documentation for Cacti
 %package doc
 Summary:       HTML Documentation for Cacti

+Summary(pl.UTF-8):     Dokumentacja do Cacti w formacie HTML

 Group:         Documentation
 Requires:      %{name} = %{version}-%{release}
 
 %description doc
 HTML Documentation for Cacti.
 
 Group:         Documentation
 Requires:      %{name} = %{version}-%{release}
 
 %description doc
 HTML Documentation for Cacti.
 

+%description doc -l pl.UTF-8
+Dokumentacja do Cacti w formacie HTML.
+

 %prep
 %prep

-%setup -q -a 3
+%setup -q
+%patch0 -p1

 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1

-%{__patch} -p1 -s < cacti-plugin-arch/cacti-plugin-0.8.7b-PA-v2.1.diff

 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1

+%patch7 -p1
+%patch8 -p1

 
 mkdir -p sql
 mv *.sql sql
 
 mkdir -p sql
 mv *.sql sql

+# you should run this sql if your database contains path to %{_datadir}...
+cp %{SOURCE5} sql

 
 

-mv cacti-plugin-arch/pa.sql sql

 rm -rf cacti-plugin-arch
 rm -rf lib/adodb
 rm -f log/.htaccess
 rm -rf cacti-plugin-arch
 rm -rf lib/adodb
 rm -f log/.htaccess

+rm -f cli/.htaccess

 rm -f rra/.placeholder
 rm -f rra/.placeholder

-rm -f plugins/index.php

 
 %{__sed} -i -e '1i#!%{_bindir}/php' scripts/*.php
 chmod a+rx scripts/*
 
 
 %{__sed} -i -e '1i#!%{_bindir}/php' scripts/*.php
 chmod a+rx scripts/*
 

+%{__sed} -i -e '1i#!%{_bindir}/php' cli/*.php
+chmod a+rx cli/*
+

 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
 
 %install
 rm -rf $RPM_BUILD_ROOT
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
 
 %install
 rm -rf $RPM_BUILD_ROOT

-install -d $RPM_BUILD_ROOT{%{_sysconfdir}/%{name},%{_appdir}/docs,/etc/cron.d,%{_sbindir}}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir}/%{name},%{_appdir}/{docs,plugins},/etc/cron.d,%{_sbindir}}

 install -d $RPM_BUILD_ROOT/var/{log,lib/%{name}}
 
 cp -a *.php $RPM_BUILD_ROOT%{_appdir}
 install -d $RPM_BUILD_ROOT/var/{log,lib/%{name}}
 
 cp -a *.php $RPM_BUILD_ROOT%{_appdir}

-cp -a cli images include install lib plugins resource scripts sql $RPM_BUILD_ROOT%{_appdir}
+cp -a cli images include install lib resource scripts sql $RPM_BUILD_ROOT%{_appdir}

 cp -a docs/html $RPM_BUILD_ROOT%{_appdir}/docs/html
 mv $RPM_BUILD_ROOT{%{_appdir}/poller.php,%{_sbindir}/cacti-poller}
 
 cp -a docs/html $RPM_BUILD_ROOT%{_appdir}/docs/html
 mv $RPM_BUILD_ROOT{%{_appdir}/poller.php,%{_sbindir}/cacti-poller}
 


@@ -129,12 +149,11 @@ cp -a log $RPM_BUILD_ROOT/var/log/%{name}
 cp -a rra $RPM_BUILD_ROOT/var/lib/%{name}
 
 cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/config.php
 cp -a rra $RPM_BUILD_ROOT/var/lib/%{name}
 
 cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/config.php

-# TODO: switch to user cacti here

 cp -a %{SOURCE2} $RPM_BUILD_ROOT/etc/cron.d/%{name}
 
 cp -a %{SOURCE2} $RPM_BUILD_ROOT/etc/cron.d/%{name}
 

-cp -a %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
-cp -a %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
-cp -a %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
+cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
+cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+cp -a %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf

 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT


@@ -194,10 +213,12 @@ fi
 %{_appdir}/lib
 %{_appdir}/include
 %{_appdir}/images
 %{_appdir}/lib
 %{_appdir}/include
 %{_appdir}/images

-%{_appdir}/cli

 %{_appdir}/plugins
 %{_appdir}/*.php
 
 %{_appdir}/plugins
 %{_appdir}/*.php
 

+%dir %{_appdir}/cli
+%attr(755,root,root) %{_appdir}/cli/*
+

 %dir %{_appdir}/scripts
 %attr(755,root,root) %{_appdir}/scripts/*
 
 %dir %{_appdir}/scripts
 %attr(755,root,root) %{_appdir}/scripts/*
 


@@ -212,4 +233,4 @@ fi
 
 %files doc
 %defattr(644,root,root,755)
 
 %files doc
 %defattr(644,root,root,755)

-%{_appdir}/docs/html
+%{_appdir}/docs