* downgrade the pcre minimal required version from 7.3 to 6.1 (#651823#c26)

* better compliance with the package guidelines
   (https://fedoraproject.org/wiki/Packaging:ScriptletSnippets#Systemd)
This commit is contained in:
Jose Pedro Oliveira 2011-04-28 17:24:21 +01:00
parent 7201c11a5d
commit 0a5491e948
1 changed files with 16 additions and 11 deletions

View File

@ -8,7 +8,7 @@
Name: syslog-ng
Version: 3.2.3
Release: 0.%{gitsnapshot}.3%{?dist}
Release: 0.%{gitsnapshot}.4%{?dist}
Summary: Next-generation syslog server
Group: System Environment/Daemons
@ -38,13 +38,13 @@ BuildRequires: glib2-devel >= 2.10.1
BuildRequires: libdbi-devel
BuildRequires: libnet-devel
BuildRequires: openssl-devel
BuildRequires: pcre-devel >= 7.3
BuildRequires: pcre-devel >= 6.1
BuildRequires: tcp_wrappers-devel
Requires: logrotate
Requires(post): /bin/systemctl
Requires(preun): /bin/systemctl
Requires(postun): /bin/systemctl
Requires(post): systemd-units
Requires(preun): systemd-units
Requires(postun): systemd-units
Provides: syslog
# merge separate syslog-vim package into one
@ -115,7 +115,7 @@ make DESTDIR=%{buildroot} install
%{__install} -d -m 755 %{buildroot}%{_sysconfdir}/%{name}
%{__install} -p -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/%{name}/syslog-ng.conf
# install init script
# install the service script
%{__install} -p -D -m 644 %{SOURCE2} %{buildroot}/%{system_service}/%{name}.service
%{__install} -d -m 755 %{buildroot}%{_sysconfdir}/sysconfig
@ -153,19 +153,19 @@ rm -rf %{buildroot}
%post
/sbin/ldconfig
/bin/systemctl enable %{name}.service
/bin/systemctl enable %{name}.service >/dev/null 2>&1 || :
%preun
if [ "$1" = 0 ]; then
/bin/systemctl stop %{name}.service
/bin/systemctl disable %{name}.service
/bin/systemctl stop %{name}.service >/dev/null 2>&1 || :
/bin/systemctl disable %{name}.service >/dev/null 2>&1 || :
fi
%postun
/sbin/ldconfig
if [ "$1" -ge 1 ]; then
/bin/systemctl condrestart %{name}.service
/bin/systemctl condrestart %{name}.service >/dev/null 2>&1 || :
fi
@ -231,6 +231,11 @@ fi
%changelog
* Thu Apr 28 2011 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.2.3-0.20110424.4
- downgrade the pcre minimal required version from 7.3 to 6.1 (#651823#c26)
- better compliance with the package guidelines
(https://fedoraproject.org/wiki/Packaging:ScriptletSnippets#Systemd)
* Thu Apr 28 2011 Matthias Runge <mrunge@matthias-runge.de> - 3.2.3-0.20110424.3
- honor pidfile
- disable ssl
@ -334,7 +339,7 @@ fi
- fix for CVE-2008-5110
* Mon Sep 15 2008 Peter Vrabec <pvrabec@redhat.com> 2.0.8-3
- do not conflicts with rsyslog, both rsyslog and syslog-ng use
- do not conflicts with rsyslog, both rsyslog and syslog-ng use
same pidfile and logrotate file (#441664)
* Sat Sep 6 2008 Tom "spot" Callaway <tcallawa@redhat.com> 2.0.8-2