Accepting request 544492 from home:jfehlig:branches:Virtualization

- spec: Add BuildRequires for libtirpc-devel in preparation of
  removal of sunrpc from glibc
- build: Use XDR_CFLAGS in more places
  74a13be4-xdr-flags.patch

OBS-URL: https://build.opensuse.org/request/show/544492
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=641

74a13be4-xdr-flags.patch

@@ -0,0 +1,56 @@
+commit 74a13be4a4562affcf721ba32f42f8a27ec3557d
+Author: Martin Kletzander <mkletzan@redhat.com>
+Date:   Thu Nov 16 14:24:45 2017 +0100
+
+    build: Use XDR_CFLAGS in more places
+    
+    Since update to glibc-2.26 removed the /usr/include/rpc/rpc.h we used until now,
+    it showed us a problem with not using XDR_CFLAGS properly.  On linux that
+    variable has usually -I/usr/include/tirpc because we already probe for it
+    properly, we just don't use it everywhere we need.  It is needed by wireshark
+    dissector as well as testutilsqemu.c (through includes) so the build fails with:
+    
+    wireshark/src/packet-libvirt.c:33:10: fatal error: rpc/xdr.h: No such file or directory
+     #include <rpc/xdr.h>
+              ^~~~~~~~~~~
+    
+    and
+    
+    In file included from ../src/logging/log_manager.h:29:0,
+                     from ../src/qemu/qemu_domain.h:40,
+                     from testutilsqemu.c:11:
+    ../src/logging/log_protocol.h:9:10: fatal error: rpc/rpc.h: No such file or directory
+     #include <rpc/rpc.h>
+              ^~~~~~~~~~~
+    
+    Since lot of tests use testutilsqemu.c it is easier to add XDR_CFLAGS to
+    AM_CFLAGS than adding it to all $binary_CFLAGS.  It's just for tests and we
+    already have bunch of CFLAGS there anyway.
+    
+    Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
+
+Index: libvirt-3.9.0/tests/Makefile.am
+===================================================================
+--- libvirt-3.9.0.orig/tests/Makefile.am
++++ libvirt-3.9.0/tests/Makefile.am
+@@ -48,6 +48,7 @@ AM_CFLAGS = \
+ 	$(APPARMOR_CFLAGS) \
+ 	$(YAJL_CFLAGS) \
+ 	$(COVERAGE_CFLAGS) \
++	$(XDR_CFLAGS) \
+ 	$(WARN_CFLAGS)
+ 
+ AM_LDFLAGS = \
+Index: libvirt-3.9.0/tools/Makefile.am
+===================================================================
+--- libvirt-3.9.0.orig/tools/Makefile.am
++++ libvirt-3.9.0/tools/Makefile.am
+@@ -428,7 +428,7 @@ if WITH_WIRESHARK_DISSECTOR
+ 
+ ws_plugin_LTLIBRARIES = wireshark/src/libvirt.la
+ wireshark_src_libvirt_la_CPPFLAGS = \
+-	-I wireshark/src $(WIRESHARK_DISSECTOR_CFLAGS)
++	-I wireshark/src $(WIRESHARK_DISSECTOR_CFLAGS) $(XDR_CFLAGS)
+ wireshark_src_libvirt_la_LDFLAGS = -avoid-version -module
+ nodist_wireshark_src_libvirt_la_SOURCES = wireshark/src/plugin.c
+ wireshark_src_libvirt_la_SOURCES = \

libvirt.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Nov 22 22:25:43 UTC 2017 - kukuk@suse.de
+
+- spec: Add BuildRequires for libtirpc-devel in preparation of
+  removal of sunrpc from glibc
+- build: Use XDR_CFLAGS in more places
+  74a13be4-xdr-flags.patch
+
 -------------------------------------------------------------------
 Wed Nov 22 19:05:39 UTC 2017 - olaf@aepfle.de
 

libvirt.spec

@@ -240,6 +240,9 @@ BuildRequires:  libavahi-devel
 BuildRequires:  libnl3-devel
 BuildRequires:  libpcap-devel
 BuildRequires:  libselinux-devel
+%if 0%{?suse_version} >= 1330
+BuildRequires:  libtirpc-devel
+%endif
 %if %{with_apparmor}
 BuildRequires:  apparmor-rpm-macros
 BuildRequires:  libapparmor-devel
@@ -301,6 +304,7 @@ Source99:       baselibs.conf
 Source100:      %{name}-rpmlintrc
 # Upstream patches
 Patch0:         8056721c-qemu-null-storage-source.patch
+Patch1:         74a13be4-xdr-flags.patch
 # Patches pending upstream review
 Patch100:       libxl-dom-reset.patch
 Patch101:       network-don-t-use-dhcp-authoritative-on-static-netwo.patch
@@ -879,6 +883,7 @@ libvirt plugin for NSS for translating domain names into IP addresses.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 %patch100 -p1
 %patch101 -p1
 %patch102 -p1