rpms/zabbix/EL-4 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 zabbix.spec, 1.7, 1.8

[Jarod Wilson (jwilson)]

Author: jwilson

Update of /cvs/pkgs/rpms/zabbix/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12700

Modified Files:
	.cvsignore sources zabbix.spec 
Log Message:
Update to zabbix 1.4.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/EL-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	30 Mar 2007 18:33:09 -0000	1.5
+++ .cvsignore	16 Jul 2007 14:36:16 -0000	1.6
@@ -2,3 +2,5 @@
 zabbix-1.1.5.tar.gz
 zabbix-1.1.6.tar.gz
 zabbix-1.1.7.tar.gz
+zabbix-1.4.tar.gz
+zabbix-1.4.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/EL-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	30 Mar 2007 18:33:09 -0000	1.5
+++ sources	16 Jul 2007 14:36:16 -0000	1.6
@@ -1 +1 @@
-ac24ab58ef1a985c1e2a5217386d5dba  zabbix-1.1.7.tar.gz
+c9e9a12eeb3ae784075cb7899f200889  zabbix-1.4.1.tar.gz


Index: zabbix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/EL-4/zabbix.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- zabbix.spec	30 Mar 2007 18:33:09 -0000	1.7
+++ zabbix.spec	16 Jul 2007 14:36:16 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           zabbix
-Version:        1.1.7
+Version:        1.4.1
 Release:        1%{?dist}
 Summary:        Open-source monitoring solution for your IT infrastructure
 
@@ -27,6 +27,7 @@
 
 BuildRequires:  %{database}-devel, net-snmp-devel
 BuildRequires:  openldap-devel, gnutls-devel
+BuildRequires:  iksemel-devel, curl-devel
 Requires:       logrotate, fping, net-snmp-libs
 Requires(pre):      /usr/sbin/useradd
 Requires(post):     /sbin/chkconfig
@@ -69,7 +70,7 @@
 %package web
 Summary:        Zabbix Web Frontend
 Group:          Applications/Internet
-Requires:       php-%{zdb}, php-gd, php
+Requires:       php, php-%{zdb}, php-gd, php-bcmath
 
 %description web
 The php frontend to display the zabbix web interface.
@@ -77,27 +78,31 @@
 %prep
 %setup -q
 
+# shuffle sql init files around to fix up install
+mkdir -p dbinit/{schema,data}
+cp create/schema/%{database}.sql dbinit/schema/
+cp create/data/images_%{database}.sql dbinit/data/
+cp create/data/data.sql dbinit/data/
+
 # fix up some lib64 issues
 %{__perl} -pi.orig -e 's|_LIBDIR=/usr/lib|_LIBDIR=%{_libdir}|g' \
     configure
 
-# fix up pt_br
-%{__chmod} a-x frontends/php/include/locales/pt_br.inc.php
-%{__sed} -i 's/\r//' frontends/php/include/locales/pt_br.inc.php
 
 %build
+#export LIBCURL_LDFLAGS="-I%{_includedir}/curl"
+#export LIBCURL_LIBS="-lcurl"
 %configure \
     --enable-server \
     --enable-agent \
     --with-%{zdb} \
     --with-net-snmp \
     --with-ldap \
-    --disable-static
+    --with-libcurl \
+    --with-jabber
 
-# --disable-static is partially broken atm,
-# -static still gets into CFLAGS, so fix up in make
-# (and even then, .a files still show their face...)
-make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
+#make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -115,6 +120,13 @@
     $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/
 ln -s ../../../..%{_sysconfdir}/%{name}/db.inc.php \
     $RPM_BUILD_ROOT%{_datadir}/%{name}/include/db.inc.php
+cat << __EOF__ >> $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/zabbix.conf.php
+# This file is a place-holder. When you run through the zabbix
+# web setup, a proper configuration file should be generated
+# for you to drop in this location.
+__EOF__
+ln -s ../../../..%{_sysconfdir}/%{name}/zabbix.conf.php \
+    $RPM_BUILD_ROOT%{_datadir}/%{name}/conf/zabbix.conf.php
 # kill off .htaccess files, options set in SOURCE1
 rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/include/.htaccess
 rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/include/classes/.htaccess
@@ -141,8 +153,18 @@
 install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/zabbix
 install -m 0755 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/zabbix-agent
 
+# set up config dir
+
+# install
 make DESTDIR=$RPM_BUILD_ROOT install
-rm -rf $RPM_BUILD_ROOT%{_libdir}/libzbx*.a
+
+# nuke static libs and empty oracle upgrade sql
+rm -rf $RPM_BUILD_ROOT%{_libdir}/libzbx*.a upgrades/dbpatches/1.4/oracle
+# nuke extraneous sql files
+rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/create
+# nuke erronious executable permissions
+chmod -x src/zabbix_agent/eventlog.c
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -180,7 +202,7 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING FAQ NEWS README
-%doc create/data create/%{database}
+%doc docs/*.pdf upgrades/dbpatches dbinit
 %dir %{_sysconfdir}/%{name}
 %{_bindir}/zabbix_server
 %{_sysconfdir}/init.d/zabbix
@@ -208,11 +230,37 @@
 %defattr(-,root,root,-)
 %doc README
 %dir %{_sysconfdir}/%{name}
+%config(noreplace) %{_sysconfdir}/%{name}/zabbix.conf.php
 %config(noreplace) %{_sysconfdir}/%{name}/db.inc.php
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
-%{_datadir}/%{name}
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/audio
+%dir %{_datadir}/%{name}/conf
+%dir %{_datadir}/%{name}/images
+%dir %{_datadir}/%{name}/include
+%dir %{_datadir}/%{name}/js
+%{_datadir}/%{name}/*.php
+%{_datadir}/%{name}/css.css
+%{_datadir}/%{name}/audio/*
+%{_datadir}/%{name}/conf/*
+%{_datadir}/%{name}/images/*
+%{_datadir}/%{name}/include/*
+%{_datadir}/%{name}/js/*
 
 %changelog
+* Mon Jul 02 2007 Jarod Wilson <jwilson at redhat.com> 1.4.1-1
+- New upstream release
+
+* Fri Jun 29 2007 Jarod Wilson <jwilson at redhat.com> 1.4-3
+- Install correct sql init files (#244991)
+- Add Requires: php-bcmath to zabbix-web (#245767)
+
+* Wed May 30 2007 Jarod Wilson <jwilson at redhat.com> 1.4-2
+- Add placeholder zabbix.conf.php
+
+* Tue May 29 2007 Jarod Wilson <jwilson at redhat.com> 1.4-1
+- New upstream release
+
 * Fri Mar 30 2007 Jarod Wilson <jwilson at redhat.com> 1.1.7-1
 - New upstream release