Browse files

Merge branch 'master' into el6

  • Loading branch information...
2 parents 39cb3f3 + 3caef0b commit 3c1de34e00e6d44a78554803917b5054f3808b45 Pavel Lisý committed Oct 19, 2011
Showing with 8 additions and 4 deletions.
  1. +1 −0 .gitignore
  2. +6 −3 cherokee.spec
  3. +1 −1 sources
View
1 .gitignore
@@ -7,3 +7,4 @@ cherokee-1.2.1.tar.gz
cherokee-1.2.99.tar.gz
openssl-1.0.0d.tar.gz
/cherokee-1.2.100.tar.gz
+/cherokee-1.2.101.tar.gz
View
9 cherokee.spec
@@ -4,8 +4,8 @@
%{!?_unitdir:%define _unitdir /lib/systemd/system}
Name: cherokee
-Version: 1.2.100
-Release: 2%{?dist}
+Version: 1.2.101
+Release: 1%{?dist}
Summary: Flexible and Fast Webserver
Group: Applications/Internet
@@ -218,7 +218,7 @@ fi
%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 AUTHORS ChangeLog COPYING README
%doc %{_datadir}/doc/%{name}
%doc %{_mandir}/man1/cget.1*
%doc %{_mandir}/man1/cherokee.1*
@@ -247,6 +247,9 @@ fi
%{_libdir}/lib%{name}-*.so
%changelog
+* Wed Oct 19 2011 Pavel Lisý <pali@fedoraproject.org> - 1.2.101-1
+- Latest 1.2.x upstream release
+
* Tue Oct 18 2011 Pavel Lisý <pali@fedoraproject.org> - 1.2.100-2
- Resolves bz 746532 - put some deps back: GeoIP-devel openldap-devel
View
2 sources
@@ -1 +1 @@
-ccbb3865d0544f8772a1b163efb3be34 cherokee-1.2.100.tar.gz
+ef47003355a2e368e4d9596cd070ef23 cherokee-1.2.101.tar.gz

0 comments on commit 3c1de34

Please sign in to comment.