libtransport.git Changeset - be5a77cb7134

Changeset - be5a77cb7134

Parent rev.

Child rev.

[Not reviewed]

Merge

0 17 1

HanzZ - 13 years ago 2012-12-04 16:37:52
hanzz.k@gmail.com

Merge branch 'master' of github.com:hanzz/libtransport

3 files changed with 38 insertions and 28 deletions:

backends/libcommuni/session.cpp

packaging/fedora/build_rpm.sh

packaging/fedora/spectrum2.spec

0 comments (0 inline, 0 general)

backends/libcommuni/session.cpp

➞

Show inline comments

 				nick = nick.substr(0, nick.find("/"));
+			}
 			np->handleSubject(user, TO_UTF8(m->parameters().value(1)) + suffix, m_topicData, nick);
 			break;
 		case 352:
 			if (m->parameters().value(6).toUpper().startsWith("G")) {
 				channel = m->parameters().value(1);
 				nick = TO_UTF8(m->parameters().value(5));
 				np->handleParticipantChanged(user, nick, TO_UTF8(channel) + suffix, m_modes[TO_UTF8(channel) + nick], pbnetwork::STATUS_AWAY);
+			}
 			break;
 		case 353:
 			channel = m->parameters().value(2);
 			members = m->parameters().value(3).split(" ");
 			LOG4CXX_INFO(logger, user << ": Received members for " << TO_UTF8(channel) << suffix);
 			for (int i = 0; i < members.size(); i++) {
 				bool flags = 0;
 				std::string nickname = TO_UTF8(members.at(i));
 				flags = correctNickname(nickname);
 				m_modes[TO_UTF8(channel) + nickname] = flags;
 				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:
 			np->handleDisconnected(user, pbnetwork::CONNECTION_ERROR_INVALID_USERNAME, "Erroneous Nickname");
 			break;
 		case 321:
 			m_rooms.clear();
 			m_names.clear();
 			break;
 		case 322:
 			m_rooms.push_back(TO_UTF8(m->parameters().value(1)));
 			m_names.push_back(TO_UTF8(m->parameters().value(1)));
 			break;
 		case 323:
 			np->handleRoomList("", m_rooms, m_names);
 			break;
 		default:
 			break;
+	}
 	//qDebug() << "numeric message received:" << receiver() << origin << code << params;
+}
 void MyIrcSession::onMessageReceived(IrcMessage *message) {

packaging/fedora/build_rpm.sh

➞

Show inline comments

@@ new file 100755 @@
 #!/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

packaging/fedora/spectrum2.spec

➞

Show inline comments

 %global groupname spectrum
 %global username spectrum
 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
 %build
 %cmake . -DCMAKE_BUILD_TYPE=Debug
 make VERBOSE=1 %{?_smp_mflags}
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 install -d %{buildroot}%{_localstatedir}/{lib,run,log}/spectrum2
 install -p -D -m 755 packaging/fedora/spectrum2.init \
     %{buildroot}%{_initddir}/spectrum2
 ln -s /usr/bin/spectrum2_libpurple_backend %{buildroot}/usr/bin/spectrum_libpurple_backend
 %pre
 getent group %{groupname} >/dev/null || groupadd -r %{groupname}
 getent passwd %{username} >/dev/null || \
     useradd -r -g %{groupname} -d %{_localstatedir}/lib/spectrum \
         -s /sbin/nologin \
         -c "spectrum XMPP transport" %{username}
 exit 0
@@ @@ -179,49 +169,49 @@ Spectrum2 libyahoo2 backend @@
 # Requires:   libpurple
+#
 # %description libircclient-qt-backend
 # Spectrum2 libircclient-qt backend
+#
 # %files libircclient-qt-backend
 # %defattr(-, root, root,-)
 # /usr/bin/spectrum_libircclient-qt_backend
 %package -n libtransport
 Summary:    Libtransport
 Group:      Development/Libraries
 Requires:   boost
 %description -n libtransport
 Libtransport library
 %files -n libtransport
 %defattr(-, root, root,-)
 %{_libdir}/libtransport*.so*
 /usr/include/transport
 %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
 - rebuild for new boost
 * Wed May 25 2011 Jan Kaluza <jkaluza@redhat.com> - 1.0-3
 - fix #706719 - fixed another crash during login
 * Tue Apr 26 2011 Jan Kaluza <jkaluza@redhat.com> - 1.0-2
 - fix #697832 - fixed crash during login
 * Tue Apr 19 2011 Jan Kaluza <jkaluza@redhat.com> - 1.0-1
 - update to new upstream version 1.0
 * Wed Apr 06 2011 Jan Kaluza <jkaluza@redhat.com> - 1.0-0.11.beta9
 - rebuild for new boost
 * Tue Mar 15 2011 Jan Kaluza <jkaluza@redhat.com> - 1.0-0.10.beta9
 - update to new upstream version 1.0-beta9
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-0.9.beta8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 * Sun Feb 06 2011 Thomas Spura <tomspur@fedoraproject.org> - 1.0-0.8.beta8

0 comments (0 inline, 0 general)