From c99f0acbc5e2a3d0847e7b8bd555a574dae78fa9 Mon Sep 17 00:00:00 2001 From: ensc Date: Mon, 2 Oct 2006 15:02:03 +0000 Subject: [PATCH] - updated cmake patch - strip installed libraries --- ...tion.txt => 0001-make-cmake-transition.txt | 78 +++++++++---------- xmlrpc-c.spec | 12 ++- 2 files changed, 48 insertions(+), 42 deletions(-) rename 0003-make-cmake-transition.txt => 0001-make-cmake-transition.txt (96%) diff --git a/0003-make-cmake-transition.txt b/0001-make-cmake-transition.txt similarity index 96% rename from 0003-make-cmake-transition.txt rename to 0001-make-cmake-transition.txt index 4d4647f..532de4a 100644 --- a/0003-make-cmake-transition.txt +++ b/0001-make-cmake-transition.txt @@ -1,6 +1,6 @@ -From f0c6498ab4e0809f035910c0b4a44aadbb82ddd1 Mon Sep 17 00:00:00 2001 +From ca5754cd4b3f3fdf3b8b80bc2264aa4c1f2e76a4 Mon Sep 17 00:00:00 2001 From: Enrico Scholz -Date: Wed, 20 Sep 2006 20:42:46 +0200 +Date: Mon, 2 Oct 2006 13:37:48 +0200 Subject: [PATCH] make -> cmake transition --- @@ -569,7 +569,7 @@ index 0000000..a8fb5a9 +ensc_pkgconfig(xmlrpc_abyss) diff --git a/lib/abyss/src/xmlrpc_abyss.pc.cmake b/lib/abyss/src/xmlrpc_abyss.pc.cmake new file mode 100644 -index 0000000..8f913e5 +index 0000000..2a4f124 --- /dev/null +++ b/lib/abyss/src/xmlrpc_abyss.pc.cmake @@ -0,0 +1,10 @@ @@ -580,8 +580,8 @@ index 0000000..8f913e5 +Description: XMLRPC Abyss base library +Version: @XMLRPC_C_VERSION@ + -+Requires: xmlrpc_util -+Libs: -L${libdir} -lxmlrpc_abyss @xmlrpc_abyss_pkgconfig_libs@ ++Requires.private: xmlrpc_util ++Libs: -L${libdir} -lxmlrpc_abyss @xmlrpc_abyss_pkgconfig_libs@ +Cflags: diff --git a/lib/curl_transport/CMakeLists.txt b/lib/curl_transport/CMakeLists.txt new file mode 100644 @@ -635,7 +635,7 @@ index 0000000..f87008a +ensc_pkgconfig(xmlrpc_xmlparse) diff --git a/lib/expat/xmlparse/xmlrpc_xmlparse.pc.cmake b/lib/expat/xmlparse/xmlrpc_xmlparse.pc.cmake new file mode 100644 -index 0000000..cd9900f +index 0000000..71d77da --- /dev/null +++ b/lib/expat/xmlparse/xmlrpc_xmlparse.pc.cmake @@ -0,0 +1,10 @@ @@ -646,8 +646,8 @@ index 0000000..cd9900f +Description: XMLRPC xmlparse library +Version: @XMLRPC_C_VERSION@ + -+Requires: xmlrpc_xmltok -+Libs: -L${libdir} -lxmlrpc_xmlparse ++Requires.private: xmlrpc_xmltok ++Libs: -L${libdir} -lxmlrpc_xmlparse +Cflags: diff --git a/lib/expat/xmltok/CMakeLists.txt b/lib/expat/xmltok/CMakeLists.txt new file mode 100644 @@ -941,7 +941,7 @@ index 0000000..9ab2530 + SOVERSION ${XMLRPC_C_SOVERSION}) diff --git a/src/cpp/xmlrpc++.pc.cmake b/src/cpp/xmlrpc++.pc.cmake new file mode 100644 -index 0000000..9c35667 +index 0000000..cda7f56 --- /dev/null +++ b/src/cpp/xmlrpc++.pc.cmake @@ -0,0 +1,11 @@ @@ -953,12 +953,12 @@ index 0000000..9c35667 +Description: XMLRPC C++ Base library +Version: @XMLRPC_C_VERSION@ + -+Requires: xmlrpc -+Libs: -L${libdir} -lxmlrpc++ ++Requires.private: xmlrpc ++Libs: -L${libdir} -lxmlrpc++ +Cflags: -I${includedir} diff --git a/src/cpp/xmlrpc_client++.pc.cmake b/src/cpp/xmlrpc_client++.pc.cmake new file mode 100644 -index 0000000..a02bd6e +index 0000000..188b3a6 --- /dev/null +++ b/src/cpp/xmlrpc_client++.pc.cmake @@ -0,0 +1,11 @@ @@ -970,12 +970,12 @@ index 0000000..a02bd6e +Description: XMLRPC C++ Client library +Version: @XMLRPC_C_VERSION@ + -+Requires: xmlrpc++ xmlrpc_client -+Libs: -L${libdir} -lxmlrpc_client++ ++Requires.private: xmlrpc++ xmlrpc_client ++Libs: -L${libdir} -lxmlrpc_client++ +Cflags: -I${includedir} diff --git a/src/cpp/xmlrpc_cpp.pc.cmake b/src/cpp/xmlrpc_cpp.pc.cmake new file mode 100644 -index 0000000..52c092c +index 0000000..b8f5af3 --- /dev/null +++ b/src/cpp/xmlrpc_cpp.pc.cmake @@ -0,0 +1,11 @@ @@ -987,12 +987,12 @@ index 0000000..52c092c +Description: XMLRPC CPP library +Version: @XMLRPC_C_VERSION@ + -+Requires: xmlrpc xmlrpc_server xmlrpc_client -+Libs: -L${libdir} -lxmlrpc_cpp ++Requires.private: xmlrpc xmlrpc_server xmlrpc_client ++Libs: -L${libdir} -lxmlrpc_cpp +Cflags: -I${includedir} diff --git a/src/cpp/xmlrpc_server++.pc.cmake b/src/cpp/xmlrpc_server++.pc.cmake new file mode 100644 -index 0000000..71e394e +index 0000000..07b9e7b --- /dev/null +++ b/src/cpp/xmlrpc_server++.pc.cmake @@ -0,0 +1,11 @@ @@ -1004,12 +1004,12 @@ index 0000000..71e394e +Description: XMLRPC C++ Server library +Version: @XMLRPC_C_VERSION@ + -+Requires: xmlrpc++ xmlrpc_server -+Libs: -L${libdir} -lxmlrpc_server++ ++Requires.private: xmlrpc++ xmlrpc_server ++Libs: -L${libdir} -lxmlrpc_server++ +Cflags: -I${includedir} diff --git a/src/cpp/xmlrpc_server_abyss++.pc.cmake b/src/cpp/xmlrpc_server_abyss++.pc.cmake new file mode 100644 -index 0000000..1d28749 +index 0000000..d9eb456 --- /dev/null +++ b/src/cpp/xmlrpc_server_abyss++.pc.cmake @@ -0,0 +1,11 @@ @@ -1021,8 +1021,8 @@ index 0000000..1d28749 +Description: XMLRPC C++ Abyss-Server library +Version: @XMLRPC_C_VERSION@ + -+Requires: xmlrpc_server_abyss xmlrpc_server++ -+Libs: -L${libdir} -lxmlrpc_server_abyss++ ++Requires.private: xmlrpc_server_abyss xmlrpc_server++ ++Libs: -L${libdir} -lxmlrpc_server_abyss++ +Cflags: -I${includedir} diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt new file mode 100644 @@ -1059,7 +1059,7 @@ index 0000000..3deb9cb +add_test(runtests src-test) diff --git a/src/xmlrpc.pc.cmake b/src/xmlrpc.pc.cmake new file mode 100644 -index 0000000..7d74537 +index 0000000..fd0c872 --- /dev/null +++ b/src/xmlrpc.pc.cmake @@ -0,0 +1,11 @@ @@ -1071,12 +1071,12 @@ index 0000000..7d74537 +Description: XMLRPC base library +Version: @XMLRPC_C_VERSION@ + -+Requires: @xmlrpc_pkgconfig_req@ xmlrpc_util -+Libs: -L${libdir} -lxmlrpc @xmlrpc_pkgconfig_libs@ ++Requires.private: @xmlrpc_pkgconfig_req@ xmlrpc_util ++Libs: -L${libdir} -lxmlrpc @xmlrpc_pkgconfig_libs@ +Cflags: -I${includedir} diff --git a/src/xmlrpc_client.pc.cmake b/src/xmlrpc_client.pc.cmake new file mode 100644 -index 0000000..4233a27 +index 0000000..16bdd22 --- /dev/null +++ b/src/xmlrpc_client.pc.cmake @@ -0,0 +1,11 @@ @@ -1088,12 +1088,12 @@ index 0000000..4233a27 +Description: XMLRPC client library +Version: @XMLRPC_C_VERSION@ + -+Requires: xmlrpc @xmlrpc_client_pkgconfig_req@ -+Libs: -L${libdir} -lxmlrpc_client @client_libwww_LIBS@ @client_wininet_LIBS@ ++Requires.private: xmlrpc @xmlrpc_client_pkgconfig_req@ ++Libs: -L${libdir} -lxmlrpc_client @client_libwww_LIBS@ @client_wininet_LIBS@ +Cflags: -I${includedir} diff --git a/src/xmlrpc_server.pc.cmake b/src/xmlrpc_server.pc.cmake new file mode 100644 -index 0000000..3c585e5 +index 0000000..ca7224c --- /dev/null +++ b/src/xmlrpc_server.pc.cmake @@ -0,0 +1,11 @@ @@ -1105,12 +1105,12 @@ index 0000000..3c585e5 +Description: XMLRPC Server library +Version: @XMLRPC_C_VERSION@ + -+Requires: xmlrpc -+Libs: -L${libdir} -lxmlrpc_server ++Requires.private: xmlrpc ++Libs: -L${libdir} -lxmlrpc_server +Cflags: -I${includedir} diff --git a/src/xmlrpc_server_abyss.pc.cmake b/src/xmlrpc_server_abyss.pc.cmake new file mode 100644 -index 0000000..be2e4c1 +index 0000000..7fbecc9 --- /dev/null +++ b/src/xmlrpc_server_abyss.pc.cmake @@ -0,0 +1,11 @@ @@ -1122,12 +1122,12 @@ index 0000000..be2e4c1 +Description: XMLRPC Server Abyss library +Version: @XMLRPC_C_VERSION@ + -+Requires: xmlrpc_server xmlrpc_abyss -+Libs: -L${libdir} -lxmlrpc_server_abyss ++Requires.private: xmlrpc_server xmlrpc_abyss ++Libs: -L${libdir} -lxmlrpc_server_abyss +Cflags: -I${includedir} diff --git a/src/xmlrpc_server_cgi.pc.cmake b/src/xmlrpc_server_cgi.pc.cmake new file mode 100644 -index 0000000..ac0c031 +index 0000000..8042912 --- /dev/null +++ b/src/xmlrpc_server_cgi.pc.cmake @@ -0,0 +1,11 @@ @@ -1139,8 +1139,8 @@ index 0000000..ac0c031 +Description: XMLRPC CGI-Server library +Version: @XMLRPC_C_VERSION@ + -+Requires: xmlrpc_server -+Libs: -L${libdir} -lxmlrpc_server_cgi ++Requires.private: xmlrpc_server ++Libs: -L${libdir} -lxmlrpc_server_cgi +Cflags: -I${includedir} diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt new file mode 100644 @@ -1345,5 +1345,5 @@ index 0000000..98b37ef + +#endif -- -1.4.2 +1.4.2.1 diff --git a/xmlrpc-c.spec b/xmlrpc-c.spec index 4ae9123..4bdb4b6 100644 --- a/xmlrpc-c.spec +++ b/xmlrpc-c.spec @@ -5,14 +5,14 @@ Summary: A lightweight RPC library based on XML and HTTP Name: xmlrpc-c Version: 1.06.05 -Release: %release_func 1 +Release: %release_func 2 License: BSD/PSF -- see COPYING Group: System Environment/Libraries URL: http://xmlrpc-c.sourceforge.net/ Source0: http://dl.sourceforge.net/sourceforge/xmlrpc-c/%name-%version.tgz Patch3: xmlrpc-c-1.05-typo.patch Patch6: xmlrpc-c-1.06.04-sizet.patch -Patch100: http://ensc.de/xmlrpc-c/0003-make-cmake-transition.txt +Patch100: http://ensc.de/xmlrpc-c/0001-make-cmake-transition.txt BuildRoot: %_tmppath/%name-%version-%release-root #BuildRequires: w3c-libwww-devel BuildRequires: cmake @@ -86,7 +86,9 @@ make VERBOSE=1 %{?_smp_mflags} rm -rf $RPM_BUILD_ROOT cd fedora make install DESTDIR=$RPM_BUILD_ROOT - + +chmod +x $RPM_BUILD_ROOT%_libdir/*.so + %clean rm -rf $RPM_BUILD_ROOT @@ -121,6 +123,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Oct 2 2006 Enrico Scholz - 1.06.05-2 +- updated cmake patch +- strip installed libraries + * Wed Sep 20 2006 Enrico Scholz - 1.06.05-1 - updated to 1.06.05 - merged + updated patches