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

Andreas Radke andyrtr at nymeria.archlinux.org
Fri May 23 21:11:15 UTC 2014


    Date: Friday, May 23, 2014 @ 23:11:15
  Author: andyrtr
Revision: 213423

drop splitted build

Added:
  libreoffice-fresh/trunk/libreoffice-fresh.install
    (from rev 213414, libreoffice-fresh/trunk/libreoffice-common.install)
Modified:
  libreoffice-fresh/trunk/PKGBUILD
Deleted:
  libreoffice-fresh/trunk/libreoffice-base.install
  libreoffice-fresh/trunk/libreoffice-calc.install
  libreoffice-fresh/trunk/libreoffice-common.install
  libreoffice-fresh/trunk/libreoffice-draw.install
  libreoffice-fresh/trunk/libreoffice-impress.install
  libreoffice-fresh/trunk/libreoffice-writer.install

-----------------------------+
 PKGBUILD                    |  514 ++++++------------------------------------
 libreoffice-base.install    |   11 
 libreoffice-calc.install    |   11 
 libreoffice-common.install  |   47 ---
 libreoffice-draw.install    |   11 
 libreoffice-fresh.install   |   13 +
 libreoffice-impress.install |   11 
 libreoffice-writer.install  |   11 
 8 files changed, 90 insertions(+), 539 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-05-23 19:13:03 UTC (rev 213422)
+++ PKGBUILD	2014-05-23 21:11:15 UTC (rev 213423)
@@ -2,58 +2,63 @@
 # Maintainer: AndyRTR <andyrtr at archlinux.org>
 # Maintainer: Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
 
-pkgbase="libreoffice"
-pkgname=('libreoffice-common'
-	'libreoffice-base'
-	'libreoffice-calc'
-	'libreoffice-draw'
-	'libreoffice-gnome'
-	'libreoffice-impress'
-	'libreoffice-kde4'
-	'libreoffice-math'
-	'libreoffice-sdk'
-	'libreoffice-sdk-doc'
-	'libreoffice-writer'
-	'libreoffice-en-US'
-	'libreoffice-postgresql-connector'
-	'libreoffice-extension-wiki-publisher'
-	'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built)
+pkgname="libreoffice-fresh"
 _LOver=4.3.0.0.beta1
 pkgver=4.3.0
 pkgrel=0.2
+pkgdesc="LibreOffice branch which contains new features and program enhancements"
 arch=('i686' 'x86_64')
 license=('LGPL3')
 url="http://www.libreoffice.org/"
-makedepends=( # makedepends
-             'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'apache-ant'
+depends=("curl>=7.20.0" "hunspell>=1.2.8" "python>=3.4" 'libwpd>=0.9.2'
+		 'libwps' 'libxaw' "neon>=0.28.6" 'pango' 'nspr' 'libjpeg' 'libxrandr'
+		 'libgl' 'dbus-glib' 'libxslt' 'librsvg' 'redland' 'icu'
+		 'hyphen' 'lpsolve' 'gcc-libs' 'sh'  'libtextcat' 'graphite'
+		 'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen'
+		 'libcdr' 'libmspub'
+		 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info'
+		 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils' #'telepathy-glib'
+		 'gst-plugins-base-libs' 'glu' 'ttf-liberation' # to satisfy regression tests
+	     'git')
+makedepends=('sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'apache-ant'
 			 'gperf' 'kdelibs' 'gconf' 'gtk3' 'cppunit' 'beanshell2' 'vigra'
 			 'clucene' 'junit' 'libmythes' 'libwpg'  'mesa' 'clucene'
 			 'java-environment' 'postgresql-libs' 'bluez-libs' 'harfbuzz-icu'
-			 'gdb' 'doxygen'  'libatomic_ops' 'mdds' 'glew' 'apr' 'serf'
-             # the runtime dependencies
-             "curl>=7.20.0" "hunspell>=1.2.8" "python>=3.4" 'libwpd>=0.9.2'
-			 'libwps' 'libxaw' "neon>=0.28.6" 'pango' 'nspr' 'libjpeg' 'libxrandr'
-			 'libgl' 'dbus-glib' 'libxslt' 'librsvg' 'redland' 'icu'
-			 'hyphen' 'lpsolve' 'gcc-libs' 'sh'  'libtextcat' 'graphite'
-			 'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen'
-			 'libcdr' 'libmspub'
-			 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info'
-			 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils' #'telepathy-glib'
-			 'gst-plugins-base-libs' 'glu' 'ttf-liberation' # to satisfy regression tests
-	         'git')
-# there's only one single static library in libreoffice-sdk,
-# the next build that removes it may lead to trouble if people may use it
-# -rw-r--r-- 1 root root 5,1K 12. Okt 23:34 /usr/lib/libreoffice/sdk/lib/libsalcpprt.a
-# options=('staticlibs')
-
-# http://download.documentfoundation.org/mirrors/all.html
-# http://wiki.documentfoundation.org/Mirrors
-
+			 'gdb' 'doxygen'  'libatomic_ops' 'mdds' 'glew' 'apr' 'serf')
+optdepends=('libreoffice-langpack: additional language support'
+            'java-runtime:     adds java support'
+            'java-environment:	required by extension-wiki-publisher and extension-nlpsolver'
+            'pstoedit:         translates PostScript and PDF graphics into other vector formats'
+            'libmythes:        for use in thesaurus'
+            'beanshell2:       interactive java -- good for prototyping/macros'
+            'vigra:            C++ computer vision library, usable in Basebmp'
+            'libmspack:        library for Microsoft compression formats for use in FontOOo'
+            'libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images and for MS visual import'
+            'sane:             for scanner access'
+            'unixodbc:         adds ODBC database support'
+            'gst-plugins-base-libs:        + some gstr-plugins to support multimedia content, e.g. in impress'
+            'gtk2:             for browser plugin'
+            'libpaper:         takes care of papersize')
+backup=(etc/libreoffice/sofficerc
+        etc/libreoffice/bootstraprc
+        etc/libreoffice/psprint.conf
+        etc/profile.d/libreoffice-common.sh
+        etc/profile.d/libreoffice-common.csh)
+install=$pkgname.install
+provides=('libreoffice-common' 	'libreoffice-base' 'libreoffice-calc' 'libreoffice-draw' 'libreoffice-gnome'
+          'libreoffice-impress'	'libreoffice-kde4' 'libreoffice-math' 'libreoffice-sdk'	'libreoffice-sdk-doc'
+          'libreoffice-writer' 'libreoffice-en-US' 'libreoffice-postgresql-connector' 
+          'libreoffice-extension-wiki-publisher' 'libreoffice-extension-nlpsolver')
+conflicts=('libreoffice-stable' 'libreoffice-common' 	'libreoffice-base' 'libreoffice-calc' 'libreoffice-draw' 'libreoffice-gnome'
+          'libreoffice-impress'	'libreoffice-kde4' 'libreoffice-math' 'libreoffice-sdk'	'libreoffice-sdk-doc'
+          'libreoffice-writer' 'libreoffice-en-US' 'libreoffice-postgresql-connector' 
+          'libreoffice-extension-wiki-publisher' 'libreoffice-extension-nlpsolver')
+          
 #_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}"
 _mirror="http://dev-builds.libreoffice.org/pre-releases/src"
 _additional_source_url="http://dev-www.libreoffice.org/src"
 _additional_source_url2="http://dev-www.libreoffice.org/extern"
-source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz{,.asc}
+source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc}
 	${_additional_source_url}/d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2
 	${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
 	${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
@@ -187,7 +192,6 @@
 prepare() {
 
     cd libreoffice-$_LOver
-#return 1
 
 	# move external sources into place
 	mkdir ${srcdir}/ext_sources &&	pushd ${srcdir}/ext_sources
@@ -307,17 +311,8 @@
 		--disable-dependency-tracking \
 		--enable-hardlink-deliver #--help
 
-#		--enable-mergelibs=<all/yes> \ # https://bugs.archlinux.org/task/34414
-#		--without-ppds\ # breaks spadmin permission
-
-#--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool
-
 	touch src.downloaded
-	#./download
 	make
-	# fake installation to create split file lists
-	mkdir $srcdir/fakeinstall
-	make DESTDIR=${srcdir}/fakeinstall distro-pack-install # -o build -o check
 }
 
 #check() {
@@ -325,399 +320,44 @@
 #	make check
 #}
 
-package_libreoffice-common() {
- pkgdesc="Common files for LibreOffice - a productivity suite that is compatible with other major office suites"
- install=libreoffice-common.install
- depends=('libreoffice-langpack' "hunspell>=1.2.8" "python>=3.3" "neon>=0.28.6"
-		  'dbus-glib' 'librsvg' 'libcups' 'nss' 'libsm' 'redland' 'hyphen'
-		  'graphite' 'clucene' 'lcms2' "poppler>=0.24.0" 'icu'
-		  #'telepathy-glib' # (calc telepathy-glib libtubeslo.so)
-          'libodfgen'  'libvisio' 'harfbuzz-icu' 'hicolor-icon-theme' 'glu'
-          'libmspub' 'libcdr' 'glew' # 'apr' 'serf' ?
-		  'desktop-file-utils' 'shared-mime-info' 'xdg-utils')
- optdepends=('libreoffice-langpack: additional language support'
-             'java-runtime:     adds java support'
-             'pstoedit:         translates PostScript and PDF graphics into other vector formats'
-             'libmythes:        for use in thesaurus'
-             'beanshell2:       interactive java -- good for prototyping/macros'
-             'vigra:            C++ computer vision library, usable in Basebmp'
-             'libmspack:        library for Microsoft compression formats for use in FontOOo'
-             'libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images and for MS visual import'
-             'sane:             for scanner access'
-             'unixodbc:         adds ODBC database support'
-             'gst-plugins-base-libs:        + some gstr-plugins to support multimedia content, e.g. in impress'
-             'gtk2:             for browser plugin'
-             'libpaper:         takes care of papersize')
- backup=(etc/libreoffice/sofficerc
-         etc/libreoffice/bootstraprc
-         etc/libreoffice/psprint.conf
-         etc/profile.d/libreoffice-common.sh
-         etc/profile.d/libreoffice-common.csh)
- groups=('libreoffice')
- provides=('go-openoffice' 'libreoffice-extension-pdfimport' 'libreoffice-extension-presenter-screen'
-           'libreoffice-scripting-beanshell' 'libreoffice-scripting-javascript'	'libreoffice-extension-scripting-python'
-           'libreoffice-extension-report-builder')
- conflicts=('go-openoffice')
- replaces=('go-openoffice' 'openoffice-base' 'libreoffice' 'libreoffice-extension-pdfimport' 'libreoffice-extension-presenter-screen'
-           'libreoffice-scripting-beanshell' 'libreoffice-scripting-javascript' 'libreoffice-extension-scripting-python'
-           'libreoffice-extension-report-builder' 'libreoffice-extension-presentation-minimizer' 'libreoffice-extension-presentation-minimizer')
+package() {
+	
+	cd libreoffice-$_LOver
+	make DESTDIR="$pkgdir/" install
+	
+	# put configuration files into place
+	install -dm755 ${pkgdir}/etc/libreoffice
+	install -m644 ${pkgdir}/usr/lib/libreoffice/program/{bootstraprc,sofficerc} ${pkgdir}/etc/libreoffice/
+	install -m644 ${pkgdir}/usr/lib/libreoffice/share/psprint/psprint.conf ${pkgdir}/etc/libreoffice/
+	
+	# install dummy links to make them found by LibO
+	cd ${pkgdir}/usr/lib/libreoffice/program/
+	ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} .
+	cd ${pkgdir}/usr/lib/libreoffice/share/psprint/
+	ln -vsf /etc/libreoffice/psprint.conf .
 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/common_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/common_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
+	# allow to preset desired VLC
+	install -dm755 ${pkgdir}/etc/profile.d
+	install -m755 ${srcdir}/libreoffice-common.{sh,csh} ${pkgdir}/etc/profile.d/
 
- # put configuration files into place
- install -dm755 ${pkgdir}/etc/libreoffice
- install -m644 ${pkgdir}/usr/lib/libreoffice/program/{bootstraprc,sofficerc} ${pkgdir}/etc/libreoffice/
- install -m644 ${pkgdir}/usr/lib/libreoffice/share/psprint/psprint.conf ${pkgdir}/etc/libreoffice/
- # install dummy links to make them found by LibO
- cd ${pkgdir}/usr/lib/libreoffice/program/
- ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} .
- cd ${pkgdir}/usr/lib/libreoffice/share/psprint/
- ln -vsf /etc/libreoffice/psprint.conf .
+	# move bash-completion files to its new place
+	install -dm755 ${pkgdir}/usr/share/bash-completion/completions
+	mv ${pkgdir}/etc/bash_completion.d/libreoffice.sh ${pkgdir}/usr/share/bash-completion/completions/libreoffice.sh # fails
+	rm -rf ${pkgdir}/etc/bash_completion.d
 
- # allow to preset desired VLC
- install -dm755 ${pkgdir}/etc/profile.d
- install -m755 ${srcdir}/libreoffice-common.{sh,csh} ${pkgdir}/etc/profile.d/
+	# make pyuno find its modules
+	install -dm755 ${pkgdir}/usr/lib/python3.4/site-packages
+	ln -svf /usr/lib/libreoffice/program/uno.py ${pkgdir}/usr/lib/python3.4/site-packages/uno.py
+	ln -svf /usr/lib/libreoffice/program/unohelper.py ${pkgdir}/usr/lib/python3.4/site-packages/unohelper.py
 
- # move bash-completion files to its new place
- install -dm755 ${pkgdir}/usr/share/bash-completion/completions
- mv ${pkgdir}/etc/bash_completion.d/libreoffice.sh ${pkgdir}/usr/share/bash-completion/completions/libreoffice.sh
- rm -rf ${pkgdir}/etc/bash_completion.d
-
- # make pyuno find its modules
- install -dm755 ${pkgdir}/usr/lib/python3.4/site-packages
- ln -svf /usr/lib/libreoffice/program/uno.py ${pkgdir}/usr/lib/python3.4/site-packages/uno.py
- ln -svf /usr/lib/libreoffice/program/unohelper.py ${pkgdir}/usr/lib/python3.4/site-packages/unohelper.py
-
- # workaround all packages now depend on that file
- cp ${srcdir}/fakeinstall/usr/lib/libreoffice/share/registry/writer.xcd ${pkgdir}/usr/lib/libreoffice/share/registry/writer.xcd
- # workaround lowriter depending on a lib that's part of calc
- # https://bugs.archlinux.org/task/39038 - https://bugs.freedesktop.org/show_bug.cgi?id=75506
-# cp ${srcdir}/fakeinstall/usr/lib/libreoffice/program/libtubeslo.so ${pkgdir}/usr/lib/libreoffice/program/libtubeslo.so
-
- # add missing files from Beanshell provider
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/orig/gid_Module_Optional_Extensions_Script_Provider_For_BS`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/orig/gid_Module_Optional_Extensions_Script_Provider_For_BS`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file || /bin/true # some double file entries make it fail
- done
-}
-
-package_libreoffice-base() {
- pkgdesc="GUI database front-end for LibreOffice. Allows creation and management of databases through a GUI."
- install=libreoffice-base.install
- depends=('libreoffice-common')
- optdepends=('libreoffice-postgresql-connector')
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/base_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/base_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-postgresql-connector() {
- pkgdesc="A PostgreSQL connector for the database front-end for LibreOffice"
- depends=('libreoffice-base' 'postgresql-libs')
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # workaround double entries in the file list
- mv ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt.orig
- sort ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt.orig | uniq 1>& ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/postgresql_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-calc() {
- pkgdesc="Spreadsheet application for LibreOffice."
- install=libreoffice-calc.install
- depends=('libreoffice-common' 'lpsolve')
- #depends=('libreoffice-writer' 'lpsolve' ) # some hidden uno linking to parts of the writer pkg - https://bugs.archlinux.org/task/34332
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/calc_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/calc_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
- # workaround lowriter depending on a lib that's part of calc
- # https://bugs.archlinux.org/task/39038 - https://bugs.freedesktop.org/show_bug.cgi?id=75506
-# rm -vf ${pkgdir}/usr/lib/libreoffice/program/libtubeslo.so
-}
-
-package_libreoffice-draw() {
- pkgdesc="Drawing Application for LibreOffice."
- install=libreoffice-draw.install
- depends=('libreoffice-common')
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/draw_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/draw_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-gnome() {
- pkgdesc="Plug-in for LibreOffice that enables integration into the Gnome and other gtk desktop environment."
- depends=('libreoffice-common' 'gconf')
- optdepends=('gtk3: for gtk3 Gnome integration'
-             'gtk2: for older gtk2 desktop integration')
- groups=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/gnome_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/gnome_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-impress() {
- pkgdesc="Presentation Application for LibreOffice."
- install=libreoffice-impress.install
- depends=('libreoffice-common' 'libetonyek')
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/impress_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/impress_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-kde4() {
- pkgdesc="Plug-in for LibreOffice that enables integration into the KDE4 desktop environment."
- depends=('libreoffice-common' 'kdelibs')
- optdepends=()
- backup=()
- groups=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/kde4_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/kde4_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-
- # one file (libkde4be1lo.so) is part of kde_list.txt
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/kde_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/kde_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-math() {
- pkgdesc="Equation Editor Application for LibreOffice."
- depends=('libreoffice-common')
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/math_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/math_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-sdk() {
- pkgdesc="Software Development Kit for LibreOffice."
- depends=('libreoffice-common' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment')
- groups=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/sdk_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/sdk_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-
-  # fix environment path to keep compatibility with other java-environments
-#  sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh}
-  sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.sh
-}
-
-package_libreoffice-sdk-doc() {
- pkgdesc="Software Development Kit documentation for LibreOffice"
- depends=('libreoffice-common' 'libreoffice-sdk')
- groups=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/sdk_doc_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/sdk_doc_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-
- #fix permissions
- find ${pkgdir}/usr/lib/libreoffice/sdk/examples -type f -exec chmod -x {} \;
-}
-
-package_libreoffice-writer() {
- pkgdesc="Word Processor Application for LibreOffice."
- install=libreoffice-writer.install
- depends=('libreoffice-common' 'libwpd>=0.9.2' 'libwps' 'libxml2')
- optdepends=('libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images')
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/writer_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/writer_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-
- # for workaround this file belongs now to common
- rm -vf ${pkgdir}/usr/lib/libreoffice/share/registry/writer.xcd
-}
-
-package_libreoffice-en-US() {
-  pkgdesc="English (US) language pack for LibreOffice"
-  #arch=('any')
-  provides=('openoffice-en-US' 'libreoffice-langpack')
-  replaces=(openoffice-en-US)
-  conflicts=(openoffice-en-US)
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/lang_en_US_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/lang_en_US_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-extension-wiki-publisher() {
-
- pkgdesc="This extension enables you to create Wiki articles on MediaWiki servers without having to know the syntax of the MediaWiki markup language"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
+	# fix environment path to keep compatibility with other java-environments
+	sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.sh
+	
+	# fix permissions
+	find ${pkgdir}/usr/lib/libreoffice/sdk/examples -type f -exec chmod -x {} \;
+	
+	# add extensions
 	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
 	unzip -q ${srcdir}/libreoffice-$_LOver/workdir/Extension/wiki-publisher.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher
-}
-
-package_libreoffice-extension-nlpsolver() {
-
- pkgdesc="This extension integrates into Calc and offers new Solver engines to use for optimizing nonlinear programming models"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
 	unzip -q ${srcdir}/libreoffice-$_LOver/workdir/Extension/nlpsolver.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/nlpsolver
 }

Deleted: libreoffice-base.install
===================================================================
--- libreoffice-base.install	2014-05-23 19:13:03 UTC (rev 213422)
+++ libreoffice-base.install	2014-05-23 21:11:15 UTC (rev 213423)
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  update-desktop-database -q
-}
-
-post_remove() {
-  update-desktop-database -q
-}

Deleted: libreoffice-calc.install
===================================================================
--- libreoffice-calc.install	2014-05-23 19:13:03 UTC (rev 213422)
+++ libreoffice-calc.install	2014-05-23 21:11:15 UTC (rev 213423)
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  update-desktop-database -q
-}
-
-post_remove() {
-  update-desktop-database -q
-}

Deleted: libreoffice-common.install
===================================================================
--- libreoffice-common.install	2014-05-23 19:13:03 UTC (rev 213422)
+++ libreoffice-common.install	2014-05-23 21:11:15 UTC (rev 213423)
@@ -1,47 +0,0 @@
-post_install() {
-
-xdg-icon-resource forceupdate --theme hicolor
-update-desktop-database -q
-update-mime-database usr/share/mime > /dev/null 2>&1
-
-echo " * see https://wiki.archlinux.org/index.php/LibreOffice"
-echo "-------------------------------------------------------------------"
-echo "LibreOffice has been split into several packages:"
-echo "- libreoffice-common"
-echo "- libreoffice-{base,calc,draw,impress,math,writer} - frontend applications"
-echo "- libreoffice-{gnome,kde4} - desktop integration plugins"
-echo "- libreoffice-{sdk,sdk-doc} - add-on and doc for programming using"
-echo "                              the LibreOffice APIs and for creating"
-echo "                              extensions (UNO components)."
-echo "-------------------------------------------------------------------"
-echo " * you need to install at least one libreoffice-langpack"
-echo " * you may want to pacman -Ss libreoffice-extensions"
-echo "   to see what additional extensions are prepared to install"
-echo " * it's recommended to install {hunspell,mythes,hyphen}-xx pkg
-         for spell checking"
-echo " * make sure you have installed some ttf font (ttf-dejavu recommended)"
-}
-
-post_upgrade() {
-#  post_install $1
-xdg-icon-resource forceupdate --theme hicolor
-update-desktop-database -q
-update-mime-database usr/share/mime > /dev/null 2>&1
-  if [ "`vercmp $2 3.4.2rc1`" -lt 0 ]; then
-    # important upgrade notice
-    echo "LibreOffice has been split into several packages:"
-    echo "- libreoffice-common"
-    echo "- libreoffice-{base,calc,draw,impress,math,writer} - frontend applications"
-    echo "- libreoffice-{gnome,kde4} - desktop integration plugins"
-    echo "- libreoffice-{sdk,sdk-doc} - add-on and doc for programming using"
-    echo "                              the LibreOffice APIs and for creating"
-    echo "                              extensions (UNO components)."
-    echo "Now you need to install at least one libreoffice-langpack!"
-  fi
-}
-
-post_remove() {
-update-desktop-database -q
-xdg-icon-resource forceupdate --theme hicolor
-update-mime-database usr/share/mime > /dev/null 2>&1
-}

Deleted: libreoffice-draw.install
===================================================================
--- libreoffice-draw.install	2014-05-23 19:13:03 UTC (rev 213422)
+++ libreoffice-draw.install	2014-05-23 21:11:15 UTC (rev 213423)
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  update-desktop-database -q
-}
-
-post_remove() {
-  update-desktop-database -q
-}

Copied: libreoffice-fresh/trunk/libreoffice-fresh.install (from rev 213414, libreoffice-fresh/trunk/libreoffice-common.install)
===================================================================
--- libreoffice-fresh.install	                        (rev 0)
+++ libreoffice-fresh.install	2014-05-23 21:11:15 UTC (rev 213423)
@@ -0,0 +1,13 @@
+post_install() {
+  xdg-icon-resource forceupdate --theme hicolor
+  update-desktop-database -q
+  update-mime-database usr/share/mime > /dev/null 2>&1
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}

Deleted: libreoffice-impress.install
===================================================================
--- libreoffice-impress.install	2014-05-23 19:13:03 UTC (rev 213422)
+++ libreoffice-impress.install	2014-05-23 21:11:15 UTC (rev 213423)
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  update-desktop-database -q
-}
-
-post_remove() {
-  update-desktop-database -q
-}

Deleted: libreoffice-writer.install
===================================================================
--- libreoffice-writer.install	2014-05-23 19:13:03 UTC (rev 213422)
+++ libreoffice-writer.install	2014-05-23 21:11:15 UTC (rev 213423)
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  update-desktop-database -q
-}
-
-post_remove() {
-  update-desktop-database -q
-}




More information about the arch-commits mailing list