Fix build error with recent meson

Also, clean up a spec warning.

Resolves: #2047128

0001-add-meson-buildsystem-definitions.patch

@@ -242,7 +242,7 @@ new file mode 100644
 index 00000000..19f04cc3
 --- /dev/null
 +++ b/lib/abyss++/meson.build
-@@ -0,0 +1,43 @@
+@@ -0,0 +1,42 @@
 +if host_machine.system() == 'windows'
 +  abysspp_chan_switch = 'AbyssChanSwitchWin.cpp'
 +else
@@ -284,7 +284,6 @@ index 00000000..19f04cc3
 +  version : meson.project_version(),
 +  requires_private : ['xmlrpc_abyss', 'xmlrpc_util', 'xmlrpc_util++'],
 +  libraries : libxmlrpc_abysspp,
-+  install : true,
 +)
 diff --git a/lib/abyss/meson.build b/lib/abyss/meson.build
 new file mode 100644
@@ -298,7 +297,7 @@ new file mode 100644
 index 00000000..daa91fce
 --- /dev/null
 +++ b/lib/abyss/src/meson.build
-@@ -0,0 +1,66 @@
+@@ -0,0 +1,65 @@
 +abyss_deps = [socket]
 +if host_machine.system() == 'windows'
 +  abyss_socket = 'socket_win.c'
@@ -363,7 +362,6 @@ index 00000000..daa91fce
 +  version : meson.project_version(),
 +  libraries : libxmlrpc_abyss,
 +  requires_private : 'xmlrpc_util',
-+  install : true,
 +)
 diff --git a/lib/curl_transport/meson.build b/lib/curl_transport/meson.build
 new file mode 100644
@@ -402,7 +400,7 @@ new file mode 100644
 index 00000000..df9ca84c
 --- /dev/null
 +++ b/lib/expat/meson.build
-@@ -0,0 +1,15 @@
+@@ -0,0 +1,14 @@
 +subdir('gennmtab')
 +subdir('xmltok')
 +subdir('xmlparse')
@@ -416,7 +414,6 @@ index 00000000..df9ca84c
 +    libxmlrpc_xmlparse,
 +    libxmlrpc_xmltok,
 +  ],
-+  install : true,
 +)
 diff --git a/lib/expat/xmlparse/meson.build b/lib/expat/xmlparse/meson.build
 new file mode 100644
@@ -488,7 +485,7 @@ new file mode 100644
 index 00000000..9764c08d
 --- /dev/null
 +++ b/lib/libutil++/meson.build
-@@ -0,0 +1,28 @@
+@@ -0,0 +1,27 @@
 +libxmlrpc_utilpp = library(
 +  'xmlrpc_util++',
 +  sources : [
@@ -515,14 +512,13 @@ index 00000000..9764c08d
 +  version : meson.project_version(),
 +  requires_private : 'xmlrpc_util',
 +  libraries : libxmlrpc_utilpp,
-+  install : true,
 +)
 diff --git a/lib/libutil/meson.build b/lib/libutil/meson.build
 new file mode 100644
 index 00000000..bb1cc67d
 --- /dev/null
 +++ b/lib/libutil/meson.build
-@@ -0,0 +1,41 @@
+@@ -0,0 +1,40 @@
 +# FIXME: it's default already to 1 in xmlrpc_config.h
 +util_lock_pthread = ['lock_pthread.c']
 +# TODO: handle mscvrt.dll properly
@@ -562,7 +558,6 @@ index 00000000..bb1cc67d
 +  description : 'Xmlrpc-c utility functions library',
 +  version : meson.project_version(),
 +  libraries : libxmlrpc_util,
-+  install : true,
 +)
 diff --git a/lib/meson.build b/lib/meson.build
 new file mode 100644
@@ -602,7 +597,7 @@ new file mode 100644
 index 00000000..f65a4dc1
 --- /dev/null
 +++ b/lib/openssl/meson.build
-@@ -0,0 +1,27 @@
+@@ -0,0 +1,26 @@
 +libxmlrpc_openssl = library(
 +  'xmlrpc_openssl',
 +  sources : [
@@ -628,7 +623,6 @@ index 00000000..f65a4dc1
 +  version : meson.project_version(),
 +  requires_private : 'xmlrpc_util',
 +  libraries : libxmlrpc_openssl,
-+  install : true,
 +)
 diff --git a/lib/util/meson.build b/lib/util/meson.build
 new file mode 100644
@@ -895,7 +889,7 @@ new file mode 100644
 index 00000000..f0fd74f6
 --- /dev/null
 +++ b/src/cpp/meson.build
-@@ -0,0 +1,223 @@
+@@ -0,0 +1,218 @@
 +libxmlrpc_cpp = library(
 +  'xmlrpc_cpp',
 +  sources : [
@@ -944,7 +938,6 @@ index 00000000..f0fd74f6
 +  version : meson.project_version(),
 +  requires_private : ['xmlrpc', 'xmlrpc_util', 'xmlrpc_util++'],
 +  libraries : libxmlrpcpp,
-+  install : true,
 +)
 +
 +libxmlrpc_serverpp = library(
@@ -972,7 +965,6 @@ index 00000000..f0fd74f6
 +  version : meson.project_version(),
 +  requires_private : ['xmlrpc', 'xmlrpc++', 'xmlrpc_server', 'xmlrpc_util', 'xmlrpc_util++'],
 +  libraries : libxmlrpc_serverpp,
-+  install : true,
 +)
 +
 +if get_option('abyss-server')
@@ -1005,7 +997,6 @@ index 00000000..f0fd74f6
 +    version : meson.project_version(),
 +    requires_private : ['xmlrpc_abyss', 'xmlrpc_abyss++', 'xmlrpc_server++', 'xmlrpc_server_abyss', 'xmlrpc_util', 'xmlrpc_util++'],
 +    libraries : libxmlrpc_server_abysspp,
-+    install : true,
 +  )
 +endif
 +
@@ -1077,7 +1068,6 @@ index 00000000..f0fd74f6
 +    version : meson.project_version(),
 +    requires_private : ['xmlrpc++', 'xmlrpc_server++', 'xmlrpc_util++'],
 +    libraries : [libxmlrpc_server_pstreampp, libxmlrpc_packetsocket],
-+    install : true,
 +  )
 +endif
 +
@@ -1116,7 +1106,6 @@ index 00000000..f0fd74f6
 +    requires_private : ['xmlrpc', 'xmlrpc++', 'xmlrpc_client', 'xmlrpc_util', 'xmlrpc_util++'],
 +    libraries : libxmlrpc_clientpp,
 +    libraries_private : libxmlrpc_packetsocket,
-+    install : true,
 +  )
 +endif
 diff --git a/src/meson.build b/src/meson.build
@@ -1124,7 +1113,7 @@ new file mode 100644
 index 00000000..8dd22486
 --- /dev/null
 +++ b/src/meson.build
-@@ -0,0 +1,190 @@
+@@ -0,0 +1,185 @@
 +xmlrpc_deps = []
 +xmlrpc_incs = []
 +xmlrpc_libs = [libxmlrpc_util]
@@ -1182,7 +1171,6 @@ index 00000000..8dd22486
 +  version : meson.project_version(),
 +  requires_private : xmlrpc_pkgconfig_req,
 +  libraries : libxmlrpc,
-+  install : true,
 +)
 +
 +libxmlrpc_server = library(
@@ -1211,7 +1199,6 @@ index 00000000..8dd22486
 +  version : meson.project_version(),
 +  requires_private : ['xmlrpc', 'xmlrpc_util'],
 +  libraries : libxmlrpc_server,
-+  install : true,
 +)
 +
 +if get_option('abyss-server')
@@ -1242,7 +1229,6 @@ index 00000000..8dd22486
 +    version : meson.project_version(),
 +    requires_private : ['xmlrpc', 'xmlrpc_server', 'xmlrpc_abyss', 'xmlrpc_util'],
 +    libraries : libxmlrpc_server_abyss,
-+    install : true,
 +  )
 +endif
 +
@@ -1272,7 +1258,6 @@ index 00000000..8dd22486
 +    version : meson.project_version(),
 +    requires_private : ['xmlrpc', 'xmlrpc_server', 'xmlrpc_util'],
 +    libraries : libxmlrpc_server_cgi,
-+    install : true,
 +  )
 +endif
 +
@@ -1308,7 +1293,6 @@ index 00000000..8dd22486
 +    version : meson.project_version(),
 +    requires_private : ['xmlrpc', 'xmlrpc_util'],
 +    libraries : libxmlrpc_client,
-+    install : true,
 +  )
 +endif
 +

xmlrpc-c.spec

@@ -13,7 +13,7 @@ Summary:        Lightweight RPC library based on XML and HTTP
 License:        BSD and MIT
 URL:            http://xmlrpc-c.sourceforge.net/
 %{!?advanced_branch:Source0: http://dl.sourceforge.net/sourceforge/xmlrpc-c/xmlrpc-%version.tgz}
-# generated by 'make svn-sources [SVN_VER=%version SVN_REV=%svnrev]'. Unfortunately,
+# generated by 'make svn-sources [SVN_VER=%%version SVN_REV=%%svnrev]'. Unfortunately,
 # upstream does not tag versions so we must fetch from the branch and
 # check which version was used for it
 %{?advanced_branch:Source0: xmlrpc-c-%version.tar.xz}