diff --git a/backends/libcommuni/ircnetworkplugin.h b/backends/libcommuni/ircnetworkplugin.h index d4a84d730906c96b65d4da5b51d366fdd5e96ae3..12ae0ba39187de3c4c2df7efab923661786dfcee 100644 --- a/backends/libcommuni/ircnetworkplugin.h +++ b/backends/libcommuni/ircnetworkplugin.h @@ -47,4 +47,4 @@ class IRCNetworkPlugin : public QObject, public NetworkPlugin { int m_currentServer; std::string m_identify; bool m_firstPing; -}; \ No newline at end of file +}; diff --git a/backends/libcommuni/session.cpp b/backends/libcommuni/session.cpp index eda08a8d1e97f6dcf143ce41ae6b0506524ac9cb..134a1de4431e1cfe95b2caf7e7339064872f5553 100644 --- a/backends/libcommuni/session.cpp +++ b/backends/libcommuni/session.cpp @@ -230,7 +230,11 @@ void MyIrcSession::on_numericMessageReceived(IrcMessage *message) { np->handleParticipantChanged(user, nickname, TO_UTF8(channel) + suffix,(int) flags, pbnetwork::STATUS_ONLINE); } + break; + case 366: // ask /who to get away states + channel = m->parameters().value(1); + LOG4CXX_INFO(logger, user << "Asking /who for channel " << TO_UTF8(channel)); sendCommand(IrcCommand::createWho(channel)); break; case 432: diff --git a/backends/twitter/libtwitcurl/base64.cpp b/backends/twitter/libtwitcurl/base64.cpp index 089517940cb90c4b1f0a1af656f58029563846cc..f4a1dc232aec39576fe8dee6f4ef4bcd9fd735e2 100644 --- a/backends/twitter/libtwitcurl/base64.cpp +++ b/backends/twitter/libtwitcurl/base64.cpp @@ -120,4 +120,4 @@ std::string base64_decode(std::string const& encoded_string) { } return ret; -} \ No newline at end of file +} diff --git a/backends/twitter/libtwitcurl/base64.h b/backends/twitter/libtwitcurl/base64.h index 639e696c52d0cfd090acc44bf14bd56f8e3265fc..870e09e04a4826ba71960e2e8951eb601080a5b4 100644 --- a/backends/twitter/libtwitcurl/base64.h +++ b/backends/twitter/libtwitcurl/base64.h @@ -1,4 +1,4 @@ #include std::string base64_encode(unsigned char const* , unsigned int len); -std::string base64_decode(std::string const& s); \ No newline at end of file +std::string base64_decode(std::string const& s); diff --git a/backends/twitter/libtwitcurl/urlencode.cpp b/backends/twitter/libtwitcurl/urlencode.cpp index 8a906b25ac4e0de06f3ad8150b6bfaf4f28c4302..dc2cbdfea4e497b6b39a79b4d618309e4206e9d0 100644 --- a/backends/twitter/libtwitcurl/urlencode.cpp +++ b/backends/twitter/libtwitcurl/urlencode.cpp @@ -37,4 +37,4 @@ std::string urlencode( const std::string &c ) } } return escaped; -} \ No newline at end of file +} diff --git a/backends/twitter/libtwitcurl/urlencode.h b/backends/twitter/libtwitcurl/urlencode.h index 21d325031cd830828616203ddaa45ad383a40c3d..5df943d8fae5a6231aff449413f1da84c430a312 100644 --- a/backends/twitter/libtwitcurl/urlencode.h +++ b/backends/twitter/libtwitcurl/urlencode.h @@ -7,4 +7,4 @@ std::string char2hex( char dec ); std::string urlencode( const std::string &c ); -#endif // __URLENCODE_H__ \ No newline at end of file +#endif // __URLENCODE_H__ diff --git a/include/transport/discoitemsresponder.h b/include/transport/discoitemsresponder.h index 9b17e8324af104c43e7fa7eaebacb021a8cedc92..ddc1a2af0c6f5fef0576d5bdb795f8a8173f9aa2 100644 --- a/include/transport/discoitemsresponder.h +++ b/include/transport/discoitemsresponder.h @@ -54,4 +54,4 @@ class DiscoItemsResponder : public Swift::GetResponder { DiscoInfoResponder *m_discoInfoResponder; }; -} \ No newline at end of file +} diff --git a/include/transport/gatewayresponder.h b/include/transport/gatewayresponder.h index 1acf4403c9a7c551bc3db26654f7a7a23cfe9154..8cefedbed52d1fc81ba3659db7f4e80436d864df 100644 --- a/include/transport/gatewayresponder.h +++ b/include/transport/gatewayresponder.h @@ -40,4 +40,4 @@ class GatewayResponder : public Swift::Responder { UserManager *m_userManager; }; -} \ No newline at end of file +} diff --git a/include/transport/memoryusage.h b/include/transport/memoryusage.h index d38917d96638ffde8d30217eb68ef37bc4706fa0..563d0e93a25e571749ac10e5ed512ea7d336f9e4 100644 --- a/include/transport/memoryusage.h +++ b/include/transport/memoryusage.h @@ -32,4 +32,4 @@ namespace Transport { void process_mem_usage(double& shared, double& resident_set, pid_t pid = 0); #endif -} \ No newline at end of file +} diff --git a/include/transport/rosterresponder.h b/include/transport/rosterresponder.h index 80e61b6bc0d4e508cee2ad815249c73dccb0cd28..f716ddcdbd51756689fdffdc23e7a87ebe6c679f 100644 --- a/include/transport/rosterresponder.h +++ b/include/transport/rosterresponder.h @@ -47,4 +47,4 @@ class RosterResponder : public Swift::Responder { UserManager *m_userManager; }; -} \ No newline at end of file +} diff --git a/packaging/fedora/build_rpm.sh b/packaging/fedora/build_rpm.sh new file mode 100755 index 0000000000000000000000000000000000000000..d6e666595632ad1fbe8239a78b6b1fde202777cf --- /dev/null +++ b/packaging/fedora/build_rpm.sh @@ -0,0 +1,16 @@ +#!/bin/sh +DIRNAME=spectrum2 + +echo "Cleaning up old sources ..." +rm -rf spectrum2-* + +echo "Checking out a fresh copy ..." +rm -rf $DIRNAME +git clone ../../.git $DIRNAME +rm -rf $DIRNAME/.git + +echo "Creating tarball ..." +tar czf $DIRNAME.tar.gz $DIRNAME + +echo "Building package" +rpmbuild -ta $DIRNAME.tar.gz diff --git a/packaging/fedora/spectrum2.spec b/packaging/fedora/spectrum2.spec index 57be3e97cc61ca6b51b9ee1ccdf94b10dd9bb16d..269fd28c7116ae14ab5f4f96c41905107f3cd2eb 100644 --- a/packaging/fedora/spectrum2.spec +++ b/packaging/fedora/spectrum2.spec @@ -4,42 +4,32 @@ Summary: XMPP transport Name: spectrum2 Version: 2.0 -Release: %{?_release}%{!?_release:1}%{?dist} +Release: 1%{?dist} Group: Applications/Internet License: GPLv3 Source0: spectrum2.tar.gz URL: http://swift.im/ -# BuildRequires: cmake -# BuildRequires: boost-devel -# BuildRequires: mysql-devel -# BuildRequires: cppunit-devel -# BuildRequires: libsqlite3x-devel -# BuildRequires: protobuf-devel -# BuildRequires: protobuf-compiler -# BuildRequires: popt-devel -# BuildRequires: libidn-devel -# BuildRequires: expat-devel -# BuildRequires: avahi-devel -# BuildRequires: log4cxx-devel -Requires: boost -Requires: mysql-libs -%if 0%{?rhel} -Requires: sqlite +BuildRequires: cmake +BuildRequires: boost-devel +BuildRequires: mysql-devel +BuildRequires: cppunit-devel +%if 0%{?rhel} > 0 && 0%{?rhel} <= 6 +BuildRequires: sqlite-devel %else -Requires: libsqlite3x +BuildRequires: libsqlite3x-devel %endif -Requires: protobuf -Requires: popt -Requires: libidn -Requires: expat -Requires: avahi -Requires: log4cxx -#---- +BuildRequires: protobuf-devel +BuildRequires: protobuf-compiler +BuildRequires: popt-devel +BuildRequires: libidn-devel +BuildRequires: expat-devel +BuildRequires: avahi-devel +BuildRequires: log4cxx-devel +BuildRequires: swiften-devel Requires: libtransport%{?_isa} = %{version}-%{release} -Requires: swiften %description -Spectrum 2.0 +Spectrum 2 is an XMPP transport/gateway and also simple XMPP server. %prep %setup -q -n spectrum2 @@ -200,7 +190,7 @@ Libtransport library %changelog -* Nov 30 2012 Jan Kaluza - 2.0 +* Mon Dec 03 2012 Jan Kaluza - 2.0-1 - Work in progress * Mon Jul 25 2011 Jan Kaluza - 1.0-4 diff --git a/spectrum/src/win32/ServiceWrapper.cpp b/spectrum/src/win32/ServiceWrapper.cpp index adb988d2f3741c9533a77907e86ea3b154ac73ab..ad8c6a1a2830aff439a4870760d999ec5d4a4aba 100644 --- a/spectrum/src/win32/ServiceWrapper.cpp +++ b/spectrum/src/win32/ServiceWrapper.cpp @@ -117,4 +117,4 @@ void ServiceWrapper::RunService() { }; StartServiceCtrlDispatcherA(serviceTable); -} \ No newline at end of file +} diff --git a/spectrum_manager/src/methods.h b/spectrum_manager/src/methods.h index 34ac270b8951df52b4258c512ce4068318323c6a..4ee5209f48b9b9a520c0850551be36b1525b07f4 100644 --- a/spectrum_manager/src/methods.h +++ b/spectrum_manager/src/methods.h @@ -53,4 +53,4 @@ void ask_local_server(ManagerConfig *config, Swift::BoostNetworkFactories &netwo std::vector show_list(ManagerConfig *config, bool show = true); -std::string get_response(); \ No newline at end of file +std::string get_response(); diff --git a/src/blockresponder.h b/src/blockresponder.h index 9bfa96a9d761d9a109615395121e91932dbda906..8f77bea83567d0991ef255ff77757e7f42b22f3e 100644 --- a/src/blockresponder.h +++ b/src/blockresponder.h @@ -43,4 +43,4 @@ class BlockResponder : public Swift::SetResponder { UserManager *m_userManager; }; -} \ No newline at end of file +} diff --git a/src/discoinforesponder.h b/src/discoinforesponder.h index a3109222d2c9d38b5aa7bdd13131358c73a77616..12f93f1ea713ff14a5086e29dfcab0a854f881f8 100644 --- a/src/discoinforesponder.h +++ b/src/discoinforesponder.h @@ -60,4 +60,4 @@ class DiscoInfoResponder : public Swift::GetResponder { std::map m_commands; }; -} \ No newline at end of file +} diff --git a/src/storageresponder.h b/src/storageresponder.h index bca4cae832663b78032d15c7ca98e129112f5c09..0bf033cb1d8f7a40892e6c1789b330cf0b6b867a 100644 --- a/src/storageresponder.h +++ b/src/storageresponder.h @@ -42,4 +42,4 @@ class StorageResponder : public Swift::Responder { UserManager *m_userManager; }; -} \ No newline at end of file +}