Author: glen Date: Tue Sep 15 11:54:19 2009 GMT Module: packages Tag: HEAD ---- Log message: - utf8 fixes in cgi, spec cosmetics; rel 6
---- Files affected: packages/nagios: nagios.spec (1.145 -> 1.146) ---- Diffs: ================================================================ Index: packages/nagios/nagios.spec diff -u packages/nagios/nagios.spec:1.145 packages/nagios/nagios.spec:1.146 --- packages/nagios/nagios.spec:1.145 Mon Sep 14 14:37:45 2009 +++ packages/nagios/nagios.spec Tue Sep 15 13:54:13 2009 @@ -10,7 +10,7 @@ Summary(pt_BR.UTF-8): Programa para monitoração de máquinas e serviços Name: nagios Version: 3.2.0 -Release: 5 +Release: 6 License: GPL v2 Group: Networking Source0: http://dl.sourceforge.net/nagios/%{name}-%{version}.tar.gz @@ -39,7 +39,6 @@ %endif BuildRequires: rpmbuild(macros) >= 1.268 BuildRequires: sed >= 4.0 -BuildRequires: tar >= 1:1.15.1 Requires(post,preun): /sbin/chkconfig Requires: %{name}-common = %{version}-%{release} Requires: rc-scripts @@ -182,7 +181,7 @@ %patch4 -p1 %patch5 -p1 -find -name .cvsignore | xargs rm +find -name .cvsignore -o -name .gitignore | xargs rm mv nagios-config-*/objects/*.cfg sample-config/template-object mv nagios-config-*/*.cfg sample-config @@ -240,7 +239,7 @@ %endif install -d $RPM_BUILD_ROOT%{_includedir}/%{name} -install include/*.h $RPM_BUILD_ROOT%{_includedir}/%{name} +cp -a include/*.h $RPM_BUILD_ROOT%{_includedir}/%{name} %{__make} install-unstripped \ DESTDIR=$RPM_BUILD_ROOT \ @@ -248,9 +247,9 @@ INIT_OPTS="" \ COMMAND_OPTS="" -install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name} -install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/%{name} -install %{SOURCE4} $RPM_BUILD_ROOT%{_datadir} +install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name} +cp -a %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/%{name} +cp -a %{SOURCE4} $RPM_BUILD_ROOT%{_datadir} # install templated configuration files for a in nagios.cfg resource.cfg commands.cfg contactgroups.cfg contacts.cfg templates.cfg timeperiods.cfg; do @@ -258,9 +257,9 @@ done # webserver files -install apache.conf $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/apache.conf -install apache.conf $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/httpd.conf -install lighttpd.conf $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/lighttpd.conf +cp -a apache.conf $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/apache.conf +cp -a apache.conf $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/httpd.conf +cp -a lighttpd.conf $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/lighttpd.conf cp -a sample-config/cgi.cfg $RPM_BUILD_ROOT%{_webapps}/%{_webapp} > $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/passwd echo 'nagios:' > $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/group @@ -446,6 +445,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.146 2009/09/15 11:54:13 glen +- utf8 fixes in cgi, spec cosmetics; rel 6 + Revision 1.145 2009/09/14 12:37:45 glen - update configs ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios/nagios.spec?r1=1.145&r2=1.146&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
