pali pushed to cherokee (el5). "Merge branch 'master' into f14"

[notifications at fedoraproject.org]

>From 9839aa62929d1c5f1aa8404863d81fe761e15342 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Lis=C3=BD?= <pali at fedoraproject.org>
Date: Fri, 25 Feb 2011 12:54:04 +0100
Subject: - Resolves bz 678243 - Resolves bz 680051 - Resolves bz 678838 (EPEL)
 - Resolves bz 622514 (EPEL)


diff --git a/.gitignore b/.gitignore
index 076817e..d7cee14 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ cherokee-1.0.6.tar.gz
 cherokee-1.0.8.tar.gz
 cherokee-1.0.20.tar.gz
 clog
+cherokee-1.2.1.tar.gz
diff --git a/cherokee.spec b/cherokee.spec
index c8ac766..c13654e 100644
--- a/cherokee.spec
+++ b/cherokee.spec
@@ -2,8 +2,8 @@
 %define         shortversion %(echo %{version} | grep -oE '[0-9]+\.[0-9]+')
 
 Name:           cherokee
-Version:        1.0.20
-Release:        3%{?dist}
+Version:        1.2.1
+Release:        1%{?dist}
 Summary:        Flexible and Fast Webserver
 
 Group:          Applications/Internet
@@ -124,8 +124,8 @@ fi
 %{_sysconfdir}/systemd/system/%{name}.service
 %dir %{_sysconfdir}/%{name}
 %dir %{_sysconfdir}/pki/%{name}
-%config(noreplace) %{_sysconfdir}/%{name}/cherokee.conf
-%config(noreplace) %{_sysconfdir}/%{name}/cherokee.conf.perf_sample
+%attr(0644,%{name},%{name}) %config(noreplace) %{_sysconfdir}/%{name}/cherokee.conf
+%attr(0644,%{name},%{name}) %config(noreplace) %{_sysconfdir}/%{name}/cherokee.conf.perf_sample
 %config(noreplace) %{_sysconfdir}/pam.d/%{name}
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %{_bindir}/cget
@@ -144,10 +144,10 @@ fi
 %{_datadir}/%{name}
 ## Since we drop privileges to cherokee:cherokee, change permissions on these
 # log files.
-%dir %attr(-,%{name},%{name}) %{_var}/log/%{name}/
-%attr (-,%{name},%{name}) %{_var}/log/%{name}/error_log
-%attr (-,%{name},%{name}) %{_var}/log/%{name}/access_log
-%dir %attr(-,%{name},%{name}) %{_var}/lib/%{name}/
+%attr(-,%{name},%{name}) %dir %{_var}/log/%{name}/
+%attr(-,%{name},%{name}) %{_var}/log/%{name}/error_log
+%attr(-,%{name},%{name}) %{_var}/log/%{name}/access_log
+%attr(-,%{name},%{name}) %dir %{_var}/lib/%{name}/
 %doc AUTHORS ChangeLog COPYING INSTALL README
 %doc %{_datadir}/doc/%{name}
 %doc %{_mandir}/man1/cget.1*
@@ -178,6 +178,15 @@ fi
 
 
 %changelog
+* Fri Feb 22 2011 Pavel Lisý <pali at fedoraproject.org> - 1.2.1-1
+- Resolves bz 678243
+- Resolves bz 680051
+- Resolves bz 678838 (EPEL)
+- Resolves bz 622514 (EPEL)
+
+* Fri Feb 22 2011 Pavel Lisý <pali at fedoraproject.org> - 1.0.20-4
+- Resolves bz 570317
+
 * Tue Feb 22 2011 Pavel Lisý <pali at fedoraproject.org> - 1.0.20-3
 - reenabled ppc build for el4/el5
 
diff --git a/sources b/sources
index 257e8ed..1129365 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-316afcbb44ef292691cd9e257ee0eeb3  cherokee-1.0.20.tar.gz
+2204b9da5b910a8fe251f5dee4506155  cherokee-1.2.1.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/cherokee.git/commit/?h=el5&id=e9f02789df587b7dd747818e3baf3b4d724cf37d