SHA256
1
0
forked from pool/libvirt

fix error: patch 23993 defined multiple times

OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=169
This commit is contained in:
Olaf Hering 2011-11-08 22:03:20 +00:00 committed by Git OBS Bridge
parent 3da5a7017e
commit 70bb121b93

View File

@ -395,6 +395,7 @@ Patch300: libvirt-suse-netcontrol.patch
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
Libvirt is a C toolkit to interact with the virtualization
capabilities of Linux. Virtualization of the Linux Operating System means
@ -424,6 +425,7 @@ Recommends: cyrus-sasl-digestmd5
# (client invokes 'nc' against the UNIX socket on the server)
Recommends: netcat-openbsd
%description client
Libvirt is a C toolkit to interact with the virtualization
capabilities of Linux. The libvirt-client package contains shared
@ -447,6 +449,7 @@ Requires: pkg-config
Requires: xen-devel
%endif
%description devel
Libvirt is a C toolkit to interact with the virtualization
capabilities of Linux. The libvirt-devel package contains headers
@ -465,6 +468,7 @@ Summary: A C toolkit to interact with the virtualization capabilities of
Group: Development/Libraries/C and C++
Requires: %{name}-client = %{version}-%{release}
%description doc
Libvirt is a C toolkit to interact with the virtualization
capabilities of Linux. The libvirt-doc package contains documentation
@ -479,6 +483,7 @@ Authors:
%if %{with_python}
%package python
License: LGPLv2.1+
Summary: A C toolkit to interact with the virtualization capabilities of Linux
@ -486,6 +491,7 @@ Group: Development/Libraries/C and C++
Requires: %{name}-client = %{version}-%{release}
%py_requires
%description python
Libvirt is a C toolkit to interact with the virtualization
capabilities of Linux. The libvirt-python package provides python
@ -499,6 +505,7 @@ Authors:
Karel Zak <kzak@redhat.com>
%endif
%prep
%setup -q
%patch0 -p1
@ -517,6 +524,7 @@ Authors:
%patch300 -p1
%endif
%build
%if ! %{with_xen}
%define _without_xen --without-xen
@ -667,6 +675,7 @@ export CFLAGS="$RPM_OPT_FLAGS"
ac_cv_path_SHOWMOUNT=/usr/sbin/showmount
make %{?jobs:-j%jobs} DOCS_DIR=%{_docdir}/%{name}-python EXAMPLE_DIR=%{_docdir}/%{name}-python/examples HTML_DIR=%{_docdir}/%{name}
%install
%makeinstall DOCS_DIR=%{_docdir}/%{name}-python EXAMPLE_DIR=%{_docdir}/%{name}-python/examples HTML_DIR=%{_docdir}/%{name}
cp -a AUTHORS ChangeLog COPYING NEWS README TODO $RPM_BUILD_ROOT%{_docdir}/%{name}/
@ -740,13 +749,16 @@ ln -s /etc/init.d/libvirt-guests $RPM_BUILD_ROOT%{_sbindir}/rclibvirt-guests
mkdir -p $RPM_BUILD_ROOT/%{_fwdefdir}
install -m 644 %{S:2} $RPM_BUILD_ROOT/%{_fwdefdir}/libvirtd-relocation-server
%clean
rm -rf $RPM_BUILD_ROOT
%pre
%{_bindir}/getent group libvirt >/dev/null || \
%{_sbindir}/groupadd -r libvirt 2>/dev/null
%post
/sbin/ldconfig
%if %{with_libvirtd}
@ -768,11 +780,13 @@ fi
%endif
%{fillup_only -n libvirt-guests}
%preun
%if %{with_libvirtd}
%stop_on_removal libvirtd
%endif
%postun
/sbin/ldconfig
%if %{with_libvirtd}
@ -780,12 +794,15 @@ fi
%endif
%insserv_cleanup
%post client -p /sbin/ldconfig
%postun client -p /sbin/ldconfig
%if %{with_libvirtd}
%files
%defattr(-, root, root)
%{_sbindir}/libvirtd
@ -861,6 +878,7 @@ fi
%endif
%config %{_fwdefdir}/libvirtd-relocation-server
%files client -f %{name}.lang
%defattr(-, root, root)
%doc %dir %{_docdir}/%{name}
@ -900,12 +918,14 @@ fi
%config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf
%endif
%files devel
%defattr(-, root, root)
%{_includedir}/libvirt
%{_libdir}/*.so
%{_libdir}/pkgconfig/libvirt.pc
%files doc
%defattr(-, root, root)
%{_datadir}/gtk-doc/html/libvirt
@ -917,6 +937,7 @@ fi
%if %{with_python}
%files python
%defattr(-, root, root)
%doc %{_docdir}/%{name}-python
@ -925,4 +946,6 @@ fi
%{py_sitedir}/libvirtmod*
%endif
%changelog