Thunderbird Version Bump

network/mail/thunderbird/actions.py

@@ -9,46 +9,13 @@ from pisi.actionsapi import autotools
 from pisi.actionsapi import pisitools
 from pisi.actionsapi import shelltools
 
-MOZAPPDIR= "/usr/lib/thunderbird"
-shelltools.export("SHELL", "/bin/sh")
-
-locales = "be  ca  da  de  el  en-US  es-AR  es-ES  fi  fr  hr  hu  it  lt nl  pl  pt-BR  pt-PT  ro  ru  sr  sv-SE  tr  uk".split()
-xpidir = "%s/xpi" % get.workDIR()
-arch = get.ARCH()
-ver = ".".join(get.srcVERSION().split(".")[:3])
-
-def setup():    
-    pisitools.dosed(".mozconfig", "##JOBCOUNT##", get.makeJOBS())
-
-    # LOCALE
-    shelltools.system("rm -rf langpack-tb/*/browser/defaults")
-    if not shelltools.isDirectory(xpidir): shelltools.makedirs(xpidir)
-    for locale in locales:
-        shelltools.system("wget -c -P %s http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/%s/linux-%s/xpi/%s.xpi" % (xpidir, ver, arch, locale))
-        shelltools.makedirs("langpack-tb/langpack-%s@thunderbird.mozilla.org" % locale)
-        shelltools.system("unzip -uo %s/%s.xpi -d langpack-tb/langpack-%s@thunderbird.mozilla.org" % (xpidir, locale, locale))
-
-def build():
-    #shelltools.system("sed -i '/^ftglyph.h/ i ftfntfmt.h' mozilla/config/system-headers")
-    autotools.make("-f ./client.mk")
-
 def install():
-    autotools.rawInstall("-f client.mk DESTDIR=%s" % get.installDIR())
-
-    # Install fix language packs
-    pisitools.insinto("/usr/lib/thunderbird/extensions", "./langpack-tb/*")
-
-    # Install icons
-    pisitools.insinto("/usr/share/pixmaps", "other-licenses/branding/thunderbird/mailicon256.png", "thunderbird.png")
-    pisitools.insinto("%s/icons" % MOZAPPDIR, "other-licenses/branding/thunderbird/mailicon16.png")
-
-    for s in (16, 22, 24, 32, 48, 256):
-        pisitools.insinto("/usr/share/icons/hicolor/%dx%d/apps" % (s,s), "other-licenses/branding/thunderbird/mailicon%d.png" % s, "thunderbird.png")
-
-    # We don't want the development stuff
-    pisitools.removeDir("/usr/lib/thunderbird-devel*")
-    pisitools.removeDir("/usr/share/idl")
-    pisitools.removeDir("/usr/include")
-
-    # Install docs
-    pisitools.dodoc("mozilla/LEGAL", "mozilla/LICENSE")
+    pisitools.insinto("/opt", "*")
+    shelltools.system("mkdir -p %s/usr/bin" % get.installDIR())
+    shelltools.system("ln -s %s/opt/thunderbird %s/usr/bin/thunderbird" % (get.installDIR(), get.installDIR()))
+    for i in ("16", "22", "24", "32", "48", "64", "128", "256"):
+        pisitools.dodir("/usr/share/icons/hicolor/%sx%s/apps" % (i, i))
+        pisitools.domove("/opt/chrome/icons/default/default%s.png" % (i), "/usr/share/icons/hicolor/%sx%s/apps/thunderbird.png" % (i, i))
+    # Use system certificates
+    pisitools.dodir("/usr/lib")
+    shelltools.system("ln -s %s/opt/libnssckbi.so %s/usr/lib/libnssckbi.so" % (get.installDIR(), get.installDIR()))