spec: Remove %defattr usage

It was only needed for rpm versions that are much older than our
minimally supported distro

Some more details here: https://fedorahosted.org/fpc/ticket/77
This commit is contained in:
Cole Robinson 2016-05-15 17:31:42 -04:00
parent 9ef05d597e
commit 90f9193cff

View File

@ -1514,10 +1514,8 @@ exit 0
%endif %endif
%files %files
%defattr(-, root, root)
%files docs %files docs
%defattr(-, root, root)
%doc AUTHORS ChangeLog.gz NEWS README TODO %doc AUTHORS ChangeLog.gz NEWS README TODO
%doc libvirt-docs/* %doc libvirt-docs/*
@ -1539,7 +1537,6 @@ exit 0
%files daemon %files daemon
%defattr(-, root, root)
%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/ %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/
@ -1607,20 +1604,16 @@ exit 0
%doc examples/polkit/*.rules %doc examples/polkit/*.rules
%files daemon-config-network %files daemon-config-network
%defattr(-, root, root)
%dir %{_datadir}/libvirt/networks/ %dir %{_datadir}/libvirt/networks/
%{_datadir}/libvirt/networks/default.xml %{_datadir}/libvirt/networks/default.xml
%files daemon-config-nwfilter %files daemon-config-nwfilter
%defattr(-, root, root)
%{_sysconfdir}/libvirt/nwfilter/*.xml %{_sysconfdir}/libvirt/nwfilter/*.xml
%files daemon-driver-interface %files daemon-driver-interface
%defattr(-, root, root)
%{_libdir}/%{name}/connection-driver/libvirt_driver_interface.so %{_libdir}/%{name}/connection-driver/libvirt_driver_interface.so
%files daemon-driver-network %files daemon-driver-network
%defattr(-, root, root)
%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/ %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/
%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/ %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/
%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/autostart %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/autostart
@ -1631,27 +1624,22 @@ exit 0
%{_libdir}/%{name}/connection-driver/libvirt_driver_network.so %{_libdir}/%{name}/connection-driver/libvirt_driver_network.so
%files daemon-driver-nodedev %files daemon-driver-nodedev
%defattr(-, root, root)
%{_libdir}/%{name}/connection-driver/libvirt_driver_nodedev.so %{_libdir}/%{name}/connection-driver/libvirt_driver_nodedev.so
%files daemon-driver-nwfilter %files daemon-driver-nwfilter
%defattr(-, root, root)
%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/nwfilter/ %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/nwfilter/
%ghost %dir %{_localstatedir}/run/libvirt/network/ %ghost %dir %{_localstatedir}/run/libvirt/network/
%{_libdir}/%{name}/connection-driver/libvirt_driver_nwfilter.so %{_libdir}/%{name}/connection-driver/libvirt_driver_nwfilter.so
%files daemon-driver-secret %files daemon-driver-secret
%defattr(-, root, root)
%{_libdir}/%{name}/connection-driver/libvirt_driver_secret.so %{_libdir}/%{name}/connection-driver/libvirt_driver_secret.so
%files daemon-driver-storage %files daemon-driver-storage
%defattr(-, root, root)
%attr(0755, root, root) %{_libexecdir}/libvirt_parthelper %attr(0755, root, root) %{_libexecdir}/libvirt_parthelper
%{_libdir}/%{name}/connection-driver/libvirt_driver_storage.so %{_libdir}/%{name}/connection-driver/libvirt_driver_storage.so
%if %{with_qemu} %if %{with_qemu}
%files daemon-driver-qemu %files daemon-driver-qemu
%defattr(-, root, root)
%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/ %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/
%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/ %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/
%config(noreplace) %{_sysconfdir}/libvirt/qemu.conf %config(noreplace) %{_sysconfdir}/libvirt/qemu.conf
@ -1667,7 +1655,6 @@ exit 0
%if %{with_lxc} %if %{with_lxc}
%files daemon-driver-lxc %files daemon-driver-lxc
%defattr(-, root, root)
%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/lxc/ %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/lxc/
%config(noreplace) %{_sysconfdir}/libvirt/lxc.conf %config(noreplace) %{_sysconfdir}/libvirt/lxc.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.lxc %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.lxc
@ -1681,7 +1668,6 @@ exit 0
%if %{with_uml} %if %{with_uml}
%files daemon-driver-uml %files daemon-driver-uml
%defattr(-, root, root)
%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/uml/ %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/uml/
%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.uml %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.uml
%ghost %dir %{_localstatedir}/run/libvirt/uml/ %ghost %dir %{_localstatedir}/run/libvirt/uml/
@ -1691,14 +1677,12 @@ exit 0
%if %{with_xen} %if %{with_xen}
%files daemon-driver-xen %files daemon-driver-xen
%defattr(-, root, root)
%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/xen/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/xen/
%{_libdir}/%{name}/connection-driver/libvirt_driver_xen.so %{_libdir}/%{name}/connection-driver/libvirt_driver_xen.so
%endif %endif
%if %{with_libxl} %if %{with_libxl}
%files daemon-driver-libxl %files daemon-driver-libxl
%defattr(-, root, root)
%config(noreplace) %{_sysconfdir}/libvirt/libxl.conf %config(noreplace) %{_sysconfdir}/libvirt/libxl.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.libxl %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.libxl
%config(noreplace) %{_sysconfdir}/libvirt/libxl-lockd.conf %config(noreplace) %{_sysconfdir}/libvirt/libxl-lockd.conf
@ -1712,43 +1696,35 @@ exit 0
%if %{with_vbox} %if %{with_vbox}
%files daemon-driver-vbox %files daemon-driver-vbox
%defattr(-, root, root)
%{_libdir}/%{name}/connection-driver/libvirt_driver_vbox.so %{_libdir}/%{name}/connection-driver/libvirt_driver_vbox.so
%endif %endif
%if %{with_qemu_tcg} %if %{with_qemu_tcg}
%files daemon-qemu %files daemon-qemu
%defattr(-, root, root)
%endif %endif
%if %{with_qemu_kvm} %if %{with_qemu_kvm}
%files daemon-kvm %files daemon-kvm
%defattr(-, root, root)
%endif %endif
%if %{with_lxc} %if %{with_lxc}
%files daemon-lxc %files daemon-lxc
%defattr(-, root, root)
%endif %endif
%if %{with_uml} %if %{with_uml}
%files daemon-uml %files daemon-uml
%defattr(-, root, root)
%endif %endif
%if %{with_xen} || %{with_libxl} %if %{with_xen} || %{with_libxl}
%files daemon-xen %files daemon-xen
%defattr(-, root, root)
%endif %endif
%if %{with_vbox} %if %{with_vbox}
%files daemon-vbox %files daemon-vbox
%defattr(-, root, root)
%endif %endif
%if %{with_sanlock} %if %{with_sanlock}
%files lock-sanlock %files lock-sanlock
%defattr(-, root, root)
%if %{with_qemu} %if %{with_qemu}
%config(noreplace) %{_sysconfdir}/libvirt/qemu-sanlock.conf %config(noreplace) %{_sysconfdir}/libvirt/qemu-sanlock.conf
%endif %endif
@ -1765,7 +1741,6 @@ exit 0
%endif %endif
%files client -f %{name}.lang %files client -f %{name}.lang
%defattr(-, root, root)
%doc COPYING COPYING.LESSER %doc COPYING COPYING.LESSER
%config(noreplace) %{_sysconfdir}/libvirt/libvirt.conf %config(noreplace) %{_sysconfdir}/libvirt/libvirt.conf
@ -1835,8 +1810,6 @@ exit 0
%endif %endif
%files devel %files devel
%defattr(-, root, root)
%{_libdir}/libvirt.so %{_libdir}/libvirt.so
%{_libdir}/libvirt-qemu.so %{_libdir}/libvirt-qemu.so
%{_libdir}/libvirt-lxc.so %{_libdir}/libvirt-lxc.so