- added ac25x patch needed for autoconf 2.53

- use config(noreplace)
- fixed bashism in %%post
- release 3

Changed files:
    syslog-ng-ac25x.patch -> 1.1
    syslog-ng.spec -> 1.60

diff --git a/syslog-ng-ac25x.patch b/syslog-ng-ac25x.patch
new file mode 100644 (file)
index 0000000..c99a97b
--- /dev/null
+++ b/syslog-ng-ac25x.patch
@@ -0,0 +1,26 @@
+--- syslog-ng-1.4.15/configure.in.orig Mon May 13 21:12:40 2002
++++ syslog-ng-1.4.15/configure.in      Mon May 13 21:15:15 2002
+@@ -97,12 +97,12 @@
+ AC_FUNC_VPRINTF
+ AC_CHECK_LIB(door, door_create)
+ AC_CHECK_FUNCS(select snprintf vsnprintf strerror inet_aton strncpy getutent)
+-AC_CHECK_FUNC(getopt_long,,[LIBOBJS="getopt.o getopt1.o $LIBOBJS"])
+-AC_CHECK_FUNC(strcasecmp,,[LIBOBJS="strcasecmp.o $LIBOBJS"])
++AC_CHECK_FUNC(getopt_long,,[AC_LIBOBJ([getopt]); AC_LIBOBJ([getopt1]);])
++AC_CHECK_FUNC(strcasecmp,,[AC_LIBOBJ([strcasecmp])])
+ 
+ if test "x$ac_cv_func_snprintf" = "xno" -o \
+       "x$ac_cv_func_vsnprintf" = "xno"; then
+-      LIBOBJS="snprintf.o $LIBOBJS"
++      AC_LIBOBJ([snprintf])
+ fi
+ 
+ if test "x$ac_cv_lib_door_door_create" = "xyes"; then
+@@ -166,7 +166,6 @@
+       AC_DEFINE(WITH_DEBUG)
+ fi
+ AC_SUBST(YFLAGS)
+-AC_SUBST(LIBOBJS)
+ 
+ AC_SUBST(MAKE_CLASS)
+ 

diff --git a/syslog-ng.spec b/syslog-ng.spec
index 382f24ffcf650ee029a60927d23e1d974c603ffb..fbbf501deef02ec33ea1f9700558f2c9fbcd4c21 100644 (file)
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -3,7 +3,7 @@ Summary(pl):    Syslog-ng - zamiennik syskloga
 Summary(pt_BR):        Daemon de log nova geração
 Name:          syslog-ng
 Version:       1.4.15
-Release:       2
+Release:       3
 License:       GPL
 Group:         Daemons
 Source0:       http://www.balabit.hu/downloads/syslog-ng/1.4/%{name}-%{version}.tar.gz
@@ -12,13 +12,14 @@ Source2:    %{name}.conf
 Source3:       %{name}.logrotate
 Patch0:                %{name}-autoconf.patch
 Patch1:                %{name}-notestlibolver.patch
+Patch2:                %{name}-ac25x.patch
 URL:           http://www.balabit.hu/products/syslog-ng/
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: libol-static >= 0.2.21
 BuildRequires: flex
+BuildRequires: libol-static >= 0.2.21
 Prereq:                rc-scripts >= 0.2.0
-Prereq:                /sbin/chkconfig
+Requires(post,preun):  /sbin/chkconfig
 Requires:      logrotate
 Requires:      fileutils
 Requires:      psmisc >= 20.1
@@ -54,6 +55,7 @@ facility/prioridade como o syslog original.
 %setup -q
 %patch0 -p1
 %patch1 -p0
+%patch2 -p1
 
 %build
 rm -f missing
@@ -91,7 +93,7 @@ done
 
 /sbin/chkconfig --add syslog-ng
 if [ -f /var/lock/subsys/syslog-ng ]; then
-       /etc/rc.d/init.d/syslog-ng restart &>/dev/null
+       /etc/rc.d/init.d/syslog-ng restart >/dev/null 2>&1
 else
        echo "Run \"/etc/rc.d/init.d/syslog-ng start\" to start syslog-ng daemon."
 fi
@@ -111,8 +113,8 @@ fi
 %defattr(644,root,root,755)
 %doc doc/*.gz doc/sgml/syslog-ng.txt*
 %attr(750,root,root) %dir %{_sysconfdir}/syslog-ng
-%attr(640,root,root) %config %verify(not size mtime md5) %{_sysconfdir}/syslog-ng/syslog-ng.conf
-%attr(640,root,root) %config %verify(not size mtime md5) %{_sysconfdir}/logrotate.d/syslog-ng
+%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/syslog-ng/syslog-ng.conf
+%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/logrotate.d/syslog-ng
 %attr(754,root,root) /etc/rc.d/init.d/syslog-ng
 %attr(755,root,root) %{_sbindir}/syslog-ng
 %{_mandir}/man[58]/*