[cherokee/el5: 5/5] .spec corrections for EL4 build

[Pavel Lisý]

commit f91c3497bac481e5f5d4630f6aef58859bcdc933
Merge: 072d32b 3a40c8b
Author: Pavel Lisý <pali at fedoraproject.org>
Date:   Wed Sep 14 12:14:04 2011 +0200

    .spec corrections for EL4 build

 .gitignore    |    7 ++-----
 cherokee.spec |   19 +++++++++++++------
 2 files changed, 15 insertions(+), 11 deletions(-)
---
diff --cc .gitignore
index c192ab4,8a1fcfd..7b855e1
--- a/.gitignore
+++ b/.gitignore
@@@ -4,8 -4,5 +4,5 @@@ cherokee-1.0.8.tar.g
  cherokee-1.0.20.tar.gz
  clog
  cherokee-1.2.1.tar.gz
- <<<<<<< HEAD
- /openssl-1.0.0d.tar.gz
- =======
--/cherokee-1.2.99.tar.gz
- >>>>>>> master
 -/openssl-1.0.0d.tar.gz
++cherokee-1.2.99.tar.gz
++openssl-1.0.0d.tar.gz