rpms/mod_fcgid
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Spec clean-up

Browse Source 
- 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:
Paul Howarth 2016-03-04 11:12:52 +00:00
parent a41cccf100
commit 5ddebcb75c
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
mod_fcgid.spec
View File

@ -34,7 +34,7 @@
Name: mod_fcgid Name: mod_fcgid
Version: 2.3.9 Version: 2.3.9
Release: 6%{?dist} Release: 7%{?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
@ -52,8 +52,6 @@ Patch0: mod_fcgid-2.3.4-fixconf-shellbang.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
BuildRequires: httpd-devel >= 2.0, pkgconfig BuildRequires: httpd-devel >= 2.0, pkgconfig
Requires: httpd-mmn = %{_httpd_mmn} Requires: httpd-mmn = %{_httpd_mmn}
# sed required for fixconf script
Requires: /bin/sed
# systemd-units needed for ownership of /usr/lib/tmpfiles.d directory # systemd-units needed for ownership of /usr/lib/tmpfiles.d directory
%if 0%{?fedora} > 14 || 0%{?rhel} > 6 %if 0%{?fedora} > 14 || 0%{?rhel} > 6
Requires: systemd-units Requires: systemd-units
@ -117,7 +115,9 @@ cp -p %{SOURCE11} fastcgi.te
cp -p %{SOURCE12} fastcgi.fc cp -p %{SOURCE12} fastcgi.fc
# Fix shellbang in fixconf script for our location of sed # Fix shellbang in fixconf script for our location of sed
%if 0%{?fedora} < 24 && 0%{?rhel} < 8
%patch0 -p1 %patch0 -p1
%endif
%build %build
APXS=%{_httpd_apxs} ./configure.apxs APXS=%{_httpd_apxs} ./configure.apxs
@ -198,9 +198,13 @@ exit 0
%endif %endif
%files %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 # 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 docs/manual/mod/mod_fcgid.html.en modules/fcgid/ChangeLog
%doc build/fixconf.sed %doc build/fixconf.sed
%{_libdir}/httpd/modules/mod_fcgid.so %{_libdir}/httpd/modules/mod_fcgid.so
@ -215,12 +219,16 @@ exit 0
%if %{selinux_module} %if %{selinux_module}
%files selinux %files selinux
%defattr(-,root,root,-)
%doc fastcgi.fc fastcgi.te README.SELinux %doc fastcgi.fc fastcgi.te README.SELinux
%{_datadir}/selinux/*/fastcgi.pp %{_datadir}/selinux/*/fastcgi.pp
%endif %endif
%changelog %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 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.9-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild