Rebase to v8.10.0

drop patches merged upstream
This commit is contained in:
Tomas Heinrich 2015-06-25 21:25:39 +02:00
parent 9768c0f616
commit f7710e0bf8
3 changed files with 10 additions and 6 deletions

2
.gitignore vendored
View File

@ -23,3 +23,5 @@ rsyslog-4.6.3.tar.gz
/rsyslog-7.4.10.tar.gz
/rsyslog-8.8.0.tar.gz
/rsyslog-doc-8.8.0.tar.gz
/rsyslog-doc-8.10.0.tar.gz
/rsyslog-8.10.0.tar.gz

View File

@ -11,8 +11,8 @@
Summary: Enhanced system logging and kernel message trapping daemon
Name: rsyslog
Version: 8.8.0
Release: 4%{?dist}
Version: 8.10.0
Release: 1%{?dist}
License: (GPLv3+ and ASL 2.0)
Group: System Environment/Daemons
URL: http://www.rsyslog.com/
@ -26,7 +26,6 @@ Patch0: rsyslog-8.8.0-sd-service.patch
# prevent modification of trusted properties (proposed upstream)
Patch1: rsyslog-8.8.0-immutable-json-props.patch
Patch2: rsyslog-8.8.0-missing-test-data.patch
Patch3: rsyslog-8.8.0-imjournal-dflt-pri.patch
BuildRequires: bison
BuildRequires: dos2unix
@ -252,7 +251,6 @@ mv build doc
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%build
%ifarch sparc64
@ -499,6 +497,10 @@ done
%{_libdir}/rsyslog/omudpspoof.so
%changelog
* Wed Jun 24 2015 Tomas Heinrich <theinric@redhat.com> 8.10.0-1
- rebase to 8.10.0
- drop patches merged upstream
* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 8.8.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild

View File

@ -1,2 +1,2 @@
188088dc496fb0a121edb8816d1fac83 rsyslog-8.8.0.tar.gz
09d0e386ae940a9d99be2efedb378a98 rsyslog-doc-8.8.0.tar.gz
47394f76d094139fa0fce85cee0525ac rsyslog-doc-8.10.0.tar.gz
983e17cb10b683e826db395618933d4b rsyslog-8.10.0.tar.gz