Author: blues Date: Sat Oct 22 17:02:20 2011 GMT Module: packages Tag: HEAD ---- Log message: - collection3 subpackage more fixes: missing files, requires, etc. NFY
---- Files affected: packages/collectd: collectd.spec (1.110 -> 1.111) ---- Diffs: ================================================================ Index: packages/collectd/collectd.spec diff -u packages/collectd/collectd.spec:1.110 packages/collectd/collectd.spec:1.111 --- packages/collectd/collectd.spec:1.110 Sat Oct 22 10:23:33 2011 +++ packages/collectd/collectd.spec Sat Oct 22 19:02:15 2011 @@ -69,7 +69,7 @@ Summary(pl.UTF-8): Zbieranie informacji o systemie w plikach RRD Name: collectd Version: 5.0.0 -Release: 5 +Release: 5.1 License: GPL v2 Group: Daemons Source0: http://collectd.org/files/%{name}-%{version}.tar.bz2 @@ -271,8 +271,10 @@ Summary(pl.UTF-8): Web script for collectd Group: Applications/WWW Requires: %{name} = %{version}-%{release} +Requires: perl-Collectd = %{version}-%{release} Requires: perl(Config::General) Requires: perl(HTML::Entities) +Requires: perl(Regexp::Common) Requires: perl(RRDs) Requires: webserver(cgi) Suggests: fonts-TTF-DejaVu @@ -1253,7 +1255,7 @@ %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT{%{_var}/{log/,lib/%{name}},/etc/{rc.d/init.d/,collectd.d}} \ - $RPM_BUILD_ROOT{%{_appdir}/cgi-bin,%{_webappdir},%{_pkglibdir},%{perl_vendorlib}/} + $RPM_BUILD_ROOT{%{_appdir}/cgi-bin,%{_webappdir},%{_pkglibdir},%{perl_vendorlib}/,%{_mandir}/man3} %{__make} install \ DESTDIR=$RPM_BUILD_ROOT @@ -1269,6 +1271,9 @@ install %{SOURCE4} $RPM_BUILD_ROOT%{_webappdir}/lighttpd.conf cp -R contrib/collection3 $RPM_BUILD_ROOT%{_appdir} +mv $RPM_BUILD_ROOT%{_appdir}/collection3/etc/collection.conf $RPM_BUILD_ROOT%{_webappdir}/collection3.conf +ln -sf %{_webappdir}/collection3.conf $RPM_BUILD_ROOT%{_appdir}/collection3/etc/collection.conf +sed -i -e 's@#DataDir "/var/lib/collectd/rrd"@DataDir "%{_var}/lib/%{name}"@' $RPM_BUILD_ROOT%{_webappdir}/collection3.conf ### Configs instalation ### for i in `egrep "^(#|)LoadPlugin" src/collectd.conf |awk '{print $NF}' ` ; do @@ -1284,6 +1289,7 @@ install %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/rrdtool.conf mv $RPM_BUILD_ROOT%{_datadir}/perl5/Collectd* $RPM_BUILD_ROOT%{perl_vendorlib}/ +mv $RPM_BUILD_ROOT/usr/man/man3/Collectd::Unixsock.3pm $RPM_BUILD_ROOT%{_mandir}/man3/ # Cleanups: rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la @@ -1422,6 +1428,7 @@ %doc AUTHORS ChangeLog README TODO contrib %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.conf %dir %{_sysconfdir}/%{name}.d +%dir %{_webappdir} %attr(755,root,root) %{_sbindir}/collectd %attr(755,root,root) %{_sbindir}/collectdmon %attr(755,root,root) %{_bindir}/collectdctl @@ -1459,7 +1466,6 @@ %files collection %defattr(644,root,root,755) -%dir %{_webappdir} %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/collection.conf %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/apache.conf %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/httpd.conf @@ -1470,9 +1476,12 @@ %files collection3 %defattr(644,root,root,755) +%doc contrib/collection3/README +%config(noreplace) %verify(not md5 mtime size) %{_webappdir}/collection3.conf %dir %{_appdir}/collection3 %dir %{_appdir}/collection3/bin %attr(755,root,root) %{_appdir}/collection3/bin/*.cgi +%{_appdir}/collection3/etc %{_appdir}/collection3/lib %{_appdir}/collection3/share @@ -1974,6 +1983,7 @@ %defattr(644,root,root,755) %{perl_vendorlib}/Collectd.pm %{perl_vendorlib}/Collectd +%{_mandir}/man3/*.3* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -1981,6 +1991,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.111 2011/10/22 17:02:15 blues +- collection3 subpackage more fixes: missing files, requires, etc. NFY + Revision 1.110 2011/10/22 08:23:33 arekm - release 5 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/collectd/collectd.spec?r1=1.110&r2=1.111&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
