Change-Id: Id94de5654e5eb2ad9f037270e0fcb52435825b78
Reviewed-on: http://photon-jenkins.eng.vmware.com/170
Tested-by: jenkins-photon <wangnan2015@hotmail.com>
Reviewed-by: Sharath George
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: The Apache HTTP Server |
| 2 | 2 |
Name: httpd |
| 3 | 3 |
Version: 2.4.12 |
| 4 |
-Release: 3%{?dist}
|
|
| 4 |
+Release: 4%{?dist}
|
|
| 5 | 5 |
License: Apache License 2.0 |
| 6 | 6 |
URL: http://httpd.apache.org/ |
| 7 | 7 |
Group: Applications/System |
| ... | ... |
@@ -101,6 +101,12 @@ if ! getent passwd apache >/dev/null; then |
| 101 | 101 |
-s /bin/false -u 25 apache |
| 102 | 102 |
fi |
| 103 | 103 |
|
| 104 |
+if [ -h /etc/mime.types ]; then |
|
| 105 |
+ mv /etc/mime.types /etc/mime.types.orig |
|
| 106 |
+fi |
|
| 107 |
+ |
|
| 108 |
+ln -sf /etc/httpd/conf/mime.types /etc/mime.types |
|
| 109 |
+ |
|
| 104 | 110 |
%postun |
| 105 | 111 |
/sbin/ldconfig |
| 106 | 112 |
if getent passwd apache >/dev/null; then |
| ... | ... |
@@ -110,6 +116,10 @@ if getent group apache >/dev/null; then |
| 110 | 110 |
groupdel apache |
| 111 | 111 |
fi |
| 112 | 112 |
|
| 113 |
+if [ -f /etc/mime.types.orig ]; then |
|
| 114 |
+ mv /etc/mime.types.orig /etc/mime.types |
|
| 115 |
+fi |
|
| 116 |
+ |
|
| 113 | 117 |
%files devel |
| 114 | 118 |
%defattr(-,root,root) |
| 115 | 119 |
%{_includedir}/*
|
| ... | ... |
@@ -140,6 +150,8 @@ fi |
| 140 | 140 |
%{_bindir}/dbmmanage
|
| 141 | 141 |
|
| 142 | 142 |
%changelog |
| 143 |
+* Mon Nov 23 2015 Sharath George <sharathg@vmware.com> 2.4.12-4 |
|
| 144 |
+- Add /etc/mime.types |
|
| 143 | 145 |
* Tue Sep 29 2015 Xiaolin Li <xiaolinl@vmware.com> 2.4.12-3 |
| 144 | 146 |
- Move perl script to tools package. |
| 145 | 147 |
* Thu Jul 16 2015 Touseef Liaqat <tliaqat@vmware.com> 2.4.12-2 |