rpms/mod_h264_streaming/devel mod_h264_streaming.spec,1.2,1.3

[Robert Scheck]

Author: robert

Update of /cvs/nonfree/rpms/mod_h264_streaming/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv1269

Modified Files:
	mod_h264_streaming.spec 
Log Message:
Updated spec file to match with Apache 2.4 policy


Index: mod_h264_streaming.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mod_h264_streaming/devel/mod_h264_streaming.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mod_h264_streaming.spec	8 Feb 2012 23:44:39 -0000	1.2
+++ mod_h264_streaming.spec	17 Nov 2012 11:53:28 -0000	1.3
@@ -1,7 +1,14 @@
+%{!?_httpd_apxs: %{expand: %%global _httpd_apxs %%{_sbindir}/apxs}}
+%{!?_httpd_mmn: %{expand: %%global _httpd_mmn %%(cat %{_includedir}/httpd/.mmn || echo missing-httpd-devel)}}
+# /etc/httpd/conf.d with httpd < 2.4 and defined as /etc/httpd/conf.modules.d with httpd >= 2.4
+%{!?_httpd_confdir:    %{expand: %%global _httpd_confdir    %%{_sysconfdir}/httpd/conf.d}}
+%{!?_httpd_modconfdir: %{expand: %%global _httpd_modconfdir %%{_sysconfdir}/httpd/conf.d}}
+%{!?_httpd_moddir:     %{expand: %%global _httpd_moddir     %%{_libdir}/httpd/modules}}
+
 Summary:	H264 streaming module for the Apache HTTP Server
 Name:		mod_h264_streaming
 Version:	2.2.7
-Release:	2%{?dist}
+Release:	3%{?dist}
 Group:		System Environment/Daemons
 License:	CC-BY-NC-SA
 URL:		http://h264.code-shop.com/
@@ -9,7 +16,7 @@
 Source1:	h264_streaming.conf
 Patch:		mod_h264_streaming-2.2.7-httpd.patch
 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
@@ -40,17 +47,33 @@
 make DESTDIR=$RPM_BUILD_ROOT install
 
 # Install Apache configuration file
-install -D -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/h264_streaming.conf
+%if "%{_httpd_modconfdir}" == "%{_httpd_confdir}"
+# httpd <= 2.2.x
+install -D -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_httpd_confdir}/h264_streaming.conf
+%else
+# httpd >= 2.4.x
+head -n 5 %{SOURCE1} > 10-h264_streaming.conf
+sed -e '4,5d' %{SOURCE1} > h264_streaming.conf
+touch -c -r %{SOURCE1} 10-h264_streaming.conf h264_streaming.conf
+install -D -p -m 644 10-h264_streaming.conf $RPM_BUILD_ROOT%{_httpd_modconfdir}/10-h264_streaming.conf
+install -D -p -m 644 h264_streaming.conf $RPM_BUILD_ROOT%{_httpd_confdir}/h264_streaming.conf
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%{_libdir}/httpd/modules/%{name}.so
-%config(noreplace) %{_sysconfdir}/httpd/conf.d/h264_streaming.conf
+%{_httpd_moddir}/%{name}.so
+%config(noreplace) %{_httpd_confdir}/h264_streaming.conf
+%if "%{_httpd_modconfdir}" != "%{_httpd_confdir}"
+%config(noreplace) %{_httpd_modconfdir}/10-h264_streaming.conf
+%endif
 
 %changelog
+* Sat Nov 17 2012 Robert Scheck <robert at fedoraproject.org> 2.2.7-3
+- Updated spec file to match with Apache 2.4 policy
+
 * Thu Feb 09 2012 Nicolas Chauvet <kwizart at gmail.com> - 2.2.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild