rpm/libguestfs
SHA256
1
0
Fork 0
forked from pool/libguestfs
Code Pull Requests Activity

Accepting request 546686 from home:cbosdonnat:branches:Virtualization

Browse Source 
Fix is_opensuse macro mess in spec file

OBS-URL: https://build.opensuse.org/request/show/546686
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=414
This commit is contained in:
Cédric Bosdonnat 2017-11-30 10:54:44 +00:00 committed by Git OBS Bridge
parent e74a187725
commit b4a9c7b26f
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
0000-hotfix.patch
View File

15
libguestfs.spec
View File

@ -137,10 +137,9 @@ BuildRequires: gtk2-devel
Url: http://libguestfs.org/ Url: http://libguestfs.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: Compatibility package for guestfs-tools Summary: Compatibility package for guestfs-tools
# PATCH-FIX-UPSTREAM - python3 fixes
License: GPL-2.0 License: GPL-2.0
Group: System/Filesystems Group: System/Filesystems
Patch0: 0000-hotfix.patch
# PATCH-FIX-UPSTREAM - python3 fixes
Patch1: 9d25b4e5-python-add-simple-wrappers-for-PyObject-string-funct.patch Patch1: 9d25b4e5-python-add-simple-wrappers-for-PyObject-string-funct.patch
Patch2: f3f99a09-python-use-right-func-when-PyString_FromStringAndSiz.patch Patch2: f3f99a09-python-use-right-func-when-PyString_FromStringAndSiz.patch
# PATCH-FIX-UPSTREAM - add configure --with-distro parameter # PATCH-FIX-UPSTREAM - add configure --with-distro parameter
@ -441,7 +440,7 @@ Recommends: parted
Recommends: zerofree Recommends: zerofree
Recommends: genisoimage Recommends: genisoimage
Recommends: ldmtool Recommends: ldmtool
%if 0%{?is_opensuse:0} == 0 %if ! 0%{?is_opensuse}
Recommends: guestfs-winsupport Recommends: guestfs-winsupport
%endif %endif
@ -455,7 +454,7 @@ Obsoletes: libguestfs-data < %{version}
libguestfs needs for it's run a virtual machine image. libguestfs needs for it's run a virtual machine image.
This package provides such an image, an initrd and a kernel. This package provides such an image, an initrd and a kernel.
%if 0%{?is_opensuse} == 0 %if ! 0%{?is_opensuse}
%package -n guestfs-winsupport %package -n guestfs-winsupport
Summary: Windows guest support in libguestfs Summary: Windows guest support in libguestfs
License: GPL-2.0+ License: GPL-2.0+
@ -544,7 +543,6 @@ It can import a variety of guest operating systems from libvirt-managed hosts.
%prep %prep
: _ignore_exclusive_arch '%{?_ignore_exclusive_arch}' : _ignore_exclusive_arch '%{?_ignore_exclusive_arch}'
%setup -q -a 789653 %setup -q -a 789653
%patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
@ -665,7 +663,7 @@ touch %{name}.lang
%fdupes -s %{buildroot}/ %fdupes -s %{buildroot}/
# Appliance NTFS files # Appliance NTFS files
%if 0%{?is_opensuse} == 0 %if 0%{?is_opensuse}
mkdir -p %{buildroot}/tmp/etc/alternatives mkdir -p %{buildroot}/tmp/etc/alternatives
pushd %{buildroot}/tmp/etc/alternatives pushd %{buildroot}/tmp/etc/alternatives
ln -s /sbin/mount.ntfs-3g mount.ntfs ln -s /sbin/mount.ntfs-3g mount.ntfs
@ -724,11 +722,10 @@ rm %{buildroot}/%{_datadir}/virt-p2v/p2v.ks.in
%{_libdir}/guestfs/supermin.d/packages %{_libdir}/guestfs/supermin.d/packages
%{_libdir}/guestfs/supermin.d/zz-scripts.tar.gz %{_libdir}/guestfs/supermin.d/zz-scripts.tar.gz
%if 0%{?is_opensuse} == 0 %if 0%{?is_opensuse}
%{_libdir}/guestfs/supermin.d/zz-ntfs-symlink.tar.gz %{_libdir}/guestfs/supermin.d/zz-ntfs-symlink.tar.gz
%endif %else
%if 0%{?is_opensuse} == 0
%files -n guestfs-winsupport %files -n guestfs-winsupport
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/guestfs/supermin.d/zz-*winsupport* %{_libdir}/guestfs/supermin.d/zz-*winsupport*