particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rpm: remove %defattr

Browse source 
RHEL 5 and later do not require %defattr.
This commit is contained in:
Ken Dreyer 2019-11-04 14:10:03 -07:00 • committed by Tomas Kopecek
parent bb75433dcd
commit ee1d0a6c64
1 changed files with 0 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

16
koji.spec
View file

@ -499,7 +499,6 @@ done
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%files %files
%defattr(-,root,root)
%{_bindir}/* %{_bindir}/*
%config(noreplace) /etc/koji.conf %config(noreplace) /etc/koji.conf
%dir /etc/koji.conf.d %dir /etc/koji.conf.d
@ -507,7 +506,6 @@ rm -rf $RPM_BUILD_ROOT
%if 0%{py2_support} %if 0%{py2_support}
%files -n python2-%{name} %files -n python2-%{name}
%defattr(-,root,root)
%{python2_sitelib}/%{name} %{python2_sitelib}/%{name}
%{python2_sitelib}/koji_cli %{python2_sitelib}/koji_cli
%endif %endif
@ -520,7 +518,6 @@ rm -rf $RPM_BUILD_ROOT
%if 0%{py2_support} %if 0%{py2_support}
%files -n python2-%{name}-cli-plugins %files -n python2-%{name}-cli-plugins
%defattr(-,root,root)
%{python2_sitelib}/koji_cli_plugins %{python2_sitelib}/koji_cli_plugins
# we don't have config files for default plugins yet # we don't have config files for default plugins yet
#%%dir %%{_sysconfdir}/koji/plugins #%%dir %%{_sysconfdir}/koji/plugins
@ -529,7 +526,6 @@ rm -rf $RPM_BUILD_ROOT
%if 0%{py3_support} %if 0%{py3_support}
%files -n python%{python3_pkgversion}-%{name}-cli-plugins %files -n python%{python3_pkgversion}-%{name}-cli-plugins
%defattr(-,root,root)
%{python3_sitelib}/koji_cli_plugins %{python3_sitelib}/koji_cli_plugins
# we don't have config files for default plugins yet # we don't have config files for default plugins yet
#%%dir %%{_sysconfdir}/koji/plugins #%%dir %%{_sysconfdir}/koji/plugins
@ -537,7 +533,6 @@ rm -rf $RPM_BUILD_ROOT
%endif %endif
%files hub %files hub
%defattr(-,root,root)
%config(noreplace) /etc/httpd/conf.d/kojihub.conf %config(noreplace) /etc/httpd/conf.d/kojihub.conf
%dir /etc/koji-hub %dir /etc/koji-hub
%config(noreplace) /etc/koji-hub/hub.conf %config(noreplace) /etc/koji-hub/hub.conf
@ -550,13 +545,11 @@ rm -rf $RPM_BUILD_ROOT
%if 0%{py2_support} > 1 %if 0%{py2_support} > 1
%files -n python2-%{name}-hub %files -n python2-%{name}-hub
%defattr(-,root,root)
%{_datadir}/koji-hub/*.py* %{_datadir}/koji-hub/*.py*
%endif %endif
%if 0%{py3_support} > 1 %if 0%{py3_support} > 1
%files -n python%{python3_pkgversion}-%{name}-hub %files -n python%{python3_pkgversion}-%{name}-hub
%defattr(-,root,root)
%{_datadir}/koji-hub/*.py %{_datadir}/koji-hub/*.py
%{_datadir}/koji-hub/__pycache__ %{_datadir}/koji-hub/__pycache__
%endif %endif
@ -567,19 +560,16 @@ rm -rf $RPM_BUILD_ROOT
%if 0%{py2_support} > 1 %if 0%{py2_support} > 1
%files -n python2-%{name}-hub-plugins %files -n python2-%{name}-hub-plugins
%defattr(-,root,root)
%{_prefix}/lib/koji-hub-plugins/*.py* %{_prefix}/lib/koji-hub-plugins/*.py*
%endif %endif
%if 0%{py3_support} > 1 %if 0%{py3_support} > 1
%files -n python%{python3_pkgversion}-%{name}-hub-plugins %files -n python%{python3_pkgversion}-%{name}-hub-plugins
%defattr(-,root,root)
%{_prefix}/lib/koji-hub-plugins/*.py %{_prefix}/lib/koji-hub-plugins/*.py
%{_prefix}/lib/koji-hub-plugins/__pycache__ %{_prefix}/lib/koji-hub-plugins/__pycache__
%endif %endif
%files builder-plugins %files builder-plugins
%defattr(-,root,root)
%dir /etc/kojid/plugins %dir /etc/kojid/plugins
%config(noreplace) /etc/kojid/plugins/*.conf %config(noreplace) /etc/kojid/plugins/*.conf
%dir %{_prefix}/lib/koji-builder-plugins %dir %{_prefix}/lib/koji-builder-plugins
@ -589,7 +579,6 @@ rm -rf $RPM_BUILD_ROOT
%endif %endif
%files utils %files utils
%defattr(-,root,root)
%{_sbindir}/kojira %{_sbindir}/kojira
%if %{use_systemd} %if %{use_systemd}
%{_unitdir}/kojira.service %{_unitdir}/kojira.service
@ -608,7 +597,6 @@ rm -rf $RPM_BUILD_ROOT
%config(noreplace) /etc/koji-shadow/koji-shadow.conf %config(noreplace) /etc/koji-shadow/koji-shadow.conf
%files web %files web
%defattr(-,root,root)
%dir /etc/kojiweb %dir /etc/kojiweb
%config(noreplace) /etc/kojiweb/web.conf %config(noreplace) /etc/kojiweb/web.conf
%config(noreplace) /etc/httpd/conf.d/kojiweb.conf %config(noreplace) /etc/httpd/conf.d/kojiweb.conf
@ -616,18 +604,15 @@ rm -rf $RPM_BUILD_ROOT
%if 0%{py2_support} > 1 %if 0%{py2_support} > 1
%files -n python2-%{name}-web %files -n python2-%{name}-web
%defattr(-,root,root)
%{_datadir}/koji-web %{_datadir}/koji-web
%endif %endif
%if 0%{py3_support} > 1 %if 0%{py3_support} > 1
%files -n python%{python3_pkgversion}-%{name}-web %files -n python%{python3_pkgversion}-%{name}-web
%defattr(-,root,root)
%{_datadir}/koji-web %{_datadir}/koji-web
%endif %endif
%files builder %files builder
%defattr(-,root,root)
%{_sbindir}/kojid %{_sbindir}/kojid
%dir %{_libexecdir}/kojid %dir %{_libexecdir}/kojid
%{_libexecdir}/kojid/mergerepos %{_libexecdir}/kojid/mergerepos
@ -668,7 +653,6 @@ fi
%endif %endif
%files vm %files vm
%defattr(-,root,root)
%{_sbindir}/kojivmd %{_sbindir}/kojivmd
#dir %%{_datadir}/kojivmd #dir %%{_datadir}/kojivmd
%{_datadir}/kojivmd/kojikamid %{_datadir}/kojivmd/kojikamid