Date: Monday, November 11, 2013 @ 13:05:26 Author: spupykin Revision: 100817
upgpkg: ejabberd-mod_archive 20131111-1 upd Modified: ejabberd-mod_archive-svn/trunk/PKGBUILD Deleted: ejabberd-mod_archive-svn/trunk/types-fix.patch -----------------+ PKGBUILD | 15 ++++++--------- types-fix.patch | 33 --------------------------------- 2 files changed, 6 insertions(+), 42 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-11-11 11:52:05 UTC (rev 100816) +++ PKGBUILD 2013-11-11 12:05:26 UTC (rev 100817) @@ -2,8 +2,8 @@ # Maintainer: Sergej Pupykin <[email protected]> # Contributor: Sergej Pupykin <[email protected]> -pkgname=ejabberd-mod_archive-svn -pkgver=1137 +pkgname=ejabberd-mod_archive +pkgver=20131111 pkgrel=1 pkgdesc="ejabberd message archive module" arch=(any) @@ -12,20 +12,17 @@ depends=('ejabberd') makedepends=('subversion') options=() -source=("ejabberd-modules.svn::svn+https://svn.process-one.net/ejabberd-modules"; - "types-fix.patch") -md5sums=('SKIP' - '2fed1281e5ad78b20b753c705d3ec314') +source=("git://github.com/processone/ejabberd-contrib.git") +md5sums=('SKIP') build() { - cd $srcdir/ejabberd-modules.svn/mod_archive/trunk - patch -p0 <$srcdir/types-fix.patch + cd $srcdir/ejabberd-contrib/mod_archive ./build.sh rm -rf ebin/.svn } package() { - cd $srcdir/ejabberd-modules.svn/mod_archive/trunk + cd $srcdir/ejabberd-contrib/mod_archive install -d -m 0755 $pkgdir/usr/lib/ejabberd cp -r ebin $pkgdir/usr/lib/ejabberd/ebin install -d -m0755 $pkgdir/usr/share/ejabberd-mod_archive Deleted: types-fix.patch =================================================================== --- types-fix.patch 2013-11-11 11:52:05 UTC (rev 100816) +++ types-fix.patch 2013-11-11 12:05:26 UTC (rev 100817) @@ -1,33 +0,0 @@ -Index: src/mod_archive_webview.erl -=================================================================== ---- src/mod_archive_webview.erl (revision 1109) -+++ src/mod_archive_webview.erl (working copy) -@@ -102,7 +102,7 @@ - make_xhtml(?T("Chat with ") ++ Jid, contact_config(Jid,US,Lang) ++ - [?XE("ul", lists:map( fun({Id, Node, Server, Resource, Utc, Subject }) -> - With = jlib:jid_to_string({Node,Server,Resource}), -- ?LI([?AC(?LINK("show/" ++ integer_to_list(Id)), "On " ++ Utc ++ " with " ++ With ++ " -> " ++ escape_str(Subject) )] ) end, -+ ?LI([?AC(?LINK("show/" ++ Id), "On " ++ Utc ++ " with " ++ With ++ " -> " ++ escape_str(Subject) )] ) end, - get_collection_list(jlib:string_to_jid(Jid), US))) - ], Lang); - -@@ -209,7 +209,9 @@ - format_message({ Utc, Dir, Body } ,{WithU,WithS,WithR}, {LUser,LServer} ) -> - {From, Class} = case Dir of - 0 -> { jlib:jid_to_string({WithU,WithS,WithR}) , "message_from" } ; -- 1 -> { jlib:jid_to_string({LUser,LServer,""}) , "message_to" } -+ 1 -> { jlib:jid_to_string({LUser,LServer,""}) , "message_to" }; -+ "0" -> { jlib:jid_to_string({WithU,WithS,WithR}) , "message_from" } ; -+ "1" -> { jlib:jid_to_string({LUser,LServer,""}) , "message_to" } - end, - [_Date, Time] = string:tokens(Utc, " "), - ?XAE("p", [{"class", Class}] , [ ?XAE("span", [{"class","time"}], [?C("["++Time++"]")]), ?C(" "), -@@ -422,7 +424,7 @@ - links_previous_next_aux(Class, Text, Id) -> - case Id of - -1 -> []; -- _ -> [?XAE("a",[{"href",?LINK("show/" ++ integer_to_list(Id))},{"class",Class}], [?C(Text)])] -+ _ -> [?XAE("a",[{"href",?LINK("show/" ++ Id)},{"class",Class}], [?C(Text)])] - end. - - %------------------------
