mrunge: systemd fixes (by Bill Nottingham) merged from master to f15 branch
This commit is contained in:
parent
e8cb598998
commit
4cad221c05
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
Name: syslog-ng
|
Name: syslog-ng
|
||||||
Version: 3.2.3
|
Version: 3.2.3
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
Summary: Next-generation syslog server
|
Summary: Next-generation syslog server
|
||||||
|
|
||||||
Group: System Environment/Daemons
|
Group: System Environment/Daemons
|
||||||
|
@ -27,9 +27,9 @@ BuildRequires: bison
|
||||||
BuildRequires: flex
|
BuildRequires: flex
|
||||||
BuildRequires: eventlog-devel >= %{evtlog_ver}
|
BuildRequires: eventlog-devel >= %{evtlog_ver}
|
||||||
BuildRequires: glib2-devel >= 2.10.1
|
BuildRequires: glib2-devel >= 2.10.1
|
||||||
BuildRequires: libdbi-devel
|
#BuildRequires: libdbi-devel
|
||||||
BuildRequires: libnet-devel
|
BuildRequires: libnet-devel
|
||||||
BuildRequires: openssl-devel
|
#BuildRequires: openssl-devel
|
||||||
BuildRequires: pcre-devel >= 6.1
|
BuildRequires: pcre-devel >= 6.1
|
||||||
BuildRequires: tcp_wrappers-devel
|
BuildRequires: tcp_wrappers-devel
|
||||||
|
|
||||||
|
@ -88,7 +88,8 @@ developing applications that use %{name}.
|
||||||
--disable-ssl \
|
--disable-ssl \
|
||||||
--with-module-dir=/%{_lib}/%{name} \
|
--with-module-dir=/%{_lib}/%{name} \
|
||||||
--enable-spoof-source \
|
--enable-spoof-source \
|
||||||
--enable-dynamic-linking
|
--enable-dynamic-linking \
|
||||||
|
--enable-systemd
|
||||||
|
|
||||||
# remove rpath
|
# remove rpath
|
||||||
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
|
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
|
||||||
|
@ -142,7 +143,7 @@ rm -rf %{buildroot}
|
||||||
|
|
||||||
%post
|
%post
|
||||||
/sbin/ldconfig
|
/sbin/ldconfig
|
||||||
/bin/systemctl enable %{name}.service >/dev/null 2>&1 || :
|
/bin/systemctl daemon-reload || :
|
||||||
|
|
||||||
%preun
|
%preun
|
||||||
if [ "$1" = 0 ]; then
|
if [ "$1" = 0 ]; then
|
||||||
|
@ -157,6 +158,10 @@ if [ "$1" -ge 1 ]; then
|
||||||
/bin/systemctl condrestart %{name}.service >/dev/null 2>&1 || :
|
/bin/systemctl condrestart %{name}.service >/dev/null 2>&1 || :
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
%triggerun -- syslog-ng < 3.2.3
|
||||||
|
if /sbin/chkconfig --level 3 %{name} ; then
|
||||||
|
/bin/systemctl enable %{name}.service >/dev/null 2>&1 || :
|
||||||
|
fi
|
||||||
|
|
||||||
%triggerin -- vim-common
|
%triggerin -- vim-common
|
||||||
VIMVERNEW=`rpm -q --qf='%%{epoch}:%%{version}\n' vim-common | sort | tail -n 1 | sed -e 's/[0-9]*://' | sed -e 's/\.[0-9]*$//' | sed -e 's/\.//'`
|
VIMVERNEW=`rpm -q --qf='%%{epoch}:%%{version}\n' vim-common | sort | tail -n 1 | sed -e 's/[0-9]*://' | sed -e 's/\.[0-9]*$//' | sed -e 's/\.//'`
|
||||||
|
@ -220,6 +225,10 @@ fi
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri May 6 2011 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.2.3-2
|
||||||
|
- Fix systemd-related scriptlets (Bill Nottingham)
|
||||||
|
- Explicitly add --enable-systemd to configure's command line
|
||||||
|
|
||||||
* Mon May 2 2011 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.2.3-1
|
* Mon May 2 2011 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.2.3-1
|
||||||
- updated to 3.2.3 final
|
- updated to 3.2.3 final
|
||||||
- cleaned the sysconfig file
|
- cleaned the sysconfig file
|
||||||
|
|
Loading…
Reference in New Issue