[httpd] fix macros
jorton
jorton at fedoraproject.org
Fri Mar 23 16:07:20 UTC 2012
commit 22a55f7792cac6a70f69b76d7ad6a99ef2b2ce28
Author: Joe Orton <jorton at redhat.com>
Date: Fri Mar 23 16:06:35 2012 +0000
fix macros
httpd.spec | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/httpd.spec b/httpd.spec
index 91e470a..c22a94f 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -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 at redhat.com> - 2.4.1-6
+- fix macros
+
* Fri Mar 23 2012 Joe Orton <jorton at redhat.com> - 2.4.1-5
- add _httpd_moddir to macros
More information about the scm-commits
mailing list