rpms/xmlrpc-c
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Add xmlrpc_client++.pc

Browse Source 
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
This commit is contained in:
Igor Gnatenko 2017-09-29 17:03:48 +02:00
parent 732293b8fa
commit 1d08af0f0c
3 changed files with 57 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
0001-add-meson-buildsystem-definitions.patch
View File

@ -1,4 +1,4 @@
From 0ead2a9e8c4cae3ef20fe82e048da4f27468bca8 Mon Sep 17 00:00:00 2001
From b86f173e5131b89a74ff9e4b3882598c9145152b Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
Date: Sun, 18 Dec 2016 10:24:31 +0100
Subject: [PATCH 1/2] add meson buildsystem definitions
@ -9,9 +9,9 @@ Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
include/xmlrpc-c/config.h.in | 41 +++++++
include/xmlrpc-c/lnsfr.sh | 9 ++
include/xmlrpc-c/meson.build | 87 +++++++++++++++
lib/abyss++/meson.build | 43 ++++++++
lib/abyss++/meson.build | 43 +++++++
lib/abyss/meson.build | 1 +
lib/abyss/src/meson.build | 66 ++++++++++++
lib/abyss/src/meson.build | 66 +++++++++++
lib/curl_transport/meson.build | 16 +++
lib/expat/gennmtab/meson.build | 4 +
lib/expat/meson.build | 15 +++
@ -22,10 +22,10 @@ Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
lib/meson.build | 27 +++++
lib/openssl/meson.build | 27 +++++
lib/util/meson.build | 20 ++++
meson.build | 209 ++++++++++++++++++++++++++++++++++++
meson_options.txt | 12 +++
src/cpp/meson.build | 214 +++++++++++++++++++++++++++++++++++++
src/meson.build | 190 ++++++++++++++++++++++++++++++++
meson.build | 209 ++++++++++++++++++++++++++++++++++
meson_options.txt | 12 ++
src/cpp/meson.build | 223 +++++++++++++++++++++++++++++++++++++
src/meson.build | 190 +++++++++++++++++++++++++++++++
tools/lib/meson.build | 5 +
tools/meson.build | 14 +++
tools/xml-rpc-api2cpp/meson.build | 21 ++++
@ -34,10 +34,10 @@ Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
tools/xmlrpc/meson.build | 20 ++++
tools/xmlrpc_cpp_proxy/meson.build | 19 ++++
tools/xmlrpc_pstream/meson.build | 21 ++++
tools/xmlrpc_transport/meson.build | 18 ++++
tools/xmlrpc_transport/meson.build | 18 +++
transport_config.h.in | 4 +
xmlrpc-c-config | 114 ++++++++++++++++++++
32 files changed, 1359 insertions(+)
xmlrpc-c-config | 114 +++++++++++++++++++
32 files changed, 1368 insertions(+)
create mode 100644 include/meson.build
create mode 100644 include/xmlrpc-c/config.h.in
create mode 100755 include/xmlrpc-c/lnsfr.sh
@ -73,7 +73,7 @@ Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
diff --git a/include/meson.build b/include/meson.build
new file mode 100644
index 0000000..ec0964c
index 00000000..ec0964c0
--- /dev/null
+++ b/include/meson.build
@@ -0,0 +1,3 @@
@ -82,7 +82,7 @@ index 0000000..ec0964c
+subdir('xmlrpc-c')
diff --git a/include/xmlrpc-c/config.h.in b/include/xmlrpc-c/config.h.in
new file mode 100644
index 0000000..e8a633e
index 00000000..e8a633e7
--- /dev/null
+++ b/include/xmlrpc-c/config.h.in
@@ -0,0 +1,41 @@
@ -129,7 +129,7 @@ index 0000000..e8a633e
+#endif
diff --git a/include/xmlrpc-c/lnsfr.sh b/include/xmlrpc-c/lnsfr.sh
new file mode 100755
index 0000000..83f231b
index 00000000..83f231b7
--- /dev/null
+++ b/include/xmlrpc-c/lnsfr.sh
@@ -0,0 +1,9 @@
@ -144,7 +144,7 @@ index 0000000..83f231b
+ln -sfr "${DESTDIR}${tgt}" "${DESTDIR}${src}"
diff --git a/include/xmlrpc-c/meson.build b/include/xmlrpc-c/meson.build
new file mode 100644
index 0000000..2fe3cb9
index 00000000..2fe3cb90
--- /dev/null
+++ b/include/xmlrpc-c/meson.build
@@ -0,0 +1,87 @@
@ -237,7 +237,7 @@ index 0000000..2fe3cb9
+endforeach
diff --git a/lib/abyss++/meson.build b/lib/abyss++/meson.build
new file mode 100644
index 0000000..69f97d7
index 00000000..69f97d7c
--- /dev/null
+++ b/lib/abyss++/meson.build
@@ -0,0 +1,43 @@
@ -286,14 +286,14 @@ index 0000000..69f97d7
+)
diff --git a/lib/abyss/meson.build b/lib/abyss/meson.build
new file mode 100644
index 0000000..9537275
index 00000000..9537275d
--- /dev/null
+++ b/lib/abyss/meson.build
@@ -0,0 +1 @@
+subdir('src')
diff --git a/lib/abyss/src/meson.build b/lib/abyss/src/meson.build
new file mode 100644
index 0000000..32ecdfc
index 00000000..32ecdfca
--- /dev/null
+++ b/lib/abyss/src/meson.build
@@ -0,0 +1,66 @@
@ -365,7 +365,7 @@ index 0000000..32ecdfc
+)
diff --git a/lib/curl_transport/meson.build b/lib/curl_transport/meson.build
new file mode 100644
index 0000000..f5ff304
index 00000000..f5ff3040
--- /dev/null
+++ b/lib/curl_transport/meson.build
@@ -0,0 +1,16 @@
@ -387,7 +387,7 @@ index 0000000..f5ff304
+)
diff --git a/lib/expat/gennmtab/meson.build b/lib/expat/gennmtab/meson.build
new file mode 100644
index 0000000..94764c2
index 00000000..94764c22
--- /dev/null
+++ b/lib/expat/gennmtab/meson.build
@@ -0,0 +1,4 @@
@ -397,7 +397,7 @@ index 0000000..94764c2
+)
diff --git a/lib/expat/meson.build b/lib/expat/meson.build
new file mode 100644
index 0000000..df9ca84
index 00000000..df9ca84c
--- /dev/null
+++ b/lib/expat/meson.build
@@ -0,0 +1,15 @@
@ -418,7 +418,7 @@ index 0000000..df9ca84
+)
diff --git a/lib/expat/xmlparse/meson.build b/lib/expat/xmlparse/meson.build
new file mode 100644
index 0000000..39c0bf2
index 00000000..39c0bf26
--- /dev/null
+++ b/lib/expat/xmlparse/meson.build
@@ -0,0 +1,21 @@
@ -445,7 +445,7 @@ index 0000000..39c0bf2
+)
diff --git a/lib/expat/xmltok/meson.build b/lib/expat/xmltok/meson.build
new file mode 100644
index 0000000..6629719
index 00000000..6629719c
--- /dev/null
+++ b/lib/expat/xmltok/meson.build
@@ -0,0 +1,32 @@
@ -483,7 +483,7 @@ index 0000000..6629719
+xmltok_incdir = include_directories('.')
diff --git a/lib/libutil++/meson.build b/lib/libutil++/meson.build
new file mode 100644
index 0000000..9764c08
index 00000000..9764c08d
--- /dev/null
+++ b/lib/libutil++/meson.build
@@ -0,0 +1,28 @@
@ -517,7 +517,7 @@ index 0000000..9764c08
+)
diff --git a/lib/libutil/meson.build b/lib/libutil/meson.build
new file mode 100644
index 0000000..bb1cc67
index 00000000..bb1cc67d
--- /dev/null
+++ b/lib/libutil/meson.build
@@ -0,0 +1,41 @@
@ -564,7 +564,7 @@ index 0000000..bb1cc67
+)
diff --git a/lib/meson.build b/lib/meson.build
new file mode 100644
index 0000000..e78c1f8
index 00000000..e78c1f83
--- /dev/null
+++ b/lib/meson.build
@@ -0,0 +1,27 @@
@ -597,7 +597,7 @@ index 0000000..e78c1f8
+endif
diff --git a/lib/openssl/meson.build b/lib/openssl/meson.build
new file mode 100644
index 0000000..f65a4dc
index 00000000..f65a4dc1
--- /dev/null
+++ b/lib/openssl/meson.build
@@ -0,0 +1,27 @@
@ -630,7 +630,7 @@ index 0000000..f65a4dc
+)
diff --git a/lib/util/meson.build b/lib/util/meson.build
new file mode 100644
index 0000000..4cae492
index 00000000..4cae4926
--- /dev/null
+++ b/lib/util/meson.build
@@ -0,0 +1,20 @@
@ -656,7 +656,7 @@ index 0000000..4cae492
+endif
diff --git a/meson.build b/meson.build
new file mode 100644
index 0000000..028a579
index 00000000..028a5791
--- /dev/null
+++ b/meson.build
@@ -0,0 +1,209 @@
@ -871,7 +871,7 @@ index 0000000..028a579
+install_data('xmlrpc-c-config', install_dir : get_option('bindir'))
diff --git a/meson_options.txt b/meson_options.txt
new file mode 100644
index 0000000..822e91e
index 00000000..822e91e7
--- /dev/null
+++ b/meson_options.txt
@@ -0,0 +1,12 @@
@ -889,10 +889,10 @@ index 0000000..822e91e
+option('libxml2-backend', type : 'boolean', value : false, description : 'Use libxml2 instead of built-in expat')
diff --git a/src/cpp/meson.build b/src/cpp/meson.build
new file mode 100644
index 0000000..fdc5169
index 00000000..3398104e
--- /dev/null
+++ b/src/cpp/meson.build
@@ -0,0 +1,214 @@
@@ -0,0 +1,223 @@
+libxmlrpc_cpp = library(
+ 'xmlrpc_cpp',
+ sources : [
@ -1106,10 +1106,19 @@ index 0000000..fdc5169
+ version : '8.@0@'.format(version_minor),
+ install : true,
+ )
+ pkgg.generate(
+ name : 'xmlrpc_client++',
+ description : 'Xmlrpc-c XML-RPC client C++ library',
+ version : meson.project_version(),
+ 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
new file mode 100644
index 0000000..8dd2248
index 00000000..8dd22486
--- /dev/null
+++ b/src/meson.build
@@ -0,0 +1,190 @@
@ -1305,7 +1314,7 @@ index 0000000..8dd2248
+endif
diff --git a/tools/lib/meson.build b/tools/lib/meson.build
new file mode 100644
index 0000000..fc6929b
index 00000000..fc6929b8
--- /dev/null
+++ b/tools/lib/meson.build
@@ -0,0 +1,5 @@
@ -1316,7 +1325,7 @@ index 0000000..fc6929b
+)
diff --git a/tools/meson.build b/tools/meson.build
new file mode 100644
index 0000000..39f73a3
index 00000000..39f73a3e
--- /dev/null
+++ b/tools/meson.build
@@ -0,0 +1,14 @@
@ -1336,7 +1345,7 @@ index 0000000..39f73a3
+endif
diff --git a/tools/xml-rpc-api2cpp/meson.build b/tools/xml-rpc-api2cpp/meson.build
new file mode 100644
index 0000000..ec01212
index 00000000..ec01212f
--- /dev/null
+++ b/tools/xml-rpc-api2cpp/meson.build
@@ -0,0 +1,21 @@
@ -1363,7 +1372,7 @@ index 0000000..ec01212
+install_man('xml-rpc-api2cpp.1')
diff --git a/tools/xml-rpc-api2txt/meson.build b/tools/xml-rpc-api2txt/meson.build
new file mode 100644
index 0000000..2a0a61e
index 00000000..2a0a61e8
--- /dev/null
+++ b/tools/xml-rpc-api2txt/meson.build
@@ -0,0 +1,2 @@
@ -1371,7 +1380,7 @@ index 0000000..2a0a61e
+install_man('xml-rpc-api2txt.1')
diff --git a/tools/xml/meson.build b/tools/xml/meson.build
new file mode 100644
index 0000000..2d856c6
index 00000000..2d856c60
--- /dev/null
+++ b/tools/xml/meson.build
@@ -0,0 +1,15 @@
@ -1392,7 +1401,7 @@ index 0000000..2d856c6
+)
diff --git a/tools/xmlrpc/meson.build b/tools/xmlrpc/meson.build
new file mode 100644
index 0000000..e1e8d55
index 00000000..e1e8d552
--- /dev/null
+++ b/tools/xmlrpc/meson.build
@@ -0,0 +1,20 @@
@ -1418,7 +1427,7 @@ index 0000000..e1e8d55
+)
diff --git a/tools/xmlrpc_cpp_proxy/meson.build b/tools/xmlrpc_cpp_proxy/meson.build
new file mode 100644
index 0000000..f3fc998
index 00000000..f3fc9988
--- /dev/null
+++ b/tools/xmlrpc_cpp_proxy/meson.build
@@ -0,0 +1,19 @@
@ -1443,7 +1452,7 @@ index 0000000..f3fc998
+)
diff --git a/tools/xmlrpc_pstream/meson.build b/tools/xmlrpc_pstream/meson.build
new file mode 100644
index 0000000..9cd3eb8
index 00000000..9cd3eb85
--- /dev/null
+++ b/tools/xmlrpc_pstream/meson.build
@@ -0,0 +1,21 @@
@ -1470,7 +1479,7 @@ index 0000000..9cd3eb8
+)
diff --git a/tools/xmlrpc_transport/meson.build b/tools/xmlrpc_transport/meson.build
new file mode 100644
index 0000000..cbb6f83
index 00000000..cbb6f835
--- /dev/null
+++ b/tools/xmlrpc_transport/meson.build
@@ -0,0 +1,18 @@
@ -1494,7 +1503,7 @@ index 0000000..cbb6f83
+)
diff --git a/transport_config.h.in b/transport_config.h.in
new file mode 100644
index 0000000..687fdaf
index 00000000..687fdaf2
--- /dev/null
+++ b/transport_config.h.in
@@ -0,0 +1,4 @@
@ -1504,7 +1513,7 @@ index 0000000..687fdaf
+static const char * const XMLRPC_DEFAULT_TRANSPORT = @XMLRPC_DEFAULT_TRANSPORT@;
diff --git a/xmlrpc-c-config b/xmlrpc-c-config
new file mode 100755
index 0000000..25f9519
index 00000000..25f95194
--- /dev/null
+++ b/xmlrpc-c-config
@@ -0,0 +1,114 @@
@ -1622,6 +1631,3 @@ index 0000000..25f9519
+esac
+
+exec pkg-config "$@" $comp
--
2.13.1

5
0002-chmod-x-xml-rpc-api2txt.patch
View File

@ -1,4 +1,4 @@
From 7c5cfaea975d422bd4d5f1dfa0d688241678edf9 Mon Sep 17 00:00:00 2001
From 0e44853694beadea8df1ff7383d7dbc1750ed4ef Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
Date: Mon, 19 Dec 2016 21:33:47 +0100
Subject: [PATCH 2/2] chmod +x xml-rpc-api2txt
@ -14,6 +14,3 @@ Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
diff --git a/tools/xml-rpc-api2txt/xml-rpc-api2txt b/tools/xml-rpc-api2txt/xml-rpc-api2txt
old mode 100644
new mode 100755
--
2.13.1

5
xmlrpc-c.spec
View File

@ -6,7 +6,7 @@
Name: xmlrpc-c
Version: 1.48.0
Release: 7%{?dist}
Release: 8%{?dist}
Summary: A lightweight RPC library based on XML and HTTP
# See doc/COPYING for details.
# The Python 1.5.2 license used by a few files is just BSD.
@ -192,6 +192,9 @@ This package contains some handy XML-RPC demo applications.
%{_bindir}/xmlrpc_pstream
%changelog
* Fri Sep 29 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.48.0-8
- Add xmlrpc_client++.pc
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.48.0-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild