diff options
| author | Joe Orton <jorton@redhat.com> | 2012-03-23 16:06:35 +0000 |
|---|---|---|
| committer | Joe Orton <jorton@redhat.com> | 2012-03-23 16:06:35 +0000 |
| commit | 22a55f7792cac6a70f69b76d7ad6a99ef2b2ce28 (patch) | |
| tree | ad360c08e5a64ba918816b343339acadba80b428 | |
| parent | f3bf1daed0a8984fb78fa6cdfcbccfa4f35f5fa2 (diff) | |
| download | httpd-22a55f7792cac6a70f69b76d7ad6a99ef2b2ce28.tar.gz httpd-22a55f7792cac6a70f69b76d7ad6a99ef2b2ce28.tar.xz httpd-22a55f7792cac6a70f69b76d7ad6a99ef2b2ce28.zip | |
fix macros
| -rw-r--r-- | httpd.spec | 13 |
1 files changed, 8 insertions, 5 deletions
@@ -8,7 +8,7 @@ Summary: Apache HTTP Server Name: httpd Version: 2.4.1 -Release: 5%{?dist} +Release: 6%{?dist} URL: http://httpd.apache.org/ Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 Source1: index.html @@ -281,11 +281,11 @@ echo %{mmnisa} > $RPM_BUILD_ROOT%{_includedir}/httpd/.mmn mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm cat > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.httpd <<EOF %%_httpd_mmn %{mmnisa} -%%_httpd_apxs %{_bindir}/apxs -%%_httpd_modconfdir %{_sysconfigdir}/httpd/conf.modules.d -%%_httpd_confdir %{_sysconfigdir}/httpd/conf.d +%%_httpd_apxs %%{_bindir}/apxs +%%_httpd_modconfdir %%{_sysconfdir}/httpd/conf.modules.d +%%_httpd_confdir %%{_sysconfdir}/httpd/conf.d %%_httpd_contentdir %{contentdir} -%%_httpd_moddir %{_libdir}/httpd/modules +%%_httpd_moddir %%{_libdir}/httpd/modules EOF # Handle contentdir @@ -554,6 +554,9 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/rpm/macros.httpd %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 - add _httpd_moddir to macros |