Spec clean-up
- Use /usr/bin/sed rather than /bin/sed for fixconf script on modern releases - Drop %defattr, redundant since rpm 4.4 - Use %license where possible
This commit is contained in:
parent
a41cccf100
commit
5ddebcb75c
@ -34,7 +34,7 @@
|
||||
|
||||
Name: mod_fcgid
|
||||
Version: 2.3.9
|
||||
Release: 6%{?dist}
|
||||
Release: 7%{?dist}
|
||||
Summary: FastCGI interface module for Apache 2
|
||||
Group: System Environment/Daemons
|
||||
License: ASL 2.0
|
||||
@ -52,8 +52,6 @@ Patch0: mod_fcgid-2.3.4-fixconf-shellbang.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
|
||||
BuildRequires: httpd-devel >= 2.0, pkgconfig
|
||||
Requires: httpd-mmn = %{_httpd_mmn}
|
||||
# sed required for fixconf script
|
||||
Requires: /bin/sed
|
||||
# systemd-units needed for ownership of /usr/lib/tmpfiles.d directory
|
||||
%if 0%{?fedora} > 14 || 0%{?rhel} > 6
|
||||
Requires: systemd-units
|
||||
@ -117,7 +115,9 @@ cp -p %{SOURCE11} fastcgi.te
|
||||
cp -p %{SOURCE12} fastcgi.fc
|
||||
|
||||
# Fix shellbang in fixconf script for our location of sed
|
||||
%if 0%{?fedora} < 24 && 0%{?rhel} < 8
|
||||
%patch0 -p1
|
||||
%endif
|
||||
|
||||
%build
|
||||
APXS=%{_httpd_apxs} ./configure.apxs
|
||||
@ -198,9 +198,13 @@ exit 0
|
||||
%endif
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%if 0%{?_licensedir:1}
|
||||
%license LICENSE-FCGID
|
||||
%else
|
||||
%doc LICENSE-FCGID
|
||||
%endif
|
||||
# mod_fcgid.html.en is explicitly encoded as ISO-8859-1
|
||||
%doc CHANGES-FCGID LICENSE-FCGID NOTICE-FCGID README-FCGID STATUS-FCGID
|
||||
%doc CHANGES-FCGID NOTICE-FCGID README-FCGID STATUS-FCGID
|
||||
%doc docs/manual/mod/mod_fcgid.html.en modules/fcgid/ChangeLog
|
||||
%doc build/fixconf.sed
|
||||
%{_libdir}/httpd/modules/mod_fcgid.so
|
||||
@ -215,12 +219,16 @@ exit 0
|
||||
|
||||
%if %{selinux_module}
|
||||
%files selinux
|
||||
%defattr(-,root,root,-)
|
||||
%doc fastcgi.fc fastcgi.te README.SELinux
|
||||
%{_datadir}/selinux/*/fastcgi.pp
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Fri Mar 4 2016 Paul Howarth <paul@city-fan.org> - 2.3.9-7
|
||||
- Use /usr/bin/sed rather than /bin/sed for fixconf script on modern releases
|
||||
- Drop %%defattr, redundant since rpm 4.4
|
||||
- Use %%license where possible
|
||||
|
||||
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.9-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user