Up to 1.2.26

[packages/cacti.git] / cacti.spec

diff --git a/cacti.spec b/cacti.spec
index 30032632d41d37fd5e223ef08ba342e78763dd3f..620548dc96a40389f2b9a15899d5fc6fe54bc25a 100644 (file)
--- a/cacti.spec
+++ b/cacti.spec
@@ -1,15 +1,14 @@
 %define                pia_ver 3.1
 %define                php_min_version 5.4.0
-%include       /usr/lib/rpm/macros.php
 Summary:       Cacti is a PHP frontend for rrdtool
 Summary(pl.UTF-8):     Cacti - frontend w PHP do rrdtoola
 Name:          cacti
-Version:       1.1.38
-Release:       2
+Version:       1.2.26
+Release:       1
 License:       GPL v2
 Group:         Applications/WWW
 Source0:       http://www.cacti.net/downloads/%{name}-%{version}.tar.gz
-# Source0-md5: a1ffe414280ec6518de7f0f16a5960c5
+# Source0-md5: 53043d8279640a074cc054c7b156375d
 Source2:       %{name}.crontab
 Source3:       %{name}-apache.conf
 Source4:       %{name}-lighttpd.conf
@@ -17,12 +16,12 @@ Source5:    %{name}-rrdpath.sql
 Source7:       %{name}.logrotate
 
 Patch1:                %{name}-config.patch
-Patch2:                cacti-bug-1634.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:                host_name-url.patch
 # http://www.cacti.net/download_patches.php
 # Patch100: ..
@@ -31,7 +30,6 @@ BuildRequires:        sed >= 4.0
 Requires(postun):      /usr/sbin/userdel
 Requires(pre): /bin/id
 Requires(pre): /usr/sbin/useradd
-Requires:      cacti-plugin-boost >= 5.0
 Requires:      crondaemon
 Requires:      group(http)
 Requires:      net-snmp-utils
@@ -65,6 +63,7 @@ Suggests:     php(snmp)
 Provides:      cacti(pia) = %{pia_ver}
 Provides:      user(cacti)
 Obsoletes:     cacti-add_template
+Obsoletes:     cacti-plugin-boost
 Obsoletes:     cacti-plugin-update
 %if "%{pld_release}" != "ac"
 Conflicts:     logrotate < 3.8.0
@@ -143,12 +142,12 @@ Dokumentacja do Cacti w formacie HTML.
 %endif
 
 %patch1 -p1
-%patch2 -p1
+
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
+
 # ?
 # %patch8 -p1
 
@@ -167,6 +166,8 @@ cp -p %{SOURCE5} sql
        s,include_once,require_once,
 ' cli/*.php
 
+%{__sed} -i -e 's,#!/usr/bin/env php,#!/usr/bin/php,' include/vendor/cldr-to-gettext-plural-rules/bin/export-plural-rules *.php */*.php
+
 # make sure scripts have php shebang
 %{__sed} -i -e '1{
     /bin.php/!i#!%{_bindir}/php
@@ -189,8 +190,7 @@ cp -p *.php $RPM_BUILD_ROOT%{_appdir}
 # ls -1d */index.php | cut -d"/" -f1 | xargs
 cp -a cache/* $RPM_BUILD_ROOT/var/cache/%{name}
 ln -s /var/cache/%{name} $RPM_BUILD_ROOT%{_appdir}/cache
-cp -a cli formats images include install lib locales mibs plugins resource scripts sql $RPM_BUILD_ROOT%{_appdir}
-cp -a docs/html $RPM_BUILD_ROOT%{_appdir}/docs/html
+cp -a cli docs formats images include install lib locales mibs plugins resource scripts sql $RPM_BUILD_ROOT%{_appdir}
 mv $RPM_BUILD_ROOT{%{_appdir}/poller.php,%{_sbindir}/cacti-poller}
 
 cp -a log $RPM_BUILD_ROOT/var/log/%{name}
@@ -261,7 +261,7 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc README.md docs/CHANGELOG docs/txt/manual.txt
+%doc README.md CHANGELOG
 %dir %attr(750,root,http) %{_sysconfdir}
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apache.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf