Author: mmazur Date: Tue Jul 6 14:05:39 2010 GMT Module: packages Tag: HEAD ---- Log message: - rel 2; stbr - added patch from trunk which removes irritating unsubscribe msgs
---- Files affected: packages/jggtrans: jggtrans.spec (1.72 -> 1.73) , diff-trunk_src-from-r714-to-r716.diff (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/jggtrans/jggtrans.spec diff -u packages/jggtrans/jggtrans.spec:1.72 packages/jggtrans/jggtrans.spec:1.73 --- packages/jggtrans/jggtrans.spec:1.72 Sun Jun 13 12:28:24 2010 +++ packages/jggtrans/jggtrans.spec Tue Jul 6 16:05:33 2010 @@ -4,7 +4,7 @@ Summary(pl.UTF-8): ModuĊ transportowy GaduGadu dla systemu Jabber Name: jggtrans Version: 2.2.4 -Release: 1 +Release: 2 License: GPL Group: Applications/Communications Source0: http://jggtrans.jajcus.net/downloads/jggtrans-%{version}.tar.gz @@ -13,6 +13,7 @@ Source2: jggtrans.sysconfig Patch0: %{name}-pidfile.patch Patch1: %{name}-spooldir.patch +Patch2: diff-trunk_src-from-r714-to-r716.diff URL: http://jggtrans.jajcus.net/ BuildRequires: autoconf BuildRequires: automake @@ -42,6 +43,7 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build %{__gettextize} @@ -109,6 +111,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.73 2010/07/06 14:05:33 mmazur +- rel 2; stbr +- added patch from trunk which removes irritating unsubscribe msgs + Revision 1.72 2010/06/13 10:28:24 mmazur - added libtoolize to build process ================================================================ Index: packages/jggtrans/diff-trunk_src-from-r714-to-r716.diff diff -u /dev/null packages/jggtrans/diff-trunk_src-from-r714-to-r716.diff:1.1 --- /dev/null Tue Jul 6 16:05:39 2010 +++ packages/jggtrans/diff-trunk_src-from-r714-to-r716.diff Tue Jul 6 16:05:33 2010 @@ -0,0 +1,28 @@ +Index: trunk/src/presence.c +=================================================================== +--- trunk/src/presence.c (revision 714) ++++ trunk/src/presence.c (revision 716) +@@ -428,6 +428,12 @@ + return 0; + } +- else presence_send_unsubscribed(stream,NULL,from); +- return -1; ++ else if (user_get_by_jid(from)) { ++ presence_send(stream, to, from, 0, ++ NULL, "Not logged in", 0); ++ } ++ else { ++ presence_send_unsubscribed(stream, NULL, from); ++ } ++ return 0; + } + +@@ -447,5 +453,7 @@ + uin=jid_get_uin(to); + +- c=user_get_contact(u,uin,FALSE); ++ /* create the contact: if we got 'prope' the user has it on his ++ * contact list, do not change that */ ++ c = user_get_contact(u, uin, TRUE); + if (!c) { + return -1; ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/jggtrans/jggtrans.spec?r1=1.72&r2=1.73&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
