demus/mod_security_crs-rpm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix conflicts

Browse Source
This commit is contained in:
Athmane Madjoudj 2012-09-13 10:47:40 +01:00
parent 6ee5531c68
commit 4dea13b67d
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mod_security_crs.spec
View File

@ -1,11 +1,7 @@
Summary: ModSecurity Rules
Name: mod_security_crs
Version: 2.2.5
<<<<<<< HEAD
Release: 4%{?dist}
=======
Release: 5%{?dist}
>>>>>>> master
License: ASL 2.0
URL: http://www.modsecurity.org/
Group: System Environment/Daemons
@ -69,12 +65,9 @@ rm -rf %{buildroot}
%{_prefix}/lib/modsecurity.d/slr_rules
%changelog
<<<<<<< HEAD
=======
* Thu Sep 13 2012 Athmane Madjoudj <athmane@fedoraproject.org> 2.2.5-5
- Enable extra rules sub-package for EPEL.
>>>>>>> master
* Tue Aug 28 2012 Athmane Madjoudj <athmane@fedoraproject.org> 2.2.5-4
- Fix spec for el5