[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: Review request 2: syslog-ng (syslog replacement daemon)



On 5/25/05, José Pedro Oliveira <jpo di uminho pt> wrote:
> Summary:
>   Syslog replacement daemon
>   http://www.balabit.com/products/syslog_ng/

Looks good. I have a few things to suggest, but the only significant
change is BuildRequires: which, since otherwise it won't build in
mock. See the attached patch.

Otherwise, I think it needs to be approved and built.

Cheers,
-- 
Konstantin Ryabitsev
Zlotniks, INC

"Выслухаў мядзьведзь казку і адарваў сабе хвост."
Index: syslog-ng.spec
===================================================================
RCS file: /cvs/extras/rpms/syslog-ng/FC-4/syslog-ng.spec,v
retrieving revision 1.5
diff -u -r1.5 syslog-ng.spec
--- syslog-ng.spec	27 May 2005 17:34:30 -0000	1.5
+++ syslog-ng.spec	21 Jun 2005 20:21:37 -0000
@@ -3,7 +3,7 @@
 
 Name:             syslog-ng
 Version:          1.6.8
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          Syslog replacement daemon
 
 Group:            System Environment/Daemons
@@ -16,9 +16,8 @@
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:    libol-devel >= 0.3.16
-BuildRequires:    flex, tcp_wrappers
-# Requires sed v3.95 (command line option -i)
-Requires:         logrotate, sed >= 3.95
+BuildRequires:    flex, tcp_wrappers, which
+Requires:         logrotate
 Requires(post):   chkconfig, initscripts
 Requires(preun):  chkconfig, initscripts
 Requires(postun): initscripts
@@ -46,7 +45,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%{__sed} -i  's|^#!/usr/local/bin/perl|#!%{__perl}|' contrib/relogger.pl
+sed -i  's|^#!/usr/local/bin/perl|#!%{__perl}|' contrib/relogger.pl
 chmod a-x contrib/syslog2ng
 
 %build
@@ -60,10 +59,10 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT%{_initrddir}
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
+install -d -m 755 $RPM_BUILD_ROOT%{_initrddir}
+install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
+install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
+install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
 
 install -p -m 755 contrib/fedora-packaging/syslog-ng.init \
     $RPM_BUILD_ROOT%{_initrddir}/syslog-ng
@@ -80,21 +79,20 @@
 
 %post
 # only rpm -i (not rpm {-U|-F})
-if [ $1 = 1 ]; then
+if [ "$1" = "1" ]; then
 	/sbin/chkconfig --add syslog-ng
-#	/sbin/service syslog-ng start
 fi
 
 %preun
 # only rpm -e (not rpm {-U|-F})
-if [ $1 = 0 ]; then
+if [ "$1" = "0" ]; then
 	/sbin/service syslog-ng stop > /dev/null 2>&1 || :
 	/sbin/chkconfig --del syslog-ng
 fi
 
 %postun
 # only rpm {-U|-F} (not rpm -e)
-if [ $1 = 1 ]; then
+if [ "$1" = "1" ]; then
     /sbin/service syslog-ng condrestart
 fi
 
@@ -112,11 +110,15 @@
 %config(noreplace) %{_sysconfdir}/%{name}/syslog-ng.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/syslog-ng
 %config(noreplace) %{_sysconfdir}/logrotate.d/syslog
-%{_mandir}/man5/*.5*
-%{_mandir}/man8/*.8*
+%{_mandir}/man*/*
 
 
 %changelog
+* Tue Jun 21 2005 Konstantin Ryabitsev <icon linux duke edu> - 1.6.8-2
+- BuildRequire which, since it's not part of the default buildgroup.
+- Remove sed requirement.
+- Small cosmetic changes.
+
 * Fri May 27 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.6.8-1
 - Update to 1.6.8.
 

[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]