rpms/httpd
7
0
Fork 0
Code Issues Pull Requests Releases Activity

expand variables in docdir example configs

Browse Source
This commit is contained in:
Joe Orton 2014-07-21 22:06:14 +01:00
parent 94c96741e2
commit 1fce54ba4f
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
httpd.spec
View File

@ -343,6 +343,15 @@ install -m 644 -p $RPM_SOURCE_DIR/httpd.tmpfiles \
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/dav \ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/dav \
$RPM_BUILD_ROOT/run/httpd/htcacheclean $RPM_BUILD_ROOT/run/httpd/htcacheclean
# Substitute in defaults which are usually done (badly) by "make install"
sed -i \
"s,@@ServerRoot@@/var,%{_localstatedir}/lib/dav,;
s,@@ServerRoot@@/user.passwd,/etc/httpd/conf/user.passwd,;
s,@@ServerRoot@@/docs,%{docroot},;
s,@@ServerRoot@@,%{docroot},;
s,@@Port@@,80,;" \
docs/conf/extra/*.conf
# Create cache directory # Create cache directory
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/httpd \ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/httpd \
$RPM_BUILD_ROOT%{_localstatedir}/cache/httpd/proxy \ $RPM_BUILD_ROOT%{_localstatedir}/cache/httpd/proxy \
@ -645,6 +654,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Mon Jul 21 2014 Joe Orton <jorton@redhat.com> - 2.4.10-1 * Mon Jul 21 2014 Joe Orton <jorton@redhat.com> - 2.4.10-1
- update to 2.4.10 - update to 2.4.10
- expand variables in docdir example configs
* Tue Jul 08 2014 Jan Kaluza <jkaluza@redhat.com> - 2.4.9-8 * Tue Jul 08 2014 Jan Kaluza <jkaluza@redhat.com> - 2.4.9-8
- add support for systemd socket activation (#1111648) - add support for systemd socket activation (#1111648)