- Fixed SLES-11 build that does not have rst2man/python-docutils;

added pre-built rscryutil.1 and rsgtutil.1 as sources because
  v7.3.14 does not ship them pre-built any more.

OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=148
This commit is contained in:
2013-05-13 09:46:03 +00:00
committed by Git OBS Bridge
parent ae9c65dc33
commit ad0f939310
4 changed files with 22 additions and 1 deletions

3
rscryutil.1.gz Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8db256a6a22713b44f0803a1d65ce7c33800843e6383352df4c48a878e3b762f
size 2615

3
rsgtutil.1.gz Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8ed6549e69c3c1c07b7b01437a7eb610224a4f2de954caae6a43a6242b6957c8
size 2732

View File

@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon May 13 09:42:56 UTC 2013 - mt@suse.de
- Fixed SLES-11 build that does not have rst2man/python-docutils;
added pre-built rscryutil.1 and rsgtutil.1 as sources because
v7.3.14 does not ship them pre-built any more.
-------------------------------------------------------------------
Tue May 7 18:27:48 UTC 2013 - mt@suse.de

View File

@@ -89,7 +89,6 @@ BuildRequires: dos2unix
BuildRequires: openssl-devel
BuildRequires: pcre-devel
BuildRequires: pkgconfig
BuildRequires: python-docutils
BuildRequires: zlib-devel
%if %{with elasticsearch}
BuildRequires: curl-devel
@@ -159,6 +158,9 @@ BuildRequires: pkgconfig(uuid) >= 2.21.0
%else
BuildRequires: libuuid-devel
%endif
%if 0%{?suse_version} >= 1200
BuildRequires: python-docutils
%endif
%if %{with systemd}
%{?systemd_requires}
BuildRequires: pkgconfig(systemd)
@@ -169,6 +171,8 @@ Source1: rsyslog.sysconfig
Source2: rsyslog.conf.in
Source4: rsyslog.d.remote.conf.in
Source5: rsyslog-service-prepare.in
Source10: rscryutil.1.gz
Source11: rsgtutil.1.gz
# PATCH-FIX-OPENSUSE rsyslog-unit.patch crrodriguez@opensuse.org Customize upstream systemd unit for openSUSE needs.
Patch0: rsyslog-unit.patch
@@ -468,6 +472,10 @@ for file in rsyslog-service-prepare; do
done
%endif
dos2unix doc/*.html
# v7.3.14 does not ship them pre-built
for m in rscryutil.1 rsgtutil.1 ; do
test -f tools/${m} || gunzip -c "$RPM_SOURCE_DIR/${m}.gz" > tools/${m}
done
%build
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -W -Wall -I../grammar -I../../grammar"