X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=zabbix.spec;h=512fe6204a13c11f3b99e390c3aa8a5c9e6c93f5;hb=e731b7a3adad1efb3b13a0dcb06671a497754f0b;hp=e842445e651580fca5b35a98c7d67f67b90426e5;hpb=94a6726580cc8dd60e86cf2e841e4179bf1f842e;p=monitor.git

diff --git a/zabbix.spec b/zabbix.spec
index e842445..512fe62 100644
--- a/zabbix.spec
+++ b/zabbix.spec
@@ -78,7 +78,12 @@ mkdir server
 cp -r client/* server
 
 pushd client
+# quick and dirty fix for f12; loader would fail b/c of the lack of /lib/libm.a
+%if "%{distro}" == "Fedora" && %{distrorelease} >= 12
+./configure --enable-agent
+%else
 ./configure --enable-static --enable-agent
+%endif
 make
 popd
 
@@ -290,6 +295,48 @@ rm -f %{zabbix_logdir}/zabbix_agentd.log
 %{zabbix_webdir}
 
 %changelog
+* Thu May 20 2010 Stephen Soltesz <soltesz@cs.princeton.edu> - Monitor-3.0-35
+- Add CSV link on Advanced query
+- Preparing to branch
+
+* Wed May 12 2010 Talip Baris Metin <Talip-Baris.Metin@sophia.inria.fr> - Monitor-3.0-34
+- * copy selections to clipbord on Advanced Query page
+- * RPM Pattern as regexp
+- * scan ipmi port
+
+* Tue Apr 27 2010 Talip Baris Metin <Talip-Baris.Metin@sophia.inria.fr> - Monitor-3.0-33
+- handle hostname changes
+
+* Tue Apr 20 2010 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - Monitor-3.0-32
+- from this version, suitable for 5.0
+- requires bootcd with the new 5.0 naming style 3-part nodefamily
+
+* Mon Apr 12 2010 Stephen Soltesz <soltesz@cs.princeton.edu> - Monitor-3.0-31
+- added fix for node delete/add causing conflicts in MyOps db.
+- added statistics scripts
+
+* Thu Jan 21 2010 Talip Baris Metin <Talip-Baris.Metin@sophia.inria.fr> - Monitor-3.0-30
+- * fix paths for automate script
+
+* Tue Dec 22 2009 Baris Metin <Talip-Baris.Metin@sophia.inria.fr> - Monitor-3.0-29
+- - separate pcucontrol as an svn module
+- - restore easy_instal back into post install stage of server-deps
+- - template imporovements for web interface
+
+* Thu Dec 17 2009 Baris Metin <Talip-Baris.Metin@sophia.inria.fr> - Monitor-3.0-28
+- do not need buildrequires. a new tag to fix centos builds
+
+* Thu Dec 17 2009 Baris Metin <Talip-Baris.Metin@sophia.inria.fr> - Monitor-3.0-27
+- fix rpm build issues
+
+* Wed Dec 16 2009 Baris Metin <Talip-Baris.Metin@sophia.inria.fr> - Monitor-3.0-26
+- to many changes, but mostly moved stuff around. there are some small fixes here and there.
+
+* Fri Nov 20 2009 Stephen Soltesz <soltesz@cs.princeton.edu> - Monitor-3.0-25
+- add option for site status to include both node & pcu status
+- improve ticket handling
+- template gadget.xml for a site-specific google-gadget summary
+
 * Thu Oct 22 2009 Baris Metin <Talip-Baris.Metin@sophia.inria.fr> - Monitor-3.0-24
 - - add install_date
 
@@ -458,8 +505,8 @@ rm -f %{zabbix_logdir}/zabbix_agentd.log
 - initial packaging
 
 
-%define module_current_branch 2.0
+%define module_current_branch 3.0
 
-%define taglevel 24
+%define taglevel 0
 
-%define version 3.0
+%define version 3.1