Merge branch 'master' into f19
Conflicts: nginx.spec sources
This commit is contained in:
commit
d5faf95acf
2
.gitignore
vendored
2
.gitignore
vendored
@ -22,3 +22,5 @@ x86_64/
|
|||||||
/nginx-1.4.1.tar.gz.asc
|
/nginx-1.4.1.tar.gz.asc
|
||||||
/nginx-1.4.2.tar.gz
|
/nginx-1.4.2.tar.gz
|
||||||
/nginx-1.4.2.tar.gz.asc
|
/nginx-1.4.2.tar.gz.asc
|
||||||
|
/nginx-1.4.3.tar.gz
|
||||||
|
/nginx-1.4.3.tar.gz.asc
|
||||||
|
@ -13,11 +13,10 @@
|
|||||||
%global with_gperftools 1
|
%global with_gperftools 1
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
|
||||||
Name: nginx
|
Name: nginx
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Version: 1.4.2
|
Version: 1.4.3
|
||||||
Release: 3%{?dist}
|
Release: 1%{?dist}
|
||||||
|
|
||||||
Summary: A high performance web server and reverse proxy server
|
Summary: A high performance web server and reverse proxy server
|
||||||
Group: System Environment/Daemons
|
Group: System Environment/Daemons
|
||||||
@ -269,6 +268,9 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sun Nov 03 2013 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.4.3-1
|
||||||
|
- update to upstream release 1.4.3
|
||||||
|
|
||||||
* Fri Aug 09 2013 Jonathan Steffan <jsteffan@fedoraproject.org> - 1:1.4.2-3
|
* Fri Aug 09 2013 Jonathan Steffan <jsteffan@fedoraproject.org> - 1:1.4.2-3
|
||||||
- Add in conditionals to build for non-systemd targets
|
- Add in conditionals to build for non-systemd targets
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user