Author: glen Date: Thu Mar 16 22:01:56 2006 GMT Module: SPECS Tag: AC-branch ---- Log message: - merged changes from HEAD, rel 20
---- Files affected: SPECS: sysklogd.spec (1.112 -> 1.112.2.1) ---- Diffs: ================================================================ Index: SPECS/sysklogd.spec diff -u SPECS/sysklogd.spec:1.112 SPECS/sysklogd.spec:1.112.2.1 --- SPECS/sysklogd.spec:1.112 Wed Dec 7 12:12:06 2005 +++ SPECS/sysklogd.spec Thu Mar 16 23:01:50 2006 @@ -10,7 +10,7 @@ Summary(tr): Linux sistem ve çekirdek kayýt süreci Name: sysklogd Version: 1.4.1 -Release: 19 +Release: 20 License: GPL Group: Daemons Source0: http://www.ibiblio.org/pub/Linux/system/daemons/%{name}-%{version}.tar.gz @@ -38,8 +38,7 @@ Patch12: %{name}-SO_BSDCOMPAT.patch Patch13: %{name}-ksyms.patch URL: http://www.infodrom.org/projects/sysklogd/ -#BuildRequires: fork-on-start-is-broken -BuildRequires: rpmbuild(macros) >= 1.202 +BuildRequires: rpmbuild(macros) >= 1.268 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _exec_prefix / @@ -107,12 +106,12 @@ Requires: klogd Requires: logrotate >= 3.2-3 Requires: psmisc >= 20.1 +Provides: group(syslog) Provides: syslogdaemon Provides: user(syslog) -Provides: group(syslog) +Obsoletes: msyslog Obsoletes: sysklogd Obsoletes: syslog-ng -Obsoletes: msyslog %description -n syslog This is the Linux system logging program. It is run as a daemon @@ -141,8 +140,8 @@ Requires(pre): /usr/bin/getgid Requires(pre): /usr/sbin/groupadd Requires(pre): /usr/sbin/useradd -Provides: user(syslog) Provides: group(syslog) +Provides: user(syslog) Obsoletes: sysklogd %description -n klogd @@ -172,6 +171,7 @@ %build %{__make} \ + CC="%{__cc}" \ OPTIMIZE="%{rpmcflags} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" \ LDFLAGS="%{rpmldflags}" @@ -203,6 +203,9 @@ echo .so sysklogd.8 > $RPM_BUILD_ROOT%{_mandir}/man8/syslogd.8 +# our strip can't strip otherwise +chmod u+w $RPM_BUILD_ROOT%{_sbindir}/{klogd,syslogd} + %pre -n syslog %groupadd -P syslog -g 18 syslog %useradd -P syslog -u 18 -g syslog -c "Syslog User" syslog @@ -222,20 +225,12 @@ done /sbin/chkconfig --add syslog -if [ -f /var/lock/subsys/syslog ]; then - /etc/rc.d/init.d/syslog restart 1>&2 -else - echo "Run \"/etc/rc.d/init.d/syslog start\" to start syslog daemon." 1>&2 -fi -if [ -f /var/lock/subsys/klogd ]; then - /etc/rc.d/init.d/klogd restart 1>&2 -fi +%service syslog restart "syslog daemon" +%service -q klogd restart %preun -n syslog if [ "$1" = "0" ]; then - if [ -f /var/lock/subsys/syslog ]; then - /etc/rc.d/init.d/syslog stop 1>&2 - fi + %service syslog stop /sbin/chkconfig --del syslog fi @@ -248,20 +243,15 @@ %pre -n klogd %groupadd -P klogd -g 18 syslog %useradd -P klogd -u 18 -g syslog -c "Syslog User" syslog +%addusertogroup syslog logs %post -n klogd /sbin/chkconfig --add klogd -if [ -f /var/lock/subsys/klogd ]; then - /etc/rc.d/init.d/klogd restart 1>&2 -else - echo "Run \"/etc/rc.d/init.d/klogd start\" to start kernel logger daemon." 1>&2 -fi +%service klogd restart "kernel logger daemon" %preun -n klogd if [ "$1" = "0" ]; then - if [ -f /var/lock/subsys/klogd ]; then - /etc/rc.d/init.d/klogd stop 1>&2 - fi + %service klogd stop /sbin/chkconfig --del klogd fi @@ -302,7 +292,7 @@ %attr(754,root,root) /etc/rc.d/init.d/syslog %attr(640,root,root) %ghost /var/log/* %attr(755,root,root) %{_sbindir}/syslogd -%attr(755,root,root) %{_bindir}/* +%attr(755,root,root) %{_bindir}/syslogd-listfiles %{_mandir}/man5/* %{_mandir}/man8/sys* @@ -321,6 +311,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.112.2.1 2006/03/16 22:01:50 glen +- merged changes from HEAD, rel 20 + Revision 1.112 2005/12/07 11:12:06 glen - add syslog uid to logs group; rel 19 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/sysklogd.spec?r1=1.112&r2=1.112.2.1&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
