Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' into el6

  • Loading branch information...
commit b226b6a599c5442c56d11adcb04e31ae69fcb68a 2 parents 53e7b22 + 9839aa6
Pavel Lisý authored
Showing with 19 additions and 9 deletions.
  1. +1 −0  .gitignore
  2. +17 −8 cherokee.spec
  3. +1 −1  sources
View
1  .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
View
25 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@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@fedoraproject.org> - 1.0.20-4
+- Resolves bz 570317
+
* Tue Feb 22 2011 Pavel Lisý <pali@fedoraproject.org> - 1.0.20-3
- reenabled ppc build for el4/el5
View
2  sources
@@ -1 +1 @@
-316afcbb44ef292691cd9e257ee0eeb3 cherokee-1.0.20.tar.gz
+2204b9da5b910a8fe251f5dee4506155 cherokee-1.2.1.tar.gz
Please sign in to comment.
Something went wrong with that request. Please try again.