SPECS (AC-branch): cacti.spec - merge from HEAD

Tue Feb 13 12:45:48 CET 2007

Author: grzegorz                     Date: Tue Feb 13 11:45:48 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merge from HEAD

---- Files affected:
SPECS:
   cacti.spec (1.41.2.1 -> 1.41.2.2) 

---- Diffs:

================================================================
Index: SPECS/cacti.spec
diff -u SPECS/cacti.spec:1.41.2.1 SPECS/cacti.spec:1.41.2.2

--- SPECS/cacti.spec:1.41.2.1	Tue Nov 21 21:36:52 2006
+++ SPECS/cacti.spec	Tue Feb 13 12:45:42 2007
@@ -1,20 +1,20 @@
-# $Revision$, $Date$
+# TODO
+# - patch source to use adodb system path instead of symlinking
 %include	/usr/lib/rpm/macros.perl
 Summary:	Cacti is a PHP frontend for rrdtool
-Summary(pl):	Cacti - frontend w PHP do rrdtoola
+Summary(pl.UTF-8):Cacti - frontend w PHP do rrdtoola
 Name:		cacti
-Version:	0.8.6h
-Release:	3
+Version:	0.8.6j
+Release:	2
 License:	GPL
 Group:		Applications/WWW
 Source0:	http://www.cacti.net/downloads/%{name}-%{version}.tar.gz
-# Source0-md5:	5f6100b525b5b29e81f43cc7c55f4000
-Patch0:		http://www.cacti.net/downloads/patches/0.8.6h/fix_search_session_clear_issue.patch
-Patch1:		http://www.cacti.net/downloads/patches/0.8.6h/fix_sql_syntax_related_to_default_rra_id.patch
-Patch2:		http://www.cacti.net/downloads/patches/0.8.6h/nth_percentile_empty_return_set_issue.patch
-Patch3:		http://www.cacti.net/downloads/patches/0.8.6h/mysql_5x_strict.patch
-Patch4:		%{name}-plugin-%{version}.diff
-Patch5:		%{name}-config.patch
+# Source0-md5:	29436be46b289d13dfce48e7618129e2
+Patch1:		http://www.cacti.net/downloads/patches/0.8.6j/ping_php_version4_snmpgetnext.patch
+Patch2:		http://www.cacti.net/downloads/patches/0.8.6j/tree_console_missing_hosts.patch
+Patch3:		http://www.cacti.net/downloads/patches/0.8.6j/thumbnail_graphs_not_working.patch
+Patch10:	%{name}-plugin-%{version}.diff
+Patch11:	%{name}-config.patch
 URL:		http://www.cacti.net/
 BuildRequires:	rpm-perlprov
 Requires:	adodb >= 4.67-1.17
@@ -44,24 +44,23 @@
 cacti handles the data gathering also. There is also SNMP support for
 those used to creating traffic graphs with MRTG.
 
-%description -l pl
-Cacti to pełny frontend do rrdtoola, zapamiętujący wszystkie
-informacje potrzebne do tworzenia wykresów i wypełniające je danymi w
-bazie MySQL.
-
-Frontend jest w pełni oparty na PHP. Oprócz zarządzania wykresami,
-źródłami danych, archiwami Round Robin w bazie danych, cacti obsługuje
-także gromadzenie danych. Ma także obsługę SNMP przydatną przy
-tworzeniu wykresów ruchu przy użyciu MRTG.
+%description -l pl.UTF-8
+Cacti to peĹ‚ny frontend do rrdtoola, zapamiÄ™tujÄ
cy wszystkie
+informacje potrzebne do tworzenia wykresĂłw i wypeĹ‚niajÄ
ce je danymi
+w bazie MySQL.
+
+Frontend jest w peĹ‚ni oparty na PHP. OprĂłcz zarzÄ
dzania wykresami,
+ĹşrĂłdĹ‚ami danych, archiwami Round Robin w bazie danych, cacti
+obsĹ‚uguje takĹźe gromadzenie danych. Ma takĹźe obsĹ‚ugÄ™ SNMP
+przydatnÄ
 przy tworzeniu wykresĂłw ruchu przy uĹźyciu MRTG.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
+%patch1	-p1
+%patch2	-p1
+%patch3	-p1
+%patch10 -p1
+%patch11 -p1
 
 rm -rf lib/adodb
 
@@ -70,7 +69,6 @@
 install -d $RPM_BUILD_ROOT%{webadminroot}
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/{%{name},cron.d}
 install -d $RPM_BUILD_ROOT/var/{log,lib/%{name}}
-
 cp -aRf * $RPM_BUILD_ROOT%{webadminroot}
 ln -s . $RPM_BUILD_ROOT%{webadminroot}/%{name}
 
@@ -106,6 +104,7 @@
 
 mv $RPM_BUILD_ROOT%{webadminroot}/rra $RPM_BUILD_ROOT/var/lib/%{name}
 ln -sf /var/lib/%{name}/rra $RPM_BUILD_ROOT%{webadminroot}/rra
+ln -sf %{_datadir}/php/adodb $RPM_BUILD_ROOT%{webadminroot}/lib/adodb
 
 cat  << 'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/%{name}
 */5 * * * * http umask 022; %{_bindir}/php %{webadminroot}/poller.php > /dev/null 2>&1
@@ -132,8 +131,52 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.41.2.1  2006/11/21 20:36:52  glen
-- use php(extension) virtuals; rel 3
+Revision 1.41.2.2  2007/02/13 11:45:42  grzegorz
+- merge from HEAD
+
+Revision 1.54  2007/02/12 12:44:59  grzegorz
+- added patches from http://www.cacti.net/downloads/patches/0.8.6j/ping_php_version4_snmpgetnext.patch
+- rel 2, STBR
+
+Revision 1.53  2007/02/12 00:48:41  baggins
+- converted to UTF-8
+
+Revision 1.52  2007/02/11 23:57:26  grzegorz
+- up to 0.8.6j
+- remove patch1,2 and 3
+
+Revision 1.51  2007/02/11 18:07:45  grzegorz
+- rel 3
+- updated plugin architecture to 0.8.6i
+- remove poller_output_remainder patch (it's included in above patch)
+- readed config patch
+
+Revision 1.50  2007/01/14 16:40:49  arekm
+- rel 2; tons of important SECURITY fixes
+
+Revision 1.49  2006/11/21 20:35:35  glen
+- rel 1: use php(extension) virtuals
+
+Revision 1.48  2006/11/21 19:56:18  glen
+- rel 0.3: use php(extension) virtuals
+
+Revision 1.47  2006/11/06 17:53:48  djrzulf
+- updated to latest version, NFY,
+
+Revision 1.46  2006/10/10 21:41:38  glen
+- add todo
+
+Revision 1.45  2006/10/10 18:42:33  wolvverine
+- better my last commit IMHO
+
+Revision 1.44  2006/10/10 14:41:06  glen
+- one -d is enough
+
+Revision 1.43  2006/10/10 14:21:45  wolvverine
+- add lost symlink to adodb
+
+Revision 1.42  2006/06/29 11:00:36  arekm
+- rel 3; add official database_autoincrement_corruption.patch
 
 Revision 1.41  2006/04/15 11:30:04  glen
 - rel 2: use system adodb, resolves CVE-2006-0147, CVE-2006-0146, CVE-2006-0410, CVE-2006-0806
@@ -251,7 +294,7 @@
 - commented out unused piece of shell code.
 
 Revision 1.6  2003/08/06 16:39:50  kloczek
-- może wrescie ktoś wykasuje to konto ?
+- moĹźe wrescie ktoĹ› wykasuje to konto ?
 
 Revision 1.5  2003/07/09 20:10:51  blues
 - cosmetics
@@ -264,18 +307,3 @@
 
 Revision 1.2  2003/06/10 14:03:57  qboosh
 - adapterized, cleanups
-
-* Thu Jan 16 2003 Oden Eriksson <oden.eriksson at kvikkjokk.net> 0.6.8a-3mdk
-- build release
-
-* Thu Sep 19 2002 Oden Eriksson <oden.eriksson at kvikkjokk.net> 0.6.8a-2mdk
-- misc spec file fixes
-- install in common and relocatable %{webadminroot}/ directory
-
-* Wed Sep 18 2002 Oden Eriksson <oden.eriksson at kvikkjokk.net> 0.6.8a-1mdk
-- security release
-- do not require non existant php extensions
-- misc spec file fixes
-
-* Sun May 12 2002 Oden Eriksson <oden.eriksson at kvikkjokk.net> 0.6.8-1mdk
-- initial cooker contrib
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/cacti.spec?r1=1.41.2.1&r2=1.41.2.2&f=u

