rpms/syslog-ng
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve syslog-ng-3.2.5-tests-functional-sql-test.patch

Browse Source 
Add a conflict with the filesystem package (due to the /usr-move)
This commit is contained in:
Jose Pedro Oliveira 2012-04-26 18:23:37 +01:00
parent fdd7fbb005
commit 62ec276833
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
syslog-ng-3.2.5-tests-functional-sql-test.patch
View File

@ -6,7 +6,7 @@ diff -ruN syslog-ng-3.2.5/tests/functional/globals.py syslog-ng-3.2.5-modified/t
def has_module(module):
- avail_mods = os.popen('../../syslog-ng/syslog-ng -V | grep ^Available-Modules: ', 'r').read()
+ avail_mods = os.popen('../../syslog-ng/syslog-ng -V | grep ^Enable-', 'r').read()
+ avail_mods = os.popen('../../syslog-ng/syslog-ng -V | grep "^Enable-%s: on"' % module, 'r').read()
if avail_mods.find(module) != -1:
return True
return False

11
syslog-ng.spec
View File

@ -2,7 +2,7 @@
Name: syslog-ng
Version: 3.2.5
Release: 12%{?dist}
Release: 14%{?dist}
Summary: Next-generation syslog server
Group: System Environment/Daemons
@ -46,6 +46,9 @@ Provides: syslog
Provides: syslog-ng-vim = %{version}-%{release}
Obsoletes: syslog-ng-vim < 2.0.8-1
# Fedora 17’s unified filesystem (/usr-move)
Conflicts: filesystem < 3
%description
syslog-ng, as the name shows, is a syslogd replacement, but with new
@ -260,6 +263,12 @@ fi
%changelog
* Thu Apr 26 2012 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.2.5-14
- Improve syslog-ng-3.2.5-tests-functional-sql-test.patch
* Thu Apr 26 2012 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.2.5-13
- Add a conflict with the filesystem package (due to the /usr-move)
* Mon Apr 16 2012 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.2.5-12
- No longer disable the SSL tests.