Author: baggins Date: Sun Feb 5 16:52:21 2012 GMT Module: packages Tag: HEAD ---- Log message: - rel 3 - merge systemd stuff into main package
---- Files affected: packages/syslog-ng: syslog-ng.spec (1.240 -> 1.241) ---- Diffs: ================================================================ Index: packages/syslog-ng/syslog-ng.spec diff -u packages/syslog-ng/syslog-ng.spec:1.240 packages/syslog-ng/syslog-ng.spec:1.241 --- packages/syslog-ng/syslog-ng.spec:1.240 Sun Feb 5 00:45:06 2012 +++ packages/syslog-ng/syslog-ng.spec Sun Feb 5 17:52:16 2012 @@ -26,7 +26,7 @@ Summary(pt_BR.UTF-8): Daemon de log nova geração Name: syslog-ng Version: 3.3.4 -Release: 2 +Release: 3 License: GPL v2+ with OpenSSL exception Group: Daemons Source0: http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/%{version}/source/%{name}_%{version}.tar.gz @@ -82,10 +82,13 @@ Requires: pcre >= 6.1 Requires: psmisc >= 20.1 Requires: rc-scripts >= 0.4.3.0 +Requires: systemd-units >= 0.38 # for afsocket Requires: libnet >= 1:1.1.2.1-7 # for afsocket and dbparser Requires: openssl >= 0.9.8 +Provides: service(klogd) +Provides: service(syslog) Provides: syslogdaemon Obsoletes: syslog-ng-module-afsocket Obsoletes: syslog-ng-module-dbparser @@ -146,22 +149,6 @@ %description upstart -l pl.UTF-8 Opis zadania Upstart dla demona syslog-ng. -%package systemd -Summary: systemd units for syslog-ng -Summary(pl.UTF-8): Jednostki systemd dla demona syslog-ng -Group: Daemons -Requires: %{name} = %{version}-%{release} -Requires: systemd -Requires: systemd-units -Provides: service(klogd) -Provides: service(syslog) - -%description systemd -systemd units for syslog-ng. - -%description systemd -l pl.UTF-8 -Jednostki systemd dla demona syslog-ng. - %package module-afmongodb Summary: MongoDB destination support module for syslog-ng Summary(pl.UTF-8): Moduł sysloga-ng do obsługi zapisu logów w bazie MongoDB @@ -352,11 +339,20 @@ /sbin/chkconfig --add syslog-ng %service syslog-ng restart "syslog-ng daemon" +%systemd_post syslog-ng.service + %preun if [ "$1" = "0" ]; then %service syslog-ng stop /sbin/chkconfig --del syslog-ng fi +%systemd_preun syslog-ng.service + +%postun +%systemd_reload + +%triggerpostun -- syslog-ng < 3.3.4-3 +%systemd_trigger syslog-ng.service %triggerun -- syslog-ng < 3.0 sed -i -e 's#sync(\(.*\))#flush_lines(\1)#g' /etc/syslog-ng/syslog-ng.conf @@ -381,15 +377,6 @@ # use SERVICE_syslog=y in upstart job environment instead of SERVICE=syslog %{__sed} -i -e 's,SERVICE=syslog,SERVICE_syslog=y,' /etc/init/*.conf || : -%post systemd -%systemd_post syslog-ng.service - -%preun systemd -%systemd_preun syslog-ng.service - -%postun systemd -%systemd_reload - %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig @@ -406,6 +393,7 @@ %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/syslog-ng/syslog-ng.conf %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/syslog-ng %attr(754,root,root) /etc/rc.d/init.d/syslog-ng +%{systemdunitdir}/syslog-ng.service %dir %{_libdir}/syslog-ng %attr(755,root,root) %{_libdir}/syslog-ng/libaffile.so %attr(755,root,root) %{_libdir}/syslog-ng/libafprog.so @@ -467,10 +455,6 @@ %config(noreplace) %verify(not md5 mtime size) /etc/init/%{name}.conf %endif -%files systemd -%defattr(644,root,root,755) -%{systemdunitdir}/syslog-ng.service - %if %{with mongodb} %files module-afmongodb %defattr(644,root,root,755) @@ -506,6 +490,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.241 2012/02/05 16:52:16 baggins +- rel 3 +- merge systemd stuff into main package + Revision 1.240 2012/02/04 23:45:06 blues - provides service(klogd) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/syslog-ng/syslog-ng.spec?r1=1.240&r2=1.241&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
