pool/rsyslog
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 234665 from Base:System

Browse Source 
- rpm: use _rundir rpm macro if defined (bnc#873857)

OBS-URL: https://build.opensuse.org/request/show/234665
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rsyslog?expand=0&rev=88
This commit is contained in:
Stephan Kulow 2014-05-20 12:24:06 +00:00 committed by Git OBS Bridge
commit b1ef67747d
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rsyslog.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon May 19 07:37:34 UTC 2014 - mt@suse.com
- rpm: use _rundir rpm macro if defined (bnc#873857)
------------------------------------------------------------------- -------------------------------------------------------------------
Sat May 17 10:02:12 UTC 2014 - heinemannj66@gmail.com Sat May 17 10:02:12 UTC 2014 - heinemannj66@gmail.com

8
rsyslog.spec
View File

@ -60,7 +60,11 @@ Release: 0
%bcond_with zeromq %bcond_with zeromq
%define upstream_version %{version} %define upstream_version %{version}
%define rsyslogdocdir %{_docdir}/%{name} %define rsyslogdocdir %{_docdir}/%{name}
%if %{defined _rundir}
%define rsyslog_rundir %{_rundir}/rsyslog
%else
%define rsyslog_rundir %{_localstatedir}/run/rsyslog %define rsyslog_rundir %{_localstatedir}/run/rsyslog
%endif
%define rsyslog_sockets_cfg %{rsyslog_rundir}/additional-log-sockets.conf %define rsyslog_sockets_cfg %{rsyslog_rundir}/additional-log-sockets.conf
%define rsyslog_module_dir_nodeps %{_libdir}/rsyslog/ %define rsyslog_module_dir_nodeps %{_libdir}/rsyslog/
%define rsyslog_module_dir_withdeps %{_libdir}/rsyslog/ %define rsyslog_module_dir_withdeps %{_libdir}/rsyslog/
@ -144,11 +148,11 @@ BuildRequires: libnet-devel
# mmnormalize support # mmnormalize support
BuildRequires: pkgconfig(libee) >= 0.4.0 BuildRequires: pkgconfig(libee) >= 0.4.0
BuildRequires: pkgconfig(lognorm) >= 1.0.0 BuildRequires: pkgconfig(lognorm) >= 1.0.0
%endif # with mmnormalize %endif
# #
# mmjsonparse needs liblognorm, # mmjsonparse needs liblognorm,
# but json check is unconditional # but json check is unconditional
BuildRequires: pkgconfig(json) >= 0.9 BuildRequires: pkgconfig(json-c) >= 0.9
BuildRequires: pkgconfig(libee) >= 0.4.0 BuildRequires: pkgconfig(libee) >= 0.4.0
BuildRequires: pkgconfig(libestr) >= 0.1.9 BuildRequires: pkgconfig(libestr) >= 0.1.9
BuildRequires: pkgconfig(uuid) >= 2.21.0 BuildRequires: pkgconfig(uuid) >= 2.21.0