use the upstream patch to install man pages
This commit is contained in:
Kamil Dudka
parent
36b5a96547
commit
30ed006b97
|
|
@ -10992,3 +10992,240 @@ index 93de53a..0053fee 100644
|
|||
--
|
||||
2.1.0
|
||||
|
||||
From 1df2809089dd50353b12dee8aca31de4e413a7f3 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Lamaison <alexander.lamaison@gmail.com>
|
||||
Date: Tue, 9 Dec 2014 00:39:53 +0000
|
||||
Subject: [PATCH] Include man pages when installing.
|
||||
|
||||
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
|
||||
---
|
||||
CMakeLists.txt | 2 +
|
||||
docs/CMakeLists.txt | 203 ++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
2 files changed, 205 insertions(+)
|
||||
create mode 100644 docs/CMakeLists.txt
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 50c6c23..f951629 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -88,6 +88,8 @@ if(BUILD_TESTING)
|
||||
add_subdirectory(tests)
|
||||
endif()
|
||||
|
||||
+add_subdirectory(docs)
|
||||
+
|
||||
feature_summary(WHAT ALL)
|
||||
|
||||
set(CPACK_PACKAGE_VERSION_MAJOR ${LIBSSH2_VERSION_MAJOR})
|
||||
diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
|
||||
new file mode 100644
|
||||
index 0000000..fc94d8d
|
||||
--- /dev/null
|
||||
+++ b/docs/CMakeLists.txt
|
||||
@@ -0,0 +1,203 @@
|
||||
+# Copyright (c) 2014 Alexander Lamaison <alexander.lamaison@gmail.com>
|
||||
+#
|
||||
+# Redistribution and use in source and binary forms,
|
||||
+# with or without modification, are permitted provided
|
||||
+# that the following conditions are met:
|
||||
+#
|
||||
+# Redistributions of source code must retain the above
|
||||
+# copyright notice, this list of conditions and the
|
||||
+# following disclaimer.
|
||||
+#
|
||||
+# Redistributions in binary form must reproduce the above
|
||||
+# copyright notice, this list of conditions and the following
|
||||
+# disclaimer in the documentation and/or other materials
|
||||
+# provided with the distribution.
|
||||
+#
|
||||
+# Neither the name of the copyright holder nor the names
|
||||
+# of any other contributors may be used to endorse or
|
||||
+# promote products derived from this software without
|
||||
+# specific prior written permission.
|
||||
+#
|
||||
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
|
||||
+# CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
|
||||
+# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
||||
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
|
||||
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
||||
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
||||
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
||||
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
|
||||
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
|
||||
+# USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
|
||||
+# OF SUCH DAMAGE.
|
||||
+
|
||||
+set(MAN_PAGES
|
||||
+ libssh2_agent_connect.3
|
||||
+ libssh2_agent_disconnect.3
|
||||
+ libssh2_agent_free.3
|
||||
+ libssh2_agent_get_identity.3
|
||||
+ libssh2_agent_init.3
|
||||
+ libssh2_agent_list_identities.3
|
||||
+ libssh2_agent_userauth.3
|
||||
+ libssh2_banner_set.3
|
||||
+ libssh2_base64_decode.3
|
||||
+ libssh2_channel_close.3
|
||||
+ libssh2_channel_direct_tcpip.3
|
||||
+ libssh2_channel_direct_tcpip_ex.3
|
||||
+ libssh2_channel_eof.3
|
||||
+ libssh2_channel_exec.3
|
||||
+ libssh2_channel_flush.3
|
||||
+ libssh2_channel_flush_ex.3
|
||||
+ libssh2_channel_flush_stderr.3
|
||||
+ libssh2_channel_forward_accept.3
|
||||
+ libssh2_channel_forward_cancel.3
|
||||
+ libssh2_channel_forward_listen.3
|
||||
+ libssh2_channel_forward_listen_ex.3
|
||||
+ libssh2_channel_free.3
|
||||
+ libssh2_channel_get_exit_signal.3
|
||||
+ libssh2_channel_get_exit_status.3
|
||||
+ libssh2_channel_handle_extended_data.3
|
||||
+ libssh2_channel_handle_extended_data2.3
|
||||
+ libssh2_channel_ignore_extended_data.3
|
||||
+ libssh2_channel_open_ex.3
|
||||
+ libssh2_channel_open_session.3
|
||||
+ libssh2_channel_process_startup.3
|
||||
+ libssh2_channel_read.3
|
||||
+ libssh2_channel_read_ex.3
|
||||
+ libssh2_channel_read_stderr.3
|
||||
+ libssh2_channel_receive_window_adjust.3
|
||||
+ libssh2_channel_receive_window_adjust2.3
|
||||
+ libssh2_channel_request_pty.3
|
||||
+ libssh2_channel_request_pty_ex.3
|
||||
+ libssh2_channel_request_pty_size.3
|
||||
+ libssh2_channel_request_pty_size_ex.3
|
||||
+ libssh2_channel_send_eof.3
|
||||
+ libssh2_channel_set_blocking.3
|
||||
+ libssh2_channel_setenv.3
|
||||
+ libssh2_channel_setenv_ex.3
|
||||
+ libssh2_channel_shell.3
|
||||
+ libssh2_channel_subsystem.3
|
||||
+ libssh2_channel_wait_closed.3
|
||||
+ libssh2_channel_wait_eof.3
|
||||
+ libssh2_channel_window_read.3
|
||||
+ libssh2_channel_window_read_ex.3
|
||||
+ libssh2_channel_window_write.3
|
||||
+ libssh2_channel_window_write_ex.3
|
||||
+ libssh2_channel_write.3
|
||||
+ libssh2_channel_write_ex.3
|
||||
+ libssh2_channel_write_stderr.3
|
||||
+ libssh2_channel_x11_req.3
|
||||
+ libssh2_channel_x11_req_ex.3
|
||||
+ libssh2_exit.3
|
||||
+ libssh2_free.3
|
||||
+ libssh2_hostkey_hash.3
|
||||
+ libssh2_init.3
|
||||
+ libssh2_keepalive_config.3
|
||||
+ libssh2_keepalive_send.3
|
||||
+ libssh2_knownhost_add.3
|
||||
+ libssh2_knownhost_addc.3
|
||||
+ libssh2_knownhost_check.3
|
||||
+ libssh2_knownhost_checkp.3
|
||||
+ libssh2_knownhost_del.3
|
||||
+ libssh2_knownhost_free.3
|
||||
+ libssh2_knownhost_get.3
|
||||
+ libssh2_knownhost_init.3
|
||||
+ libssh2_knownhost_readfile.3
|
||||
+ libssh2_knownhost_readline.3
|
||||
+ libssh2_knownhost_writefile.3
|
||||
+ libssh2_knownhost_writeline.3
|
||||
+ libssh2_poll.3
|
||||
+ libssh2_poll_channel_read.3
|
||||
+ libssh2_publickey_add.3
|
||||
+ libssh2_publickey_add_ex.3
|
||||
+ libssh2_publickey_init.3
|
||||
+ libssh2_publickey_list_fetch.3
|
||||
+ libssh2_publickey_list_free.3
|
||||
+ libssh2_publickey_remove.3
|
||||
+ libssh2_publickey_remove_ex.3
|
||||
+ libssh2_publickey_shutdown.3
|
||||
+ libssh2_scp_recv.3
|
||||
+ libssh2_scp_send.3
|
||||
+ libssh2_scp_send64.3
|
||||
+ libssh2_scp_send_ex.3
|
||||
+ libssh2_session_abstract.3
|
||||
+ libssh2_session_banner_get.3
|
||||
+ libssh2_session_banner_set.3
|
||||
+ libssh2_session_block_directions.3
|
||||
+ libssh2_session_callback_set.3
|
||||
+ libssh2_session_disconnect.3
|
||||
+ libssh2_session_disconnect_ex.3
|
||||
+ libssh2_session_flag.3
|
||||
+ libssh2_session_free.3
|
||||
+ libssh2_session_get_blocking.3
|
||||
+ libssh2_session_get_timeout.3
|
||||
+ libssh2_session_hostkey.3
|
||||
+ libssh2_session_init.3
|
||||
+ libssh2_session_init_ex.3
|
||||
+ libssh2_session_last_errno.3
|
||||
+ libssh2_session_last_error.3
|
||||
+ libssh2_session_method_pref.3
|
||||
+ libssh2_session_methods.3
|
||||
+ libssh2_session_set_blocking.3
|
||||
+ libssh2_session_set_timeout.3
|
||||
+ libssh2_session_startup.3
|
||||
+ libssh2_session_supported_algs.3
|
||||
+ libssh2_sftp_close.3
|
||||
+ libssh2_sftp_close_handle.3
|
||||
+ libssh2_sftp_closedir.3
|
||||
+ libssh2_sftp_fsetstat.3
|
||||
+ libssh2_sftp_fstat.3
|
||||
+ libssh2_sftp_fstat_ex.3
|
||||
+ libssh2_sftp_fstatvfs.3
|
||||
+ libssh2_sftp_fsync.3
|
||||
+ libssh2_sftp_get_channel.3
|
||||
+ libssh2_sftp_init.3
|
||||
+ libssh2_sftp_last_error.3
|
||||
+ libssh2_sftp_lstat.3
|
||||
+ libssh2_sftp_mkdir.3
|
||||
+ libssh2_sftp_mkdir_ex.3
|
||||
+ libssh2_sftp_open.3
|
||||
+ libssh2_sftp_open_ex.3
|
||||
+ libssh2_sftp_opendir.3
|
||||
+ libssh2_sftp_read.3
|
||||
+ libssh2_sftp_readdir.3
|
||||
+ libssh2_sftp_readdir_ex.3
|
||||
+ libssh2_sftp_readlink.3
|
||||
+ libssh2_sftp_realpath.3
|
||||
+ libssh2_sftp_rename.3
|
||||
+ libssh2_sftp_rename_ex.3
|
||||
+ libssh2_sftp_rewind.3
|
||||
+ libssh2_sftp_rmdir.3
|
||||
+ libssh2_sftp_rmdir_ex.3
|
||||
+ libssh2_sftp_seek.3
|
||||
+ libssh2_sftp_seek64.3
|
||||
+ libssh2_sftp_setstat.3
|
||||
+ libssh2_sftp_shutdown.3
|
||||
+ libssh2_sftp_stat.3
|
||||
+ libssh2_sftp_stat_ex.3
|
||||
+ libssh2_sftp_statvfs.3
|
||||
+ libssh2_sftp_symlink.3
|
||||
+ libssh2_sftp_symlink_ex.3
|
||||
+ libssh2_sftp_tell.3
|
||||
+ libssh2_sftp_tell64.3
|
||||
+ libssh2_sftp_unlink.3
|
||||
+ libssh2_sftp_unlink_ex.3
|
||||
+ libssh2_sftp_write.3
|
||||
+ libssh2_trace.3
|
||||
+ libssh2_trace_sethandler.3
|
||||
+ libssh2_userauth_authenticated.3
|
||||
+ libssh2_userauth_hostbased_fromfile.3
|
||||
+ libssh2_userauth_hostbased_fromfile_ex.3
|
||||
+ libssh2_userauth_keyboard_interactive.3
|
||||
+ libssh2_userauth_keyboard_interactive_ex.3
|
||||
+ libssh2_userauth_list.3
|
||||
+ libssh2_userauth_password.3
|
||||
+ libssh2_userauth_password_ex.3
|
||||
+ libssh2_userauth_publickey.3
|
||||
+ libssh2_userauth_publickey_fromfile.3
|
||||
+ libssh2_userauth_publickey_fromfile_ex.3
|
||||
+ libssh2_version.3)
|
||||
+
|
||||
+install(FILES ${MAN_PAGES} DESTINATION share/man/man3)
|
||||
--
|
||||
2.1.0
|
||||
|
||||
|
|
|
|||
|
|
@ -154,12 +154,6 @@ mv -v example example.%{_arch}
|
|||
# TODO make CMake take care of this
|
||||
install -D -m0644 -p %{SOURCE1} %{buildroot}%{_libdir}/pkgconfig/libssh2.pc
|
||||
|
||||
# TODO install man pages with CMake
|
||||
install -D -m0755 -d %{buildroot}%{_mandir}/man3/
|
||||
printf 'install:
|
||||
\tinstall -m0644 -p $(dist_man_MANS) $(MANDIR)\n' >> docs/Makefile.am
|
||||
cd docs && make -f Makefile.am install MANDIR=%{buildroot}%{_mandir}/man3/
|
||||
|
||||
# remove redundant files installed by CMake
|
||||
rm -rf %{buildroot}/usr/{lib/cmake,share/libssh2}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue