From 912f470706cfc26582646f8b5696253d7eae56af Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Tue, 28 Aug 2012 10:50:09 +0200 Subject: [PATCH] =?UTF-8?q?Mise=20=C3=A0=20jour=20du=20fichier=20spec?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- smeserver-zabbix-agent.spec | 145 +++----------------------------------------- 1 file changed, 9 insertions(+), 136 deletions(-) diff --git a/smeserver-zabbix-agent.spec b/smeserver-zabbix-agent.spec index dc4e523..3bd3ed1 100644 --- a/smeserver-zabbix-agent.spec +++ b/smeserver-zabbix-agent.spec @@ -3,8 +3,8 @@ # Name: Daniel Berteaud %define name smeserver-zabbix-agent -%define version 0.1 -%define release 52 +%define version 0.2.0 +%define release 1 Summary: sme server integration of zabbix agent Name: %{name} Version: %{version} @@ -13,78 +13,12 @@ License: GNU GPL version 2 URL: http://www.zabbix.com/ Group: SMEserver/addon Source: %{name}-%{version}.tar.gz -Patch0: smeserver-zabbix-agent-0.1-hostname.patch -Patch1: smeserver-zabbix-agent-0.1-template_rename.patch -Patch2: smeserver-zabbix-agent-0.1-userparam_ext_ip.patch -Patch3: smeserver-zabbix-agent-0.1-userparam_ups.patch -Patch4: smeserver-zabbix-agent-0.1-userparam_mysql.patch -Patch5: smeserver-zabbix-agent-0.1-userparam_usedMem.patch -Patch6: smeserver-zabbix-agent-0.1-userparam_usedMem_brackets.patch -Patch7: smeserver-zabbix-agent-0.1-userparam_usedMem_key.patch -Patch8: smeserver-zabbix-agent-0.1-userparam_usedMem_Used.patch -Patch9: smeserver-zabbix-agent-0.1-userparam_usedMem_Used2.patch -Patch10: smeserver-zabbix-agent-0.1-userparam_MemStats.patch -Patch11: smeserver-zabbix-agent-0.1-userparam_MemStatsTypo.patch -Patch12: smeserver-zabbix-agent-0.1-userparam_Swap.patch -Patch13: smeserver-zabbix-agent-0.1-userparam_Swap_key.patch -Patch14: smeserver-zabbix-agent-0.1-userparam_removeUselessMemStats.patch -Patch15: smeserver-zabbix-agent-0.1-userparam_pusedMem.patch -Patch16: smeserver-zabbix-agent-0.1-userparam_upsCharge.patch -Patch17: smeserver-zabbix-agent-0.1-disable_passive_mode.patch -Patch18: smeserver-zabbix-agent-0.1-mail_in_stats.patch -Patch19: smeserver-zabbix-agent-0.1-event_zabbix_agent_update.patch -Patch20: smeserver-zabbix-agent-0.1-mail_in_stats_other_denied.patch -Patch21: smeserver-zabbix-agent-0.1-fix_expand_sudoers.patch -Patch22: smeserver-zabbix-agent-0.1-mail_out_stats.patch -Patch23: smeserver-zabbix-agent-0.1-mail_out_stats_typo.patch -Patch24: smeserver-zabbix-agent-0.1-mail_out_stats_ignore_local.patch -Patch25: smeserver-zabbix-agent-0.1-net_stats.patch -Patch26: smeserver-zabbix-agent-0.1-userparam_mysql_size.patch -Patch27: smeserver-zabbix-agent-0.1-adjust_masq.patch -Patch28: smeserver-zabbix-agent-0.1-timeout_comment.patch -Patch29: smeserver-zabbix-agent-0.1-buffers.patch -Patch30: smeserver-zabbix-agent-0.1-sudoers_mysql.patch -Patch31: smeserver-zabbix-agent-0.1-mysql_size_fixe.patch -Patch32: smeserver-zabbix-agent-0.1-userparam_swRaid_status.patch -Patch33: smeserver-zabbix-agent-0.1-userparam_comment.patch -Patch34: smeserver-zabbix-agent-0.1-userparam_megaraid.patch -Patch35: smeserver-zabbix-agent-0.1-userparam_yum_updates.patch -Patch36: smeserver-zabbix-agent-0.1-userparam_sensors.patch -Patch37: smeserver-zabbix-agent-0.1-sensors_fixes.patch -Patch38: smeserver-zabbix-agent-0.1-megaraid_parser.patch -Patch39: smeserver-zabbix-agent-0.1-mail_stats_via_cron.patch -Patch40: smeserver-zabbix-agent-0.1-mdstat_one_line.patch -Patch41: smeserver-zabbix-agent-0.1-megaraid_parser_fix.patch -Patch42: smeserver-zabbix-agent-0.1-cpu_num.patch -Patch43: smeserver-zabbix-agent-0.1-megaraid_fix_raid10.patch -Patch44: smeserver-zabbix-agent-0.1-userparam_smart.patch -Patch45: smeserver-zabbix-agent-0.1-smart_missing_return.patch -Patch46: smeserver-zabbix-agent-0.1-report_0_for_non_existing_drives.patch -Patch47: smeserver-zabbix-agent-0.1-run_megaraid_parser_as_root.patch -Patch48: smeserver-zabbix-agent-0.1-run_megaraid_parser_as_root2.patch -Patch49: smeserver-zabbix-agent-0.1-several_ups.patch -Patch50: smeserver-zabbix-agent-0.1-megaraid_options.patch -Patch51: smeserver-zabbix-agent-0.1-new_qpsmtpd.patch -Patch52: smeserver-zabbix-agent-0.1-megaraid_options_from_db.patch -Patch53: smeserver-zabbix-agent-0.1-disable_megaraid_log.patch -Patch54: smeserver-zabbix-agent-0.1-critical_vs_warning.patch -Patch55: smeserver-zabbix-agent-0.1-userparam_squid.patch -Patch56: smeserver-zabbix-agent-0.1-hostname_from_db.patch -Patch57: smeserver-zabbix-agent-0.1-userparam_diskio.patch -Patch58: smeserver-zabbix-agent-0.1-userparam_asterisk.patch -Patch59: smeserver-zabbix-agent-0.1-userparam_lvm.patch -Patch60: smeserver-zabbix-agent-0.1-add_usr_sbin_in_path.patch -Patch61: smeserver-zabbix-agent-0.1-statusmail.patch -Patch62: smeserver-zabbix-agent-0.1-configure_timeout.patch -Patch63: smeserver-zabbix-agent-0.1-better_asterisk_monitoring.patch -Patch64: smeserver-zabbix-agent-0.1-fix_closing_bracket.patch -Patch65: smeserver-zabbix-agent-0.1-check_crt_expiration.patch BuildArchitectures: noarch BuildRequires: e-smith-devtools BuildRoot: /var/tmp/%{name}-%{version} Requires: e-smith-release >= 7.0 -Requires: zabbix-agent +Requires: zabbix-agent => 2.0.0 Requires: smeserver-remoteuseraccess Requires: perl(IO::Socket) Requires: perl(Net::SSLeay) @@ -97,6 +31,11 @@ Zabbix is an entreprise-class open source distributed monitoring solution %changelog +* Thu Jun 14 2012 Daniel B. - 0.2.0-1.sme +- Import to GIT +- Remove certificate expiration script +- Make it 2.0 compatible + * Thu Jun 7 2012 Daniel B. - 0.1-52.sme - Add missing perl module in dependency @@ -294,72 +233,6 @@ solution %prep %setup -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 -%patch14 -p1 -%patch15 -p1 -%patch16 -p1 -%patch17 -p1 -%patch18 -p1 -%patch19 -p1 -%patch20 -p1 -%patch21 -p1 -%patch22 -p1 -%patch23 -p1 -%patch24 -p1 -%patch25 -p1 -%patch26 -p1 -%patch27 -p1 -%patch28 -p1 -%patch29 -p1 -%patch30 -p1 -%patch31 -p1 -%patch32 -p1 -%patch33 -p1 -%patch34 -p1 -%patch35 -p1 -%patch36 -p1 -%patch37 -p1 -%patch38 -p1 -%patch39 -p1 -%patch40 -p1 -%patch41 -p1 -%patch42 -p1 -%patch43 -p1 -%patch44 -p1 -%patch45 -p1 -%patch46 -p1 -%patch47 -p1 -%patch48 -p1 -%patch49 -p1 -%patch50 -p1 -%patch51 -p1 -%patch52 -p1 -%patch53 -p1 -%patch54 -p1 -%patch55 -p1 -%patch56 -p1 -%patch57 -p1 -%patch58 -p1 -%patch59 -p1 -%patch60 -p1 -%patch61 -p1 -%patch62 -p1 -%patch63 -p1 -%patch64 -p1 -%patch65 -p1 %build %{__mkdir_p} root/var/lib/zabbix/tmp @@ -382,9 +255,9 @@ rm -f %{name}-%{version}-filelist --file /var/lib/zabbix/bin/check_asterisk 'attr(0750,root,zabbix)' \ --file /var/lib/zabbix/bin/check_lvm 'attr(0755,root,root)' \ --file /var/lib/zabbix/bin/mailstatus.pl 'attr(0755,root,root)' \ - --file /var/lib/zabbix/bin/cert_expire.pl 'attr(0755,root,root)' \ --dir /var/lib/zabbix/tmp 'attr(0750,zabbix,zabbix)' \ > %{name}-%{version}-filelist +echo "%doc CHANGELOG.git" >> %{name}-%{version}-filelist %files -f %{name}-%{version}-filelist %defattr(-,root,root)