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

fix macros

Browse Source
This commit is contained in:
Joe Orton 2012-03-23 16:06:35 +00:00
parent f3bf1daed0
commit 22a55f7792
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
httpd.spec
View File

@ -8,7 +8,7 @@
Summary: Apache HTTP Server Summary: Apache HTTP Server
Name: httpd Name: httpd
Version: 2.4.1 Version: 2.4.1
Release: 5%{?dist} Release: 6%{?dist}
URL: http://httpd.apache.org/ URL: http://httpd.apache.org/
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
Source1: index.html Source1: index.html
@ -281,11 +281,11 @@ echo %{mmnisa} > $RPM_BUILD_ROOT%{_includedir}/httpd/.mmn
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm
cat > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.httpd <<EOF cat > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.httpd <<EOF
%%_httpd_mmn %{mmnisa} %%_httpd_mmn %{mmnisa}
%%_httpd_apxs %{_bindir}/apxs %%_httpd_apxs %%{_bindir}/apxs
%%_httpd_modconfdir %{_sysconfigdir}/httpd/conf.modules.d %%_httpd_modconfdir %%{_sysconfdir}/httpd/conf.modules.d
%%_httpd_confdir %{_sysconfigdir}/httpd/conf.d %%_httpd_confdir %%{_sysconfdir}/httpd/conf.d
%%_httpd_contentdir %{contentdir} %%_httpd_contentdir %{contentdir}
%%_httpd_moddir %{_libdir}/httpd/modules %%_httpd_moddir %%{_libdir}/httpd/modules
EOF EOF
# Handle contentdir # Handle contentdir
@ -554,6 +554,9 @@ rm -rf $RPM_BUILD_ROOT
%{_sysconfdir}/rpm/macros.httpd %{_sysconfdir}/rpm/macros.httpd
%changelog %changelog
* Fri Mar 23 2012 Joe Orton <jorton@redhat.com> - 2.4.1-6
- fix macros
* Fri Mar 23 2012 Joe Orton <jorton@redhat.com> - 2.4.1-5 * Fri Mar 23 2012 Joe Orton <jorton@redhat.com> - 2.4.1-5
- add _httpd_moddir to macros - add _httpd_moddir to macros