[mod_flvx] Fix build with httpd 2.4
Robert Scheck
robert at fedoraproject.org
Sat Mar 31 00:47:42 UTC 2012
commit 23c46ad41c9d7b017af2ddabc4e7001473cb6222
Author: Robert Scheck <robert at fedoraproject.org>
Date: Sat Mar 31 02:47:34 2012 +0200
Fix build with httpd 2.4
mod_flvx.spec | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/mod_flvx.spec b/mod_flvx.spec
index 6d21958..08998af 100644
--- a/mod_flvx.spec
+++ b/mod_flvx.spec
@@ -1,9 +1,12 @@
+%{!?_httpd_apxs: %{expand: %%global _httpd_apxs %%{_sbindir}/apxs}}
+%{!?_httpd_mmn: %{expand: %%global _httpd_mmn %%(cat %{_includedir}/httpd/.mmn || echo missing-httpd-devel)}}
+
%global gitver 48bb878
Summary: FLV progressive download streaming for the Apache HTTP Server
Name: mod_flvx
Version: 0
-Release: 0.2.20100525git%{?dist}
+Release: 0.1.20100525git%{?dist}
Group: System Environment/Daemons
License: ASL 2.0
URL: http://tperspective.blogspot.com/2009/02/apache-flv-streaming-done-right.html
@@ -11,7 +14,7 @@ URL: http://tperspective.blogspot.com/2009/02/apache-flv-streaming-done-right.h
Source0: osantana-%{name}-%{gitver}.tar.gz
Source1: flvx.conf
BuildRequires: httpd-devel >= 2.0.39
-Requires: httpd-mmn = %(cat %{_includedir}/httpd/.mmn || echo missing httpd-devel)
+Requires: httpd-mmn = %{_httpd_mmn}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
@@ -31,7 +34,7 @@ supported tool, e.g. flvtool2.
%setup -q -n osantana-%{name}-%{gitver}
%build
-%{_sbindir}/apxs -Wc,-Wall -c %{name}.c
+%{_httpd_apxs} -Wc,-Wall -c %{name}.c
%install
rm -rf $RPM_BUILD_ROOT
@@ -52,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
%config(noreplace) %{_sysconfdir}/httpd/conf.d/flvx.conf
%changelog
+* Fri Mar 30 2012 Joe Orton <jorton at redhat.com> - 0-0.1.20100525git
+- fix build with httpd 2.4
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0-0.2.20100525git
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
More information about the scm-commits
mailing list