Make %files list more explicit

This commit is contained in:
Paul Howarth 2012-05-02 09:48:03 +01:00
parent c8f59ce6c9
commit bbe05fc8de

View File

@ -21,7 +21,7 @@
%{!?_httpd_mmn: %global _httpd_mmn %(cat %{_includedir}/httpd/.mmn 2>/dev/null || echo missing-httpd-devel)} %{!?_httpd_mmn: %global _httpd_mmn %(cat %{_includedir}/httpd/.mmn 2>/dev/null || echo missing-httpd-devel)}
# Configuration directory # Configuration directory
%{!?_httpd_confdir: %{expand: %%global _httpd_confdir %%{_sysconfdir}/httpd/conf.d}} %{!?_httpd_confdir: %global _httpd_confdir %{_sysconfdir}/httpd/conf.d}
# For httpd ≥ 2.4 we have a different filesystem layout # For httpd ≥ 2.4 we have a different filesystem layout
%if 0%{?fedora} > 17 || 0%{?rhel} > 6 %if 0%{?fedora} > 17 || 0%{?rhel} > 6
@ -34,7 +34,7 @@
Name: mod_fcgid Name: mod_fcgid
Version: 2.3.7 Version: 2.3.7
Release: 2%{?dist} Release: 3%{?dist}
Summary: FastCGI interface module for Apache 2 Summary: FastCGI interface module for Apache 2
Group: System Environment/Daemons Group: System Environment/Daemons
License: ASL 2.0 License: ASL 2.0
@ -205,7 +205,7 @@ exit 0
%doc build/fixconf.sed %doc build/fixconf.sed
%{_libdir}/httpd/modules/mod_fcgid.so %{_libdir}/httpd/modules/mod_fcgid.so
%if %{httpd24} %if %{httpd24}
%config(noreplace) %{_httpd_modconfdir}/*.conf %config(noreplace) %{_httpd_modconfdir}/10-fcgid.conf
%endif %endif
%config(noreplace) %{_httpd_confdir}/fcgid.conf %config(noreplace) %{_httpd_confdir}/fcgid.conf
%if 0%{?fedora} > 14 || 0%{?rhel} > 6 %if 0%{?fedora} > 14 || 0%{?rhel} > 6
@ -221,9 +221,12 @@ exit 0
%endif %endif
%changelog %changelog
* Wed May 2 2012 Joe Orton <jorton@redhat.com> - 2.3.7-2 * Wed May 2 2012 Paul Howarth <paul@city-fan.org> 2.3.7-3
- use 10- prefix for conf file in conf.modules.d w/2.4 - Make %%files list more explicit
- use _httpd_confdir throughout, if available
* Wed May 2 2012 Joe Orton <jorton@redhat.com> 2.3.7-2
- Use 10- prefix for conf file in conf.modules.d with httpd 2.4
- Use _httpd_confdir throughout
* Mon Apr 23 2012 Paul Howarth <paul@city-fan.org> 2.3.7-1 * Mon Apr 23 2012 Paul Howarth <paul@city-fan.org> 2.3.7-1
- Update to 2.3.7 - Update to 2.3.7