[arch-commits] Commit in libreoffice/trunk (5 files)

andyrtr at archlinux.org andyrtr at archlinux.org
Tue Jul 19 15:12:29 EDT 2011


    Date: Tuesday, July 19, 2011 @ 15:12:28
  Author: andyrtr
Revision: 132066

upgpkg: libreoffice 3.4.2rc2-1
upstream prerelease 3.4.2rc2; fix dep in oooblogger extension and make libreoffice-common provide just libreoffice, should make upgrade path smooth; drop build fixes that went upstream

Modified:
  libreoffice/trunk/PKGBUILD
Deleted:
  libreoffice/trunk/0001-distro-install-desktop-integration-work-with-normal-.patch
  libreoffice/trunk/0002-distro-install-desktop-integration-do-not-pack-libre.patch
  libreoffice/trunk/0003-distro-install-fix-en-US-only-installation.patch
  libreoffice/trunk/0004-distro-install-desktop-integration-put-PREFIXDIR-bin.patch

-----------------------------------------------------------------+
 0001-distro-install-desktop-integration-work-with-normal-.patch |   36 -----
 0002-distro-install-desktop-integration-do-not-pack-libre.patch |   25 ---
 0003-distro-install-fix-en-US-only-installation.patch           |   31 ----
 0004-distro-install-desktop-integration-put-PREFIXDIR-bin.patch |   24 ---
 PKGBUILD                                                        |   64 ++++------
 5 files changed, 26 insertions(+), 154 deletions(-)

Deleted: 0001-distro-install-desktop-integration-work-with-normal-.patch
===================================================================
--- 0001-distro-install-desktop-integration-work-with-normal-.patch	2011-07-19 17:35:35 UTC (rev 132065)
+++ 0001-distro-install-desktop-integration-work-with-normal-.patch	2011-07-19 19:12:28 UTC (rev 132066)
@@ -1,36 +0,0 @@
-From 64653bcd8c1f1deeb8483e0d3e4ee8768a807b5d Mon Sep 17 00:00:00 2001
-From: Petr Mladek <pmladek at suse.cz>
-Date: Mon, 18 Jul 2011 12:32:57 +0200
-Subject: [PATCH] distro-install-desktop-integration: work with normal user
-
-+ alllow to overwrite the readonly desktop files
-+ create the compat soffice symlink in DESTDIR
----
- bin/distro-install-desktop-integration |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/bin/distro-install-desktop-integration b/bin/distro-install-desktop-integration
-index c00c8c6..600c54e 100755
---- a/bin/distro-install-desktop-integration
-+++ b/bin/distro-install-desktop-integration
-@@ -123,7 +123,7 @@ for file in *.desktop ; do
-         -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION/\1/" \
-         -e "s/\($PRODUCTNAME\) $PRODUCTVERSION/\1/" \
-         "$file" >"$file.new"
--    mv "$file.new" "$file"
-+    mv -f "$file.new" "$file"
- done
- cd -
- 
-@@ -160,7 +160,7 @@ add_wrapper unopkg         unopkg  ""            "unopkg"      ""
- #       you cannot include this link directly into the package
- #       For example, the Novell package mark this symlink as %ghost
- #	and update it in %post and %postun
--ln -sf $INSTALLDIR/program/soffice $PREFIXDIR/bin/soffice
-+ln -sf $INSTALLDIR/program/soffice $DESTDIR$PREFIXDIR/bin/soffice
- 
- # create bash completion
- mkdir -p $DESTDIR/etc/bash_completion.d
--- 
-1.7.3.4
-

Deleted: 0002-distro-install-desktop-integration-do-not-pack-libre.patch
===================================================================
--- 0002-distro-install-desktop-integration-do-not-pack-libre.patch	2011-07-19 17:35:35 UTC (rev 132065)
+++ 0002-distro-install-desktop-integration-do-not-pack-libre.patch	2011-07-19 19:12:28 UTC (rev 132066)
@@ -1,25 +0,0 @@
-From 7b202653f352a6c1bd18066bc71c93b1a5b33c13 Mon Sep 17 00:00:00 2001
-From: Petr Mladek <pmladek at suse.cz>
-Date: Mon, 18 Jul 2011 16:48:49 +0200
-Subject: [PATCH 2/3] distro-install-desktop-integration: do not pack libreoffice-base.desktop twice
-
----
- bin/distro-install-desktop-integration |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/bin/distro-install-desktop-integration b/bin/distro-install-desktop-integration
-index 600c54e..9e3b499 100755
---- a/bin/distro-install-desktop-integration
-+++ b/bin/distro-install-desktop-integration
-@@ -148,7 +148,7 @@ add_wrapper lomath         soffice "--math"       "libreoffice" "libreoffice-mat
- add_wrapper loimpress      soffice "--impress"    "libreoffice" "libreoffice-impress.desktop"     "gid_Module_Brand_Prg_Impress"
- add_wrapper loweb          soffice "--web"        "libreoffice" ""                                "gid_Module_Brand_Prg_Wrt"
- add_wrapper lowriter       soffice "--writer"     "libreoffice" "libreoffice-writer.desktop"      "gid_Module_Brand_Prg_Wrt"
--add_wrapper lofromtemplate soffice ".uno:NewDoc" "libreoffice" "libreoffice-base.desktop"        "gid_Module_Root_Brand"
-+add_wrapper lofromtemplate soffice ".uno:NewDoc"  "libreoffice" ""                                "gid_Module_Root_Brand"
- add_wrapper libreoffice    soffice ""            "libreoffice" "libreoffice-startcenter.desktop" "gid_Module_Root_Brand"
- add_wrapper loffice        soffice ""            "libreoffice" ""                                "gid_Module_Root_Brand"
- add_wrapper unopkg         unopkg  ""            "unopkg"      ""                                "gid_Module_Root_Brand"
--- 
-1.7.3.4
-

Deleted: 0003-distro-install-fix-en-US-only-installation.patch
===================================================================
--- 0003-distro-install-fix-en-US-only-installation.patch	2011-07-19 17:35:35 UTC (rev 132065)
+++ 0003-distro-install-fix-en-US-only-installation.patch	2011-07-19 19:12:28 UTC (rev 132066)
@@ -1,31 +0,0 @@
-From 72d5c4c3f7d2a5d329eb74fa1d1f69c1fb8c15b9 Mon Sep 17 00:00:00 2001
-From: Petr Mladek <pmladek at suse.cz>
-Date: Mon, 18 Jul 2011 16:50:18 +0200
-Subject: [PATCH 3/3] distro-install: fix en-US-only installation
-
-generate en-US file list when --with-distro=""
-
-sigh, we should set WITH_LANG=en-US when no language is selected; the empty
-string is pretty ugly; unforrunately, many makefile tests check for
-this empty variable
----
- configure.in |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 18f93d2..65813cb 100755
---- a/configure.in
-+++ b/configure.in
-@@ -7906,6 +7906,9 @@ for lang in $WITH_LANG ; do
- done
- # list with substituted ALL
- WITH_LANG_LIST=`echo $WITH_LANG | sed "s/ALL/$ALL_LANGS/"`
-+# this variable is used only by bin/distro-install-* helper scripts
-+# they need a real list of languages
-+test -z "$WITH_LANG_LIST" && WITH_LANG_LIST="en-US"
- AC_SUBST(ALL_LANGS)
- AC_SUBST(WITH_LANG)
- AC_SUBST(WITH_LANG_LIST)
--- 
-1.7.3.4
-

Deleted: 0004-distro-install-desktop-integration-put-PREFIXDIR-bin.patch
===================================================================
--- 0004-distro-install-desktop-integration-put-PREFIXDIR-bin.patch	2011-07-19 17:35:35 UTC (rev 132065)
+++ 0004-distro-install-desktop-integration-put-PREFIXDIR-bin.patch	2011-07-19 19:12:28 UTC (rev 132066)
@@ -1,24 +0,0 @@
-From 2046eaeaaabbc58326066ee37f53cc97ebf679bb Mon Sep 17 00:00:00 2001
-From: Petr Mladek <pmladek at suse.cz>
-Date: Mon, 18 Jul 2011 19:47:39 +0200
-Subject: [PATCH 4/4] distro-install-desktop-integration: put $PREFIXDIR/bin/soffice into file list
-
----
- bin/distro-install-desktop-integration |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/bin/distro-install-desktop-integration b/bin/distro-install-desktop-integration
-index 9e3b499..77ccf3a 100755
---- a/bin/distro-install-desktop-integration
-+++ b/bin/distro-install-desktop-integration
-@@ -161,6 +161,7 @@ add_wrapper unopkg         unopkg  ""            "unopkg"      ""
- #       For example, the Novell package mark this symlink as %ghost
- #	and update it in %post and %postun
- ln -sf $INSTALLDIR/program/soffice $DESTDIR$PREFIXDIR/bin/soffice
-+test -f $DESTDIR/gid_Module_Root_Brand && echo "$PREFIXDIR/bin/soffice" >>$DESTDIR/gid_Module_Root_Brand
- 
- # create bash completion
- mkdir -p $DESTDIR/etc/bash_completion.d
--- 
-1.7.3.4
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-07-19 17:35:35 UTC (rev 132065)
+++ PKGBUILD	2011-07-19 19:12:28 UTC (rev 132066)
@@ -35,8 +35,8 @@
 	'libreoffice-extension-validator'
 	'libreoffice-extension-watch-window'
 	'libreoffice-extension-wiki-publisher')
-_LOver=3.4.2.1
-pkgver=3.4.2rc1
+_LOver=3.4.2.2
+pkgver=3.4.2rc2
 pkgrel=1
 arch=('i686' 'x86_64')
 #_LO_tree="3.4"
@@ -85,7 +85,7 @@
 	${_additional_source_url}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
 	${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
 	${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
-	http://download.go-oo.org/src/7a0dcb3fe1e8c7229ab4fb868b7325e6-mdds_0.5.2.tar.bz2
+	http://download.go-oo.org/src/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
 	http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	http://download.go-oo.org/extern/b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2
 	http://download.go-oo.org/src/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2
@@ -103,14 +103,10 @@
 	buildfix_boost.diff
 	buildfix_ct2n.diff
 	vbahelper.visibility.patch
-	0001-distro-install-desktop-integration-work-with-normal-.patch
-	0002-distro-install-desktop-integration-do-not-pack-libre.patch
-	0003-distro-install-fix-en-US-only-installation.patch
-	0004-distro-install-desktop-integration-put-PREFIXDIR-bin.patch
 	scp2-more-reasonable-file-access-rights.diff)
 noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2
-	7a0dcb3fe1e8c7229ab4fb868b7325e6-mdds_0.5.2.tar.bz2
+	0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
 	ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
 	798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
 	1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
@@ -146,25 +142,25 @@
 	b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt
 	90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2
 	f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2)
-md5sums=('5829f1003eb730948327142137057815'
-         'ec893aac2b46eadd0d651fbefb0e8c75'
-         '9e8c507689262f7e04f693fddcf48dfd'
-         '01d8637c1c988e5cebe1ce3cf1afbf18'
-         '9c8eb8b34476bcdbbb1d37fb84bb0d6a'
-         'ceb863b121cbe56298bc77de64627254'
-         '9f71f3a23e690acc9d0f4685ef52b829'
-         '797205de3db3ab1e3ff84bb875152823'
-         'e8e72b2d22e8f504d8d8d163e90422f8'
-         '1ee6032abbc2de86c0d0822dc2c210a4'
-         '1c342f6f1227b60a3eabb7c958a62076'
-         'ca88faadcb450a4f7569f5e211b7ab34'
-         '74f4c9c7576b819e080223d961fb367b'
-         'f988b40bf3328bfc0d2102bf90decc35'
-         '9910fb6d20e49461ec75a0c0443ec91e'
-         '7a848a8ede3d6e49a314c99bbd187444'
-         '054127e979d7d24736bc644a12272e28'
-         '47f9342e31f667e9bd7e319704494306'
-         '62d28c0dfd1d59e5164b467d213797b9'
+md5sums=('65371f11bcd48b5d4aed68c429784747'
+         '566b7a01605517acd3d0e302614ce22d'
+         '4becc4d081d59a68355cadf8a2dbfd38'
+         'a426818aee9927d09e26d951594e2d2b'
+         '609633d4b6c94b14c53f28a7cdf822e5'
+         '31d9f27c33fd60764941a80715aaedde'
+         '86a3cb09af51802ce1856db7cd9977cc'
+         '8296feb6f6583b7247ef0345e2ac0e8e'
+         '610661f26b8997b858dec836cb6b638d'
+         '2aa17ecc635f94e647c487ca826431ac'
+         'c802f43a5a099106b2833d27fb0e1324'
+         'b1306ffbd5aafa2ff3e03ce4932b33d7'
+         '439816b03287e0c4b3c3175f2bf9bcee'
+         '61f45fe2c82439543fc5b39ce9868c77'
+         '3b0c3300c90f50983042de7d704078eb'
+         '01f0f8ae20201eb08889ebd14a14af79'
+         '95245eb754a75a4912ceaeaf9b69a00c'
+         '4af50ce86fd2ad3eca30ef2e93c59988'
+         'eaa63fc295b57c834db1b839d215027c'
          '1f24ab1d39f4a51faf22244c94a6203f'
          '35c94d2df8893241173de1d16b6034c0'
          '798b2ffdc8bcfe7bca2cf92b62caf685'
@@ -188,7 +184,7 @@
          'db60e4fde8dd6d6807523deb71ee34dc'
          'ba2930200c9f019c2d93a8c88c651a0f'
          '18f577b374d60b3c760a3a3350407632'
-         '7a0dcb3fe1e8c7229ab4fb868b7325e6'
+         '0ff7d225d087793c8c2c680d77aac3e7'
          '185d60944ea767075d27247c3162b3bc'
          'b4cae0700aa1c2aef7eb7f345365e6f1'
          '90401bca927835b6fbae4a707ed187c8'
@@ -206,10 +202,6 @@
          'bc228237108cab7745897a9f466b6d39'
          'eee273f501ff45dc5f1365e78c6d57c0'
          '43b145db28e6c0d73578ae6fd35e510d'
-         '43b0f998073fadfe73960998f69e91cd'
-         '0f9ab66f54f21708034322819f5e660d'
-         '0762b379aec0b1ad73c488d383283875'
-         '274c7d476383d2499e703c938824a78c'
          '37638431e7e40baf2e47966ebb9bc0e9')
 
 build() {
@@ -239,10 +231,6 @@
 	patch -Np1 -i ${srcdir}/buildfix_boost.diff
 	patch -Np1 -i ${srcdir}/buildfix_ct2n.diff
 	patch -Np0 -i ${srcdir}/vbahelper.visibility.patch
-	patch -Np1 -i ${srcdir}/0001-distro-install-desktop-integration-work-with-normal-.patch
-	patch -Np1 -i ${srcdir}/0002-distro-install-desktop-integration-do-not-pack-libre.patch
-	patch -Np1 -i ${srcdir}/0003-distro-install-fix-en-US-only-installation.patch
-	patch -Np1 -i ${srcdir}/0004-distro-install-desktop-integration-put-PREFIXDIR-bin.patch
 	patch -Np0 -i ${srcdir}/scp2-more-reasonable-file-access-rights.diff
 	
 	# unset C(XX)FLAGS
@@ -409,7 +397,7 @@
          etc/libreoffice/bootstraprc
          etc/libreoffice/psprint.conf)
  groups=('libreoffice')
- provides=('go-openoffice')
+ provides=('go-openoffice' 'libreoffice')
  conflicts=('go-openoffice')
  replaces=('go-openoffice' 'openoffice-base' 'libreoffice')
 
@@ -799,7 +787,7 @@
 
  pkgdesc="An extensions for blogging"
  #arch=('any')
- depends=('libreoffice' 'coreutils' 'python')
+ depends=('libreoffice-common' 'coreutils' 'python')
  groups=('libreoffice-extensions')
 
 	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions



More information about the arch-commits mailing list