rpms/rsyslog
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Rebase to 7.4.0

Browse Source 
- drop autoconf automake libtool from BuildRequires
 - depends on systemd >= 201 because of the sd_journal_get_events() api
This commit is contained in:
Tomas Heinrich 2013-06-11 10:17:01 +02:00
parent d9d32ce255
commit e32e6e538e
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -15,3 +15,4 @@ rsyslog-4.6.3.tar.gz
/rsyslog-7.3.9.tar.gz /rsyslog-7.3.9.tar.gz
/rsyslog-7.3.10.tar.gz /rsyslog-7.3.10.tar.gz
/rsyslog-7.3.15-20130604git6e72fa6.tar.gz /rsyslog-7.3.15-20130604git6e72fa6.tar.gz
/rsyslog-7.4.0.tar.gz

18
rsyslog.spec
View File

@ -9,16 +9,15 @@
%global want_hiredis 1 %global want_hiredis 1
%global want_mongodb 1 %global want_mongodb 1
%endif %endif
%global snapshot 20130604git6e72fa6
Summary: Enhanced system logging and kernel message trapping daemon Summary: Enhanced system logging and kernel message trapping daemon
Name: rsyslog Name: rsyslog
Version: 7.3.15 Version: 7.4.0
Release: 1.%{snapshot}%{?dist} Release: 1%{?dist}
License: (GPLv3+ and ASL 2.0) License: (GPLv3+ and ASL 2.0)
Group: System Environment/Daemons Group: System Environment/Daemons
URL: http://www.rsyslog.com/ URL: http://www.rsyslog.com/
Source0: %{name}-%{version}-%{snapshot}.tar.gz Source0: http://www.rsyslog.com/files/download/rsyslog/%{name}-%{version}.tar.gz
Source2: rsyslog.conf Source2: rsyslog.conf
Source3: rsyslog.sysconfig Source3: rsyslog.sysconfig
Source4: rsyslog.log Source4: rsyslog.log
@ -29,14 +28,13 @@ Patch1: rsyslog-7.2.2-manpage-dbg-mode.patch
Patch2: rsyslog-7.2.1-msg_c_nonoverwrite_merge.patch Patch2: rsyslog-7.2.1-msg_c_nonoverwrite_merge.patch
Patch3: rsyslog-7.3.15-imuxsock-warning.patch Patch3: rsyslog-7.3.15-imuxsock-warning.patch
BuildRequires: autoconf automake libtool
BuildRequires: bison BuildRequires: bison
BuildRequires: flex BuildRequires: flex
BuildRequires: json-c-devel BuildRequires: json-c-devel
BuildRequires: libuuid-devel BuildRequires: libuuid-devel
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: python-docutils BuildRequires: python-docutils
BuildRequires: systemd-devel >= 197 BuildRequires: systemd-devel >= 201
BuildRequires: zlib-devel BuildRequires: zlib-devel
Requires: logrotate >= 3.5.2 Requires: logrotate >= 3.5.2
@ -241,7 +239,7 @@ spoof the sender address. Also, it enables to circle through a number
of source ports. of source ports.
%prep %prep
%setup -q -n rsyslog %setup -q
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
@ -262,7 +260,6 @@ export LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now"
export HIREDIS_CFLAGS=-I/usr/include/hiredis export HIREDIS_CFLAGS=-I/usr/include/hiredis
export HIREDIS_LIBS=-L%{_libdir} export HIREDIS_LIBS=-L%{_libdir}
%endif %endif
autoreconf -is
%configure \ %configure \
--prefix=/usr \ --prefix=/usr \
--disable-static \ --disable-static \
@ -468,6 +465,11 @@ done
%{_libdir}/rsyslog/omudpspoof.so %{_libdir}/rsyslog/omudpspoof.so
%changelog %changelog
* Tue Jun 11 2013 Tomas Heinrich <theinric@redhat.com> 7.4.0-1
- rebase to 7.4.0
- drop autoconf automake libtool from BuildRequires
- depends on systemd >= 201 because of the sd_journal_get_events() api
* Tue Jun 04 2013 Tomas Heinrich <theinric@redhat.com> 7.3.15-1.20130604git6e72fa6 * Tue Jun 04 2013 Tomas Heinrich <theinric@redhat.com> 7.3.15-1.20130604git6e72fa6
- rebase to an upstream snapshot, effectively version 7.3.15 - rebase to an upstream snapshot, effectively version 7.3.15
plus several more changes plus several more changes

2
sources
View File

@ -1 +1 @@
a2ce253138499a3a7b9c7975dcdf8417 rsyslog-7.3.15-20130604git6e72fa6.tar.gz 5bd05354331f4955337d8e4bc64db985 rsyslog-7.4.0.tar.gz