[arch-commits] Commit in go-openoffice/repos (5 files)

andyrtr at archlinux.org andyrtr at archlinux.org
Tue May 12 15:53:12 UTC 2009 

    Date: Tuesday, May 12, 2009 @ 11:53:12
  Author: andyrtr
Revision: 39120

Merged revisions 39119 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/go-openoffice/trunk

........
  r39119 | andyrtr | 2009-05-12 15:52:35 +0000 (Di, 12 Mai 2009) | 2 lines
  
  upgpkg: go-openoffice 3.1.0rc1-1
      new version 3.1.0rc1
........

Modified:
  go-openoffice/repos/extra-x86_64/	(properties)
  go-openoffice/repos/extra-x86_64/ArchLinux.patch
  go-openoffice/repos/extra-x86_64/ChangeLog
  go-openoffice/repos/extra-x86_64/PKGBUILD
  go-openoffice/repos/extra-x86_64/go-openoffice.install

-----------------------+
 ArchLinux.patch       |  115 ++----------------------------------------------
 ChangeLog             |    7 ++
 PKGBUILD              |   15 ++----
 go-openoffice.install |    2 
 4 files changed, 21 insertions(+), 118 deletions(-)


Property changes on: go-openoffice/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /go-openoffice/trunk:1-37574
   + /go-openoffice/trunk:1-39119

Modified: extra-x86_64/ArchLinux.patch
===================================================================
--- extra-x86_64/ArchLinux.patch	2009-05-12 15:52:35 UTC (rev 39119)
+++ extra-x86_64/ArchLinux.patch	2009-05-12 15:53:12 UTC (rev 39120)
@@ -1,114 +1,11 @@
---- distro-configs/ArchLinux.conf.in	2009-04-19 09:29:40.000000000 +0000
-+++ distro-configs/ArchLinux.conf.in.new	2009-04-19 09:35:54.000000000 +0000
-@@ -0,0 +1,41 @@
-+--with-vendor=\"the ArchLinux Linux team\"
-+--disable-binfilter
-+--disable-fontooo
-+--disable-gnome-vfs
-+--enable-gio
-+--enable-gtk
-+--enable-cups
-+--enable-dbus
-+--enable-vba
-+--with-system-db
-+--with-system-curl
-+--with-system-expat
-+--with-system-freetype
-+--with-system-hunspell
-+--with-system-icu
-+--with-system-libwpd
-+--with-system-libxml
-+--with-system-libxslt
-+--with-system-mozilla=libxul
-+--with-system-neon
-+--with-system-python
-+--with-system-redland
-+--with-system-sane-header
-+--with-system-sndfile
-+--with-system-stdlibs
-+--with-system-xrender-headers
-+--with-system-zlib
-+--with-system-openssl
-+--with-system-odbc-headers
-+--with-jdk-home=${JAVA_HOME}
-+--with-system-xerces
-+--with-xerces-jar=/usr/share/java/xercesImpl.jar
-+--with-system-xalan
-+--with-xalan-jar=/usr/share/java/xalan.jar
-+--with-system-xml-apis
-+--with-xml-apis-jar=/usr/share/java/xml-apis.jar
-+--with-system-hsqldb
-+--with-hsqldb-jar=/usr/share/java/hsqldb.jar
-+--with-serializer-jar=/usr/share/java/serializer.jar
-+--with-use-shell=bash
-+--disable-dependency-tracking
---- distro-configs/Makefile.in	2009-04-30 16:26:20.000000000 +0000
-+++ distro-configs/Makefile.in.new	2009-05-01 10:02:40.000000000 +0000
-@@ -30,7 +30,7 @@
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
- subdir = distro-configs
--DIST_COMMON = $(srcdir)/Ark.conf.in $(srcdir)/Common.conf.in \
-+DIST_COMMON = $(srcdir)/ArchLinux.conf.in $(srcdir)/Ark.conf.in $(srcdir)/Common.conf.in \
- 	$(srcdir)/CommonLinux.conf.in $(srcdir)/CommonMac.conf.in \
- 	$(srcdir)/CommonWin32.conf.in $(srcdir)/Debian.conf.in \
- 	$(srcdir)/DebianEtch.conf.in $(srcdir)/DebianSarge.conf.in \
-@@ -65,7 +65,7 @@
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
- mkinstalldirs = $(install_sh) -d
--CONFIG_CLEAN_FILES = Ark.conf Common.conf CommonLinux.conf \
-+CONFIG_CLEAN_FILES = ArchLinux.conf Ark.conf Common.conf CommonLinux.conf \
- 	CommonWin32.conf CommonMac.conf GoOoWin32.conf \
- 	DroplineGNOME.conf DroplineGNOME64.conf Debian.conf \
- 	DebianEtch.conf DebianSarge.conf FSFhuLinux.conf \
-@@ -300,6 +300,8 @@
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+ArchLinux.conf: $(top_builddir)/config.status $(srcdir)/ArchLinux.conf.in
-+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
- Ark.conf: $(top_builddir)/config.status $(srcdir)/Ark.conf.in
- 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
- Common.conf: $(top_builddir)/config.status $(srcdir)/Common.conf.in
---- configure.in	2009-04-30 16:26:17.000000000 +0000
-+++ configure.in.new	2009-05-01 10:10:08.000000000 +0000
-@@ -592,6 +592,7 @@
- AC_MSG_CHECKING([for vendor name based on the distribution name])
- VENDORNAME=OpenOffice
- case $DISTRO in
-+        ArchLinux*) VENDORNAME="ArchLinux" ;;
-         Ark*) VENDORNAME="Ark" ;;
-         Debian*|Ubuntu*) VENDORNAME="Debian" ;;
-         Dropline*) VENDORNAME="DroplineGNOME" ;;
-@@ -1378,6 +1379,7 @@
- desktop/mimetypes/32x32/Makefile
- desktop/mimetypes/48x48/Makefile
- distro-configs/Makefile
-+distro-configs/ArchLinux.conf
- distro-configs/Ark.conf
- distro-configs/Common.conf
- distro-configs/CommonLinux.conf
---- download.in	2009-04-28 09:39:18.000000000 +0000
-+++ download.in.new	2009-05-01 10:12:15.000000000 +0000
-@@ -383,7 +383,8 @@
- }
- 
- my $distro = '@DISTRO@';
--if ($distro eq 'Ark' ||
-+if ($distro eq 'ArchLinux' ||
-+    $distro eq 'Ark' ||
-     $distro eq 'DroplineGNOME' ||
-     $distro eq 'Frugalware' || $distro eq 'Frugalware64' ||
-     $distro eq 'Gentoo.conf' ||
---- patches/dev300/apply	2009-04-30 14:55:12.000000000 +0000
-+++ patches/dev300/apply.new	2009-05-01 10:15:16.000000000 +0000
-@@ -105,6 +105,8 @@
- rPathCommon: LinuxCommon, NotDebian, Lockdown, BerkeleyDB43, CairoFonts
+--- patches/dev300/apply	2009-05-07 19:44:13.000000000 +0000
++++ patches/dev300/apply.new	2009-05-11 18:46:58.108316633 +0000
+@@ -108,7 +108,7 @@
  rpl2: rPathCommon
  rpl2-64: rPathCommon
-+# ArchLinux
-+ArchLinux: LinuxCommon
+ # ArchLinux
+-ArchLinux: LinuxCommon
++ArchLinux: LinuxCommon, NotDebian, CairoFonts, Shrink, Lockdown, Gcc44
  # Win32
  Win32 : Win32Common
  # translate.org.za

Modified: extra-x86_64/ChangeLog
===================================================================
--- extra-x86_64/ChangeLog	2009-05-12 15:52:35 UTC (rev 39119)
+++ extra-x86_64/ChangeLog	2009-05-12 15:53:12 UTC (rev 39120)
@@ -1,3 +1,10 @@
+2009-05-11 Andreas Radke <andyrtr at archlinux.org>
+
+        * 3.1.0.0-1 :
+	new upstream release = go-oo 3.1.0 rc1
+	add NotDebian, CairoFonts, Shrink, Lockdown, Gcc44
+	 sections to ArchLinux patches, not yet upstream
+
 2009-05-02 Andreas Radke <andyrtr at archlinux.org>
 
         * 3.0.99.7-2 :

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-05-12 15:52:35 UTC (rev 39119)
+++ extra-x86_64/PKGBUILD	2009-05-12 15:53:12 UTC (rev 39120)
@@ -2,14 +2,14 @@
 # Maintainer: AndyRTR <andyrtr at archlinux.org>
 
 pkgname=go-openoffice
-pkgver=3.0.99.7
-_GOver=3.0.99.7
-pkgrel=2
+pkgver=3.1.0rc1
+_GOver=3.1.0.0
+pkgrel=1
 pkgdesc="OpenOffice.org - go-oo.org enhanced version of SUN's office suite"
 arch=('i686' 'x86_64')
 _go_tree="OOO310"
 _dir=DEV300
-_ootag=ooo310-m11 # = OOo 3.1.0 RC2
+_ootag=ooo310-m11 # = OOo 3.1.0 RC2 = final
 license=('LGPL3')
 url="http://go-oo.org/"
 install=${pkgname}.install
@@ -48,8 +48,8 @@
 noextract=(ooo-cli-prebuilt-3.1.tar.bz2 cairo-1.4.10.tar.gz mdbtools-0.6pre1.tar.gz
 	${_ootag}-{artwork,base,bootstrap,calc,components,extras,filters,help,impress,libs-gui,libs-core,libs-extern,postprocess,sdk,testing,ure,writer,libs-extern-sys,extensions}.tar.bz2
 	extras-3.tar.bz2 biblio.tar.bz2 unowinreg.dll scsolver.2008-10-30.tar.bz2 libwpd-0.8.14.tar.gz libwps-0.1.2.tar.gz libwpg-0.1.3.tar.gz)
-md5sums=('95771debb2a2c9b6497a319eba672131'
-         'da31e2f5d5b342f3ad6ff2e66337f3b2'
+md5sums=('f7388c8f87f08e2807d873a3b2ef5c3c'
+         '83b5411a465797b3d8573ddacf7c7217'
          'b5b895b338e81191a6abacc644e3f705'
          '5598a5e500ad922e37b159dee72fc993'
          '246e8f38b2a1af1bcff60ee0da59300b'
@@ -89,7 +89,6 @@
 
 	# our ArchLinux distribution patch until we go upstream
 	patch -Np0 -i ${srcdir}/ArchLinux.patch || return 1
-	autoreconf
 
 	export ARCH_FLAGS="${CXXFLAGS}"
 
@@ -99,7 +98,7 @@
 	fi
 
 	./configure --with-distro=ArchLinux \
-		--with-build-version="${_GOver} ArchLinux build-${pkgrel} (${_OO_milestone})" \
+		--with-build-version="${_GOver} ArchLinux build-${pkgrel} (${_ootag})" \
 		--with-srcdir=${srcdir} \
 		--with-max-jobs=${MAKEFLAGS/-j/} \
 		--with-installed-ooo-dirname="${pkgname}-${_GOver}" \

Modified: extra-x86_64/go-openoffice.install
===================================================================
--- extra-x86_64/go-openoffice.install	2009-05-12 15:52:35 UTC (rev 39119)
+++ extra-x86_64/go-openoffice.install	2009-05-12 15:53:12 UTC (rev 39120)
@@ -3,7 +3,7 @@
 gtk-update-icon-cache -f -q /usr/share/icons/hicolor
 update-desktop-database -q
 
-_GOver='3.0.99.7'
+_GOver='3.1.0.0'
 
 echo " see http://wiki.archlinux.org/index.php/Openoffice"
 echo " how to use extensions, e.g. for spell checking"

More information about the arch-commits mailing list