phpged/unit
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Packages Wiki Activity

pkg/rpm: Remove deprecated rpm spec file items

Browse source 
The 'Group' and 'BuildRoot' tags have been declared as deprecated by the
Fedora project.

Also, to quote the Fedora Packaging Guidelines

  The contents of the buildroot SHOULD NOT be removed in the first line
  of %install.

  The %defattr directive in the %files list SHOULD ONLY be used when
  setting a non-default value, or to reset to the default value after
  having set a non-default value.

Link: <https://fedoraproject.org/wiki/RPMGroups>
Link: <https://fedoraproject.org/wiki/Phase_out_buildroot_tag_(draft)>
Link: <https://fedoraproject.org/wiki/Archive:PackagingDrafts/BuildRoot>
Link: <https://docs.fedoraproject.org/en-US/packaging-guidelines/#_tags_and_sections>
[ Tweaked subject & added commit message - Andrew ]
Signed-off-by: Andrew Clayton <a.clayton@nginx.com>
This commit is contained in:
Remi Collet 2023-12-20 10:00:54 +01:00 committed by Andrew Clayton
parent ec11eb1252
commit 4a37c56569
2 changed files with 0 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkg/rpm/unit.module.spec.in
View file

@ -30,13 +30,10 @@ Release: %%RELEASE%%%{?dist}.ngx
License: ASL 2.0
Vendor: %%PACKAGE_VENDOR%%
URL: https://unit.nginx.org/
Group: System Environment/Daemons
Source0: unit-%{version}.tar.gz
%%MODULE_SOURCES%%
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: pcre2-devel
Requires: unit-r%%UNIT_VERSION%%
@ -77,7 +74,6 @@ make %%MODULE_MAKEARGS%%
%{__mv} build build-nodebug
%install
%{__rm} -rf %{buildroot}
%{__mkdir} -p %{buildroot}%{_datadir}/doc/%%NAME%%
if [ `basename %{SOURCE100}` == COPYRIGHT.%{name} ]; then
%{__install} -m 644 -p %{SOURCE100} \
@ -100,16 +96,12 @@ cd %{bdir}
grep -v 'usr/src' debugfiles.list > debugfiles.list.new && mv debugfiles.list.new debugfiles.list
cat /dev/null > debugsources.list
%clean
%{__rm} -rf %{buildroot}
%post
if [ $1 -eq 1 ]; then
%%MODULE_POST%%
fi
%files
%defattr(-,root,root,-)
%dir %{_datadir}/doc/%%NAME%%
%{_datadir}/doc/%%NAME%%/*
%%MODULE_FILES%%

8
pkg/rpm/unit.spec.in
View file

@ -31,7 +31,6 @@ Release: %%RELEASE%%%{?dist}.ngx
License: ASL 2.0
Vendor: %%PACKAGE_VENDOR%%
URL: https://unit.nginx.org/
Group: System Environment/Daemons
Source0: unit-%{version}.tar.gz
Source1: unit.service
@ -39,7 +38,6 @@ Source2: unit-debug.service
Source3: unit.example.config
Source4: unit.logrotate
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: systemd
Requires(post): systemd
Requires(preun): systemd
@ -68,7 +66,6 @@ dynamically via an API.
Summary: NGINX Unit (development files)
Version: %%VERSION%%
Release: %%RELEASE%%%{?dist}.ngx
Group: Development/Libraries
Requires: unit == %%VERSION%%-%%RELEASE%%%{?dist}.ngx
%description devel
Library and include files required for NGINX Unit modules development.
@ -106,7 +103,6 @@ PKG_CONFIG_PATH=%{bdir}/pkg/contrib/njs/build \
%endif
%install
%{__rm} -rf %{buildroot}
%{__ln_s} build-nodebug build
DESTDIR=%{buildroot} make unitd-install libunit-install manpage-install
%{__mkdir} -p %{buildroot}%{_bindir}
@ -160,9 +156,6 @@ cd %{bdir}
grep -v 'usr/src' debugfiles.list > debugfiles.list.new && mv debugfiles.list.new debugfiles.list
cat /dev/null > debugsources.list
%clean
%{__rm} -rf %{buildroot}
%post
getent group unit >/dev/null || groupadd -r unit
getent passwd unit >/dev/null || \
@ -213,7 +206,6 @@ More info: https://unit.nginx.org/installation/#official-packages
BANNER
%files
%defattr(-,root,root,-)
%attr(0755,root,root) %{_bindir}/unitc
%attr(0755,root,root) %{_bindir}/setup-unit
%attr(0755,root,root) %{_sbindir}/unitd