[mod_xsendfile] Update for new packaging guidelines
Orion Poplawski
orion at fedoraproject.org
Tue Mar 27 17:16:05 UTC 2012
commit 65b42bb37c63d56de57611dd51b370109498d74f
Author: Orion Poplawski <orion at cora.nwra.com>
Date: Tue Mar 27 11:16:04 2012 -0600
Update for new packaging guidelines
mod_xsendfile.spec | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 deletions(-)
---
diff --git a/mod_xsendfile.spec b/mod_xsendfile.spec
index bf81c69..abf7c58 100644
--- a/mod_xsendfile.spec
+++ b/mod_xsendfile.spec
@@ -8,11 +8,9 @@ URL: https://tn123.org/%{name}/
Source0: https://tn123.org/%{name}/%{name}-%{version}.tar.bz2
Source1: xsendfile.conf
BuildRequires: httpd-devel
+Requires: httpd-mmn = %{_httpd_mmn}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%global modulesdir %{_libdir}/httpd/modules
-%global confdir %{_sysconfdir}/httpd/conf.d
-
%description
%{name} is a small Apache2 module that processes X-SENDFILE headers
registered by the original output handler.
@@ -30,15 +28,15 @@ It is useful for processing script-output of e.g. php, perl or any cgi.
%build
-apxs -c %{name}.c
+%{_httpd_apxs} -c %{name}.c
%install
rm -rf $%{buildroot}
mkdir -p %{buildroot}/%{modulesdir}
-apxs -i -S LIBEXECDIR=%{buildroot}/%{modulesdir} -n %{name} %{name}.la
-mkdir -p %{buildroot}/%{confdir}
-cp -p %SOURCE1 %{buildroot}/%{confdir}
+%{_httpd_apxs} -i -S LIBEXECDIR=%{buildroot}/%{modulesdir} -n %{name} %{name}.la
+mkdir -p %{buildroot}/%{_httpd_modconfdir}
+cp -p %SOURCE1 %{buildroot}/%{_httpd_modconfdir}
%clean
@@ -48,14 +46,13 @@ rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%doc docs/*
-%config(noreplace) %{confdir}/xsendfile.conf
-%{modulesdir}/%{name}.so
+%config(noreplace) %{_httpd_modconfdir}/xsendfile.conf
+%{_httpd_moddir}/%{name}.so
%changelog
* Tue Mar 27 2012 Orion Poplawski <orion at cora.nwra.com> 0.12-5
-- Rebuild for httpd 2.4, drop path for apxs
-- Drop Requires httpd-mmn, no longer provided by httpd
+- Rebuild for httpd 2.4, update for new module guidelines
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
More information about the scm-commits
mailing list