diff --git a/docs/guide/CMakeLists.txt b/docs/guide/CMakeLists.txt index adf20b1f4a32391b1572e82c45fff19fa81b221e..2159790c26dfdbdfbf662f904f4e56992c00dcaa 100644 --- a/docs/guide/CMakeLists.txt +++ b/docs/guide/CMakeLists.txt @@ -24,9 +24,6 @@ ADD_TEXTILE("about.textile" "Spectrum 2 - What is Spectrum 2?") ADD_TEXTILE("configure_xmpp_server.textile" "Spectrum 2 - Configure XMPP server") ADD_TEXTILE("tutorial_gateway_mode.textile" "Spectrum 2 - Spectrum 2 in gateway mode") ADD_TEXTILE("config_file.textile" "Spectrum 2 - Config File") -ADD_TEXTILE("from_source_code.textile" "Spectrum 2 - Installing from source code") -ADD_TEXTILE("debian_ubuntu.textile" "Spectrum 2 - Debian/Ubuntu packages") -ADD_TEXTILE("fedora_rhel.textile" "Spectrum 2 - Fedora/RHEL/CentOS packages") ADD_TEXTILE("server_ssl.textile" "Spectrum 2 - Server mode SSL support") ADD_TEXTILE("mysql.textile" "Spectrum 2 - MySQL Support") ADD_TEXTILE("postgresql.textile" "Spectrum 2 - PostgreSQL Support") @@ -35,7 +32,6 @@ ADD_TEXTILE("backends.textile" "Spectrum 2 - Backends overview") ADD_TEXTILE("libpurple.textile" "Spectrum 2 - Libpurple backend") ADD_TEXTILE("libcommuni.textile" "Spectrum 2 - Libcommuni backend") ADD_TEXTILE("swiften.textile" "Spectrum 2 - Swiften backend") -ADD_TEXTILE("skype.textile" "Spectrum 2 - Skype backend") ADD_TEXTILE("spectrum2_manager.textile" "Spectrum 2 - spectrum2_manager tool") ADD_TEXTILE("twitter.textile" "Spectrum 2 - Twitter backend") ADD_TEXTILE("getting_backtrace.textile" "Spectrum 2 - Getting a backtrace") diff --git a/docs/guide/debian_ubuntu.textile b/docs/guide/debian_ubuntu.textile deleted file mode 100644 index d034dec0ae2fff00836aee8bc5eae4a422881b26..0000000000000000000000000000000000000000 --- a/docs/guide/debian_ubuntu.textile +++ /dev/null @@ -1,39 +0,0 @@ -We have APT repositories for Debian and Ubuntu that make it very easy to install Spectrum 2. - -To use the repositories, just add the following lines to @/etc/apt/sources.list@: - -
-deb http://packages.spectrum.im- -wherespectrum2 -
- wget -O - http://packages.spectrum.im/keys/apt-repository@fsinf.at | apt-key add - -- -You can simply update the repositories and install the fsinf-keyring packages: - -
- apt-get update - apt-get install fsinf-keyring - apt-get update -- -Don’t worry about the warnings that the packages can’t be identified, they will be gone after you installed the fsinf-keyring package. - -h2. Install spectrum2 - development version - -After you have done that, simply do: - -
-apt-get install spectrum2 spectrum2-backend-libpurple -- -Note that these repositories pull in quite a few dependencies, depending on the distribution you use. diff --git a/docs/guide/fedora_rhel.textile b/docs/guide/fedora_rhel.textile deleted file mode 100644 index d3f2d9c73c4b13b4203c90a7eaa03eda2b6daf44..0000000000000000000000000000000000000000 --- a/docs/guide/fedora_rhel.textile +++ /dev/null @@ -1,22 +0,0 @@ -There are nightbuilds for Fedora, CentOS-6 or RHEL6 distributions. - -h2. Fedora - - -1. Save "fedora-spectrum2.repo":http://repos.fedorapeople.org/repos/jkaluza/spectrum2/fedora-spectrum2.repo file into /etc/yum.repos.d/ - -2. Install spectrum2 and spectrum2-libpurple-backend - -
-yum install spectrum2 spectrum2-libpurple-backend -- -h2. RHEL/CentOS - -1. Save "epel-spectrum2.repo":http://repos.fedorapeople.org/repos/jkaluza/spectrum2/epel-spectrum2.repo file into /etc/yum.repos.d/ - -2. Install spectrum2 and spectrum2-libpurple-backend - -
-yum install spectrum2 spectrum2-libpurple-backend -diff --git a/docs/guide/from_source_code.textile b/docs/guide/from_source_code.textile deleted file mode 100644 index c7ea1d4fcca317d2a5dc727a56bc450345c26e53..0000000000000000000000000000000000000000 --- a/docs/guide/from_source_code.textile +++ /dev/null @@ -1,96 +0,0 @@ -h2. Install Boost and libidn - -You have to have boost-devel and libidn-devel installed before compiling Swiften, otherwise it will compile against bundled version of Boost and libidn and Spectrum compilation will fail. - -h2. Install Swiften from git repository: - -
-git clone git://swift.im/swift -cd swift -git checkout swift-3.0 -./scons V=1 swiften_dll=1 Swiften SWIFTEN_INSTALLDIR=/usr/local force-configure=1 -sudo ./scons V=1 swiften_dll=1 Swiften SWIFTEN_INSTALLDIR=/usr/local /usr/local -- -*Note* - If the output of "./scons" command contains following during the configure stage, you don't have boost-devel or libidn-devel installed during the compilation and *Swiften won't work properly*: -
-Checking for C++ header file boost/signals.hpp... no -.... -Checking for C library idn... no -- -The proper configure script output looks like this: -
-scons: Reading SConscript files ... -Checking whether the C++ compiler worksyes -Checking whether the C compiler worksyes -Checking for C library z... yes -Checking for C library resolv... yes -Checking for C library pthread... yes -Checking for C library dl... yes -Checking for C library m... yes -Checking for C library c... yes -Checking for C library stdc++... yes -Checking for C++ header file boost/signals.hpp... yes -Checking for C library boost_signals... yes -Checking for C++ header file boost/thread.hpp... yes -Checking for C library boost_thread... no -Checking for C library boost_thread-mt... yes -Checking for C++ header file boost/regex.hpp... yes -Checking for C library boost_regex... yes -Checking for C++ header file boost/program_options.hpp... yes -Checking for C library boost_program_options... yes -Checking for C++ header file boost/filesystem.hpp... yes -Checking for C library boost_filesystem... yes -Checking for C++ header file boost/system/system_error.hpp... yes -Checking for C library boost_system... yes -Checking for C++ header file boost/date_time/date.hpp... yes -Checking for C library boost_date_time... yes -Checking for C++ header file boost/uuid/uuid.hpp... yes -Checking for C function XScreenSaverQueryExtension()... yes -Checking for package gconf-2.0... yes -Checking for C header file gconf/gconf-client.h... yes -Checking for C library gconf-2... yes -Checking for C header file libxml/parser.h... no -Checking for C header file libxml/parser.h... yes -Checking for C library xml2... yes -Checking for C header file idna.h... yes -Checking for C library idn... yes -Checking for C header file readline/readline.h... yes -Checking for C library readline... yes -Checking for C header file avahi-client/client.h... yes -Checking for C library avahi-client... yes -Checking for C library avahi-common... yes -Checking for C header file openssl/ssl.h... yes -- -Note that you have to have at least Python 2.5 to build Swiften. - -h2. Install Google protobuf - -In Fedora, you just have to install following packages: - -
-sudo yum install protobuf protobuf protobuf-devel -- -h2. Install Libpurple for libpurple backend - -You should definitely have latest libpurple, so download Pidgin and compile it, because your distribution probably doesn't have the latest one. - -h2. Install libCommuni for libCommuni IRC backend - -The instructions are defined on "libCommuni wiki":https://github.com/communi/communi/wiki. - -h2. Install Spectrum 2 - -
-git clone git://github.com/hanzz/libtransport.git -cd libtransport -cmake . -DCMAKE_BUILD_TYPE=Debug -make -- -Before running make, check cmake output if the supported features are OK for you. If not, install libraries needed by Spectrum to provide specific feature. - -You can also install spectrum using "sudo make install" diff --git a/docs/guide/skype.textile b/docs/guide/skype.textile deleted file mode 100644 index 2d6591467124e9accb5d80a0155646be54d4619d..0000000000000000000000000000000000000000 --- a/docs/guide/skype.textile +++ /dev/null @@ -1,17 +0,0 @@ -h2. Description - -Skype is supported by Spectrum 2, but in quite specific way. It's not possible to connect the Skype network without official Skype client running. Therefore you have to have official Skype client installed. Official Skype client is then run for every connected user and Spectrum 2 communicate with it using the DBus interface. One Skype client instance needs approximately 50MB of RAM, therefore Skype transport needs lot of memory (50MB per user). - -h2. Configuration - -You have to have: -* Official Skype client installed in Linux PATH -* DBus installed and have running DBus daemon -* xvfb-run tool installed - -If you have those depencencies ready, you just have to set the proper backend configuration variable: - -
-[service] -backend=/usr/bin/xvfb-run -n BACKEND_ID -s "-screen 0 10x10x8" -f /tmp/x-skype-gw /usr/bin/spectrum2_skype_backend -