[arch-commits] Commit in ejabberd-mod_archive-svn/repos/community-any (4 files)
Sergej Pupykin
spupykin at nymeria.archlinux.org
Tue Apr 9 11:17:27 UTC 2013
Date: Tuesday, April 9, 2013 @ 13:17:26
Author: spupykin
Revision: 87955
archrelease: copy trunk to community-any
Added:
ejabberd-mod_archive-svn/repos/community-any/PKGBUILD
(from rev 87954, ejabberd-mod_archive-svn/trunk/PKGBUILD)
ejabberd-mod_archive-svn/repos/community-any/types-fix.patch
(from rev 87954, ejabberd-mod_archive-svn/trunk/types-fix.patch)
Deleted:
ejabberd-mod_archive-svn/repos/community-any/PKGBUILD
ejabberd-mod_archive-svn/repos/community-any/types-fix.patch
-----------------+
PKGBUILD | 83 +++++++++++++++++++++---------------------------------
types-fix.patch | 66 +++++++++++++++++++++---------------------
2 files changed, 66 insertions(+), 83 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2013-04-09 11:17:17 UTC (rev 87954)
+++ PKGBUILD 2013-04-09 11:17:26 UTC (rev 87955)
@@ -1,50 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
-
-pkgname=ejabberd-mod_archive-svn
-pkgver=1125
-pkgrel=1
-pkgdesc="ejabberd message archive module"
-arch=(any)
-url="http://www.ejabberd.im/mod_archive"
-license=('GPL')
-depends=(ejabberd)
-makedepends=(erlang subversion)
-options=()
-source=(types-fix.patch)
-md5sums=()
-
-_svntrunk=https://svn.process-one.net/ejabberd-modules
-_svnmod=ejabberd-modules
-md5sums=('2fed1281e5ad78b20b753c705d3ec314')
-
-build() {
- cd $srcdir
-
- if [ -d ${_svnmod}/.svn ]; then
- (cd ${_svnmod} && svn up -r $pkgver)
- else
- svn co ${_svntrunk} --config-dir ./ -r $pkgver ${_svnmod}
- fi
-
- msg "SVN checkout done or server timeout"
- msg "Starting make..."
-
- rm -r $srcdir/${_svnmod}-build || true
- cp -r ${_svnmod} ${_svnmod}-build
- cd ${_svnmod}-build
-
- #
- # BUILD
- #
- cd mod_archive/trunk
- patch -p0 <$srcdir/types-fix.patch
- ./build.sh
-
- rm -rf ebin/.svn
- 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
- cp -r src/*.sql $pkgdir/usr/share/ejabberd-mod_archive/
-}
Copied: ejabberd-mod_archive-svn/repos/community-any/PKGBUILD (from rev 87954, ejabberd-mod_archive-svn/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2013-04-09 11:17:26 UTC (rev 87955)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+
+pkgname=ejabberd-mod_archive-svn
+pkgver=1137
+pkgrel=1
+pkgdesc="ejabberd message archive module"
+arch=(any)
+url="http://www.ejabberd.im/mod_archive"
+license=('GPL')
+depends=(ejabberd)
+makedepends=(erlang subversion)
+options=()
+source=("ejabberd-modules.svn::svn+https://svn.process-one.net/ejabberd-modules"
+ "types-fix.patch")
+md5sums=('SKIP'
+ '2fed1281e5ad78b20b753c705d3ec314')
+
+build() {
+ cd $srcdir/ejabberd-modules.svn/mod_archive/trunk
+ patch -p0 <$srcdir/types-fix.patch
+ ./build.sh
+ rm -rf ebin/.svn
+}
+
+package() {
+ cd $srcdir/ejabberd-modules.svn/mod_archive/trunk
+ 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
+ cp -r src/*.sql $pkgdir/usr/share/ejabberd-mod_archive/
+}
Deleted: types-fix.patch
===================================================================
--- types-fix.patch 2013-04-09 11:17:17 UTC (rev 87954)
+++ types-fix.patch 2013-04-09 11:17:26 UTC (rev 87955)
@@ -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.
-
- %------------------------
Copied: ejabberd-mod_archive-svn/repos/community-any/types-fix.patch (from rev 87954, ejabberd-mod_archive-svn/trunk/types-fix.patch)
===================================================================
--- types-fix.patch (rev 0)
+++ types-fix.patch 2013-04-09 11:17:26 UTC (rev 87955)
@@ -0,0 +1,33 @@
+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.
+
+ %------------------------
More information about the arch-commits
mailing list