From 82502faa00912cae8f2a93b055ffc19c8884fd994a915d542baa07a41ddbc9a3 Mon Sep 17 00:00:00 2001 From: James Fehlig Date: Fri, 7 Jun 2013 21:42:47 +0000 Subject: [PATCH] - Add a README to the empty packages. Provides some info about their purpose and satisfies suse-filelist-empty check. Drop rpmlintrc OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=272 --- libvirt.changes | 7 +++++ libvirt.spec | 72 ++++++++++++++++++++++++++++++++----------------- rpmlintrc | 4 --- 3 files changed, 55 insertions(+), 28 deletions(-) delete mode 100644 rpmlintrc diff --git a/libvirt.changes b/libvirt.changes index 86f30c7..99f09d2 100644 --- a/libvirt.changes +++ b/libvirt.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Jun 7 15:40:47 MDT 2013 - jfehlig@suse.com + +- Add a README to the empty packages. Provides some info about + their purpose and satisfies suse-filelist-empty check. + Drop rpmlintrc + ------------------------------------------------------------------- Fri Jun 7 08:14:38 MDT 2013 - jfehlig@suse.com diff --git a/libvirt.spec b/libvirt.spec index 00ca293..ffef4ab 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -238,9 +238,6 @@ Group: Development/Libraries/C and C++ %if %{with_libvirtd} Requires: libvirt-daemon = %{version}-%{release} -%if %{with_network} -Requires: libvirt-daemon-config-network = %{version}-%{release} -%endif %if %{with_nwfilter} Requires: libvirt-daemon-config-nwfilter = %{version}-%{release} %endif @@ -407,7 +404,6 @@ Source0: %{name}-%{version}.tar.bz2 Source1: libvirtd.init Source2: libvirtd-relocation-server.fw Source99: baselibs.conf -Source100: rpmlintrc # Upstream patches # Need to go upstream Patch100: xen-name-for-devid.patch @@ -540,17 +536,6 @@ Server side daemon required to manage the virtualization capabilities of recent versions of Linux. Requires a hypervisor specific sub-RPM for specific drivers. -%if %{with_network} -%package daemon-config-network -Summary: Default configuration files for the libvirtd daemon -Group: Development/Libraries/C and C++ - -Requires: libvirt-daemon = %{version}-%{release} - -%description daemon-config-network -Default configuration files for setting up NAT based networking -%endif - %if %{with_nwfilter} %package daemon-config-nwfilter Summary: Network filter configuration files for the libvirtd @@ -1128,6 +1113,12 @@ rm -rf $RPM_BUILD_ROOT/usr/share/locale/vi_VN %endif mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/lib/libvirt %find_lang %{name} +# Add a README to the libvirt package with a note about the empty +# file list +cat > $RPM_BUILD_ROOT%{_docdir}/libvirt/libvirt.README << 'EOF' +The libvirt package no longer contains any files. It exists now +only to fulfill it's 'Provides' contract. +EOF %if %{with_network} install -d -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/lib/libvirt/dnsmasq/ install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/libvirt/networks/ @@ -1144,21 +1135,48 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml %if ! %{with_nwfilter} rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/nwfilter %endif -%if ! %{with_lxc} +%if %{with_lxc} +cat > $RPM_BUILD_ROOT%{_docdir}/libvirt/libvirt-daemon-lxc.README << 'EOF' +Any empty package encapsulating requirements for a libvirtd capable +of managing LXC. +EOF +%else rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/lxc.conf rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/libvirtd_lxc.aug rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirtd_lxc.aug rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.lxc %endif -%if ! %{with_qemu} +%if %{with_qemu} +cat > $RPM_BUILD_ROOT%{_docdir}/libvirt/libvirt-daemon-qemu.README << 'EOF' +Any empty package encapsulating requirements for a libvirtd capable +of managing QEMU/KVM. +EOF +%else rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu.conf rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/libvirtd_qemu.aug rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.qemu %endif -%if ! %{with_uml} +%if %{with_uml} +cat > $RPM_BUILD_ROOT%{_docdir}/libvirt/libvirt-daemon-uml.README << 'EOF' +Any empty package encapsulating requirements for a libvirtd capable +of managing UML. +EOF +%else rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.uml %endif +%if %{with_vbox} +cat > $RPM_BUILD_ROOT%{_docdir}/libvirt/libvirt-daemon-vbox.README << 'EOF' +Any empty package encapsulating requirements for a libvirtd capable +of managing VirtualBox. +EOF +%endif +%if %{with_xen} || %{with_libxl} +cat > $RPM_BUILD_ROOT%{_docdir}/libvirt/libvirt-daemon-xen.README << 'EOF' +Any empty package encapsulating requirements for a libvirtd capable +of managing Xen. +EOF +%endif %if ! %{with_sanlock} rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/libvirt_sanlock.aug rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirt_sanlock.aug @@ -1273,6 +1291,7 @@ fi %files %defattr(-, root, root) +%doc %{_docdir}/%{name}/libvirt.README %if %{with_libvirtd} %files daemon @@ -1376,11 +1395,6 @@ fi %config %{_fwdefdir}/libvirtd-relocation-server %if %{with_driver_modules} -%if %{with_network} -%files daemon-config-network -%defattr(-, root, root) -%endif - %if %{with_nwfilter} %files daemon-config-nwfilter %defattr(-, root, root) @@ -1472,26 +1486,31 @@ fi %if %{with_qemu} %files daemon-qemu %defattr(-, root, root) +%doc %{_docdir}/%{name}/libvirt-daemon-qemu.README %endif %if %{with_lxc} %files daemon-lxc %defattr(-, root, root) +%doc %{_docdir}/%{name}/libvirt-daemon-lxc.README %endif %if %{with_uml} %files daemon-uml %defattr(-, root, root) +%doc %{_docdir}/%{name}/libvirt-daemon-uml.README %endif %if %{with_xen} || %{with_libxl} %files daemon-xen %defattr(-, root, root) +%doc %{_docdir}/%{name}/libvirt-daemon-xen.README %endif %if %{with_vbox} %files daemon-vbox %defattr(-, root, root) +%doc %{_docdir}/%{name}/libvirt-daemon-vbox.README %endif %endif # with_libvirtd @@ -1554,7 +1573,12 @@ fi %defattr(-, root, root) # Website %dir %{_docdir}/libvirt -%doc %{_docdir}/libvirt/* +%doc %{_docdir}/%{name}/*.png +%doc %{_docdir}/%{name}/*.html +%doc %{_docdir}/%{name}/*.gif +%doc %{_docdir}/%{name}/*.css +%doc %{_docdir}/%{name}/html +%doc %{_docdir}/%{name}/internals # API docs %dir %{_datadir}/gtk-doc/html/libvirt/ diff --git a/rpmlintrc b/rpmlintrc deleted file mode 100644 index 4a0a507..0000000 --- a/rpmlintrc +++ /dev/null @@ -1,4 +0,0 @@ -# This line is mandatory to access the configuration functions -from Config import * - -addFilter("suse-filelist-empty")