diff --git a/backends/libcommuni/ircnetworkplugin.h b/backends/libcommuni/ircnetworkplugin.h index d4a84d73..12ae0ba3 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 eda08a8d..134a1de4 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 08951794..f4a1dc23 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 639e696c..870e09e0 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 8a906b25..dc2cbdfe 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 21d32503..5df943d8 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 9b17e832..ddc1a2af 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 1acf4403..8cefedbe 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 d38917d9..563d0e93 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 80e61b6b..f716ddcd 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 00000000..d6e66659 --- /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 57be3e97..269fd28c 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 adb988d2..ad8c6a1a 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 34ac270b..4ee5209f 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 9bfa96a9..8f77bea8 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 a3109222..12f93f1e 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 bca4cae8..0bf033cb 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 +}