Merge branch 'master' of github.com:hanzz/libtransport
This commit is contained in:
commit
be5a77cb71
17 changed files with 52 additions and 42 deletions
|
@ -47,4 +47,4 @@ class IRCNetworkPlugin : public QObject, public NetworkPlugin {
|
|||
int m_currentServer;
|
||||
std::string m_identify;
|
||||
bool m_firstPing;
|
||||
};
|
||||
};
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -120,4 +120,4 @@ std::string base64_decode(std::string const& encoded_string) {
|
|||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#include <string>
|
||||
|
||||
std::string base64_encode(unsigned char const* , unsigned int len);
|
||||
std::string base64_decode(std::string const& s);
|
||||
std::string base64_decode(std::string const& s);
|
||||
|
|
|
@ -37,4 +37,4 @@ std::string urlencode( const std::string &c )
|
|||
}
|
||||
}
|
||||
return escaped;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -7,4 +7,4 @@
|
|||
std::string char2hex( char dec );
|
||||
std::string urlencode( const std::string &c );
|
||||
|
||||
#endif // __URLENCODE_H__
|
||||
#endif // __URLENCODE_H__
|
||||
|
|
|
@ -54,4 +54,4 @@ class DiscoItemsResponder : public Swift::GetResponder<Swift::DiscoItems> {
|
|||
DiscoInfoResponder *m_discoInfoResponder;
|
||||
};
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
@ -40,4 +40,4 @@ class GatewayResponder : public Swift::Responder<Swift::GatewayPayload> {
|
|||
UserManager *m_userManager;
|
||||
};
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
@ -32,4 +32,4 @@ namespace Transport {
|
|||
void process_mem_usage(double& shared, double& resident_set, pid_t pid = 0);
|
||||
#endif
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
@ -47,4 +47,4 @@ class RosterResponder : public Swift::Responder<Swift::RosterPayload> {
|
|||
UserManager *m_userManager;
|
||||
};
|
||||
|
||||
}
|
||||
}
|
||||
|
|
16
packaging/fedora/build_rpm.sh
Executable file
16
packaging/fedora/build_rpm.sh
Executable file
|
@ -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
|
|
@ -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 <jkaluza@redhat.com> - 2.0
|
||||
* Mon Dec 03 2012 Jan Kaluza <jkaluza@redhat.com> - 2.0-1
|
||||
- Work in progress
|
||||
|
||||
* Mon Jul 25 2011 Jan Kaluza <jkaluza@redhat.com> - 1.0-4
|
||||
|
|
|
@ -117,4 +117,4 @@ void ServiceWrapper::RunService() {
|
|||
};
|
||||
|
||||
StartServiceCtrlDispatcherA(serviceTable);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -53,4 +53,4 @@ void ask_local_server(ManagerConfig *config, Swift::BoostNetworkFactories &netwo
|
|||
|
||||
std::vector<std::string> show_list(ManagerConfig *config, bool show = true);
|
||||
|
||||
std::string get_response();
|
||||
std::string get_response();
|
||||
|
|
|
@ -43,4 +43,4 @@ class BlockResponder : public Swift::SetResponder<Transport::BlockPayload> {
|
|||
UserManager *m_userManager;
|
||||
};
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
@ -60,4 +60,4 @@ class DiscoInfoResponder : public Swift::GetResponder<Swift::DiscoInfo> {
|
|||
std::map<std::string, std::string> m_commands;
|
||||
};
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
@ -42,4 +42,4 @@ class StorageResponder : public Swift::Responder<Swift::PrivateStorage> {
|
|||
UserManager *m_userManager;
|
||||
};
|
||||
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue