[Frugalware-git] frugalware-current: openoffice.org-3.2.0-1-i686
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b363670fb9bddb844a6164b500c1aa1ef22815ad commit b363670fb9bddb844a6164b500c1aa1ef22815ad Author: Miklos Vajna vmik...@frugalware.org Date: Fri Mar 26 01:28:16 2010 +0100 openoffice.org-3.2.0-1-i686 - no relbump yet - backport package-ooo.diff from git (commit 722308a) - as a result, fps_kde4.uno.so is not in the right -kde subpackage :) - thanks bouleetbil for noticing the bug diff --git a/source/xapps/openoffice.org/FrugalBuild b/source/xapps/openoffice.org/FrugalBuild index 64655b2..d141737 100644 --- a/source/xapps/openoffice.org/FrugalBuild +++ b/source/xapps/openoffice.org/FrugalBuild @@ -42,8 +42,8 @@ if ! Fuse $USE_DEVEL; then else up2date=lynx -source -dump http://cgit.freedesktop.org/ooo-build/ooo-build/plain/configure.in?h=ooo-build$branch |grep ^DEFAULT_TAG|sed 's/DEFAULT_TAG=\(.*\)-\(.*\)/$upstream\1_\2/' fi -source=(http://ftp.frugalware.org/pub/other/sources/ooo-build/ooo-build$branch-$snapshot.tar.bz2 http://git.frugalware.org/tarballs/openoffice.org/$tree-m$milestone-{artwork,base,bootstrap,calc,components,extras,filters,help,impress,libs-gui,libs-core,libs-extern,postprocess,sdk,testing,ure,writer,libs-extern-sys,extensions,l10n}.tar.bz2) -signatures=($source.asc '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '') +source=(http://ftp.frugalware.org/pub/other/sources/ooo-build/ooo-build$branch-$snapshot.tar.bz2 http://git.frugalware.org/tarballs/openoffice.org/$tree-m$milestone-{artwork,base,bootstrap,calc,components,extras,filters,help,impress,libs-gui,libs-core,libs-extern,postprocess,sdk,testing,ure,writer,libs-extern-sys,extensions,l10n}.tar.bz2 package-ooo.diff) +signatures=($source.asc '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '') NOEXTRACT=1 options=(${optio...@]} 'scriptlet') @@ -239,8 +239,11 @@ build() done ## Split KDE stuff - Fsplit $pkgname-kde $(grep -v '^%dir' build/kde_list.txt) - rm build/kde_list.txt + Fsplit $pkgname-kde $(grep -v '^%dir' build/kde4_list.txt) + rm build/kde4_list.txt + # We don't want a kde3 subpackage (but in case it's not empty + # something is broken, so check for it) + [ -e build/kde_list.txt -a ! -s build/kde_list.txt ] rm build/kde_list.txt ## Split GNOME stuff Fsplit $pkgname-gnome $(grep -v '^%dir' build/gnome_list.txt) diff --git a/source/xapps/openoffice.org/package-ooo.diff b/source/xapps/openoffice.org/package-ooo.diff new file mode 100644 index 000..6d248a7 --- /dev/null +++ b/source/xapps/openoffice.org/package-ooo.diff @@ -0,0 +1,24 @@ +diff --git a/bin/package-ooo b/bin/package-ooo +index 50ceaf1..4f2644f 100755 +--- a/bin/package-ooo b/bin/package-ooo +@@ -620,10 +620,17 @@ if test z$VENDORNAME != zDebian ; then + test -f $OODESTDIR/gid_Module_Optional_Kde cp $OODESTDIR/gid_Module_Optional_Kde kde_list.txt || : + mv_file_between_flists kde_list.txt common_list.txt $OOINSTBASE/program/kdefilepicker + mv_file_between_flists kde_list.txt common_list.txt $OOINSTBASE/basis$VERSION/program/fps_kde.uno.so +- mv_file_between_flists kde_list.txt common_list.txt $OOINSTBASE/basis$VERSION/program/libvclplug_kde[0-9]*l..so ++ mv_file_between_flists kde_list.txt common_list.txt $OOINSTBASE/basis$VERSION/program/libvclplug_kdel..so + mv_file_between_flists kde_list.txt common_list.txt $OOINSTBASE/basis$VERSION/program/libkabdrv1.so + add_used_directories kde_list.txt common_list.txt +- ++ ++ # create kde4 subpackage ++ rm -f kde4_list.txt ++ mv_file_between_flists kde4_list.txt kde_list.txt $OOINSTBASE/basis$VERSION/program/kde4be1.uno.so ++ mv_file_between_flists kde4_list.txt common_list.txt $OOINSTBASE/basis$VERSION/program/libvclplug_kde4l..so ++ mv_file_between_flists kde4_list.txt common_list.txt $OOINSTBASE/basis$VERSION/program/fps_kde4.uno.so ++ add_used_directories kde4_list.txt common_list.txt ++ + # gnome subpackage + rm -f gnome_list.txt + test -f $OODESTDIR/gid_Module_Optional_Gnome cp $OODESTDIR/gid_Module_Optional_Gnome gnome_list.txt || : ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: openoffice.org-3.2.0-1-i686
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=137a7dafc50fbb5b44bd5d716779c40677444d5c commit 137a7dafc50fbb5b44bd5d716779c40677444d5c Author: Miklos Vajna vmik...@frugalware.org Date: Tue Feb 9 13:58:32 2010 +0100 openoffice.org-3.2.0-1-i686 - version bump - new langpacks: 'bo' 'is' 'kid' 'ky' 'om' 'pap' 'ps' 'si' 'ug' - new dicts: 'ca' 'he' 'ro' diff --git a/source/xapps/openoffice.org/FrugalBuild b/source/xapps/openoffice.org/FrugalBuild index cfa6357..64655b2 100644 --- a/source/xapps/openoffice.org/FrugalBuild +++ b/source/xapps/openoffice.org/FrugalBuild @@ -5,21 +5,21 @@ pkgname=openoffice.org USE_DEVEL=${USE_DEVEL:-n} if ! Fuse $USE_DEVEL; then - upstream=3.1.1 - branch=-3-1-1 - tree=ooo310 - milestone=19 + upstream=3.2.0 + branch=-3-2 + tree=ooo320 + milestone=12 pkgver=$upstream pkgrel=1 - snapshot=1-20-gcbafe1f + snapshot=0-5-7-g045191c else upstream=3.2.0 branch=-3-2 tree=ooo320 - milestone=11 + milestone=12 pkgver=$upstream${tree}_m$milestone - pkgrel=2 - snapshot=104-g94c60f5 + pkgrel=1 + snapshot=0-5-7-g045191c fi pkgdesc=OpenOffice.org, a full office productivity suite. url=http://www.openoffice.org/; @@ -65,12 +65,12 @@ subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64') subgroups=('kde-extra' 'gnome-extra' 'devel-extra' 'devel-extra' 'xapps') subinstall=( $_F_gnome_scriptlet ) -ooodicts=af cs da de es et fr gl hu it lt ne nl pl pt ru sk sl sr sv sw th vi zu +ooodicts=af cs da de es et fr gl hu it lt ne nl pl pt ru sk sl sr sv sw th vi zu ca he ro ooosubpkgs=('de' 'es' 'fr' 'hu') ooosubdescs=('German' 'Spanish' 'French' 'Hungarian') if ! Fuse $USE_DEVEL; then - ooosubpkgs=(${ooosubpk...@]} 'af' 'ar' 'be-BY' 'bg' 'bn' 'bn-BD' 'bn-IN' 'br' 'bs' 'ca' 'cy' 'cs' 'da' 'el' 'en-GB' 'en-ZA' 'eo' 'et' 'eu' 'fi' 'ga' 'gl' 'gu-IN' 'he' 'hi-IN' 'hr' 'it' 'ja' 'km' 'kn-IN' 'ko' 'lo' 'lt' 'lv' 'mk' 'ms' 'nb' 'ne' 'nl' 'nn' 'nr' 'ns' 'pa-IN' 'pl' 'pt' 'pt-BR' 'ru' 'rw' 'sh-YU' 'sk' 'sl' 'sr-CS' 'ss' 'st' 'sv' 'sw' 'sw-TZ' 'sx' 'ta-IN' 'th' 'tn' 'tr' 'ts' 've' 'vi' 'xh' 'zh-CN' 'zh-TW' 'zu' 'fa' 'ku' 'as-IN' 'ml-IN' 'mr-IN' 'or-IN' 'te-IN' 'tg' 'ti-ER' 'uk' 'ur-IN' 'dz' 'ka' 'kn' 'sh' 'sr' 'uz' 'by' 'gd' 'gu' 'mn' 'my' 'oc' 'brx' 'dgo' 'kk' 'kok' 'ks' 'mai' 'mni' 'ro' 'sa-IN' 'sat' 'sc' 'sd') - ooosubdescs=(${ooosubdes...@]} 'Afrikaans' 'Arabic' 'Belarusian' 'Bulgarian' 'Bengali' 'Bengali (Bangladesh)' 'Bengali (India)' 'Breton' 'Bosnian' 'Catalan' 'Welsh' 'Czech' 'Danish' 'Greek' 'English (GB)' 'English (South Africa)' 'Esperanto' 'Estonian' 'Basque' 'Finnish' 'Irish' 'Galician' 'Gujarati' 'Hebrew' 'Hindi' 'Croatian' 'Italian' 'Japanese' 'Khmer (Cambodia)' 'Kannada' 'Korean' 'Lao' 'Lithuanian' 'Latvian' 'Macedonian' 'Malay' 'Norwegian Bokmal' 'Nepali' 'Dutch' 'Norwegian Nynorsk' 'Ndebele, South' 'NorthernSotho/Sepedi' 'Punjabi' 'Polish' 'Portuguese' 'Brazil (Port.)' 'Russian' 'Kinyarwanda' 'Serbian Latin' 'Slovak' 'Slovenian' 'Serbian Cyrillic' 'Swati' 'Sotho' 'Swedish' 'Swahili' 'Swahili ' 'South Georgian' 'Tamil' 'Thai' 'Tswana' 'Turkish' 'Tsonga' 'Venda' 'Vietnamese' 'Xhosa' 'Chinese (simplified)' 'Chinese (traditional)' 'Zulu' 'Persian' 'Kurdish' 'Assamese' 'Malayalam' 'Marathi' 'Oriya' 'Telugu' 'Tajik' 'Tigrinya' 'Ukrainian' 'Urdu' 'Dzongkha' 'Georgian' 'Kan nada' 'Serbo-Croatian' 'Serbian' 'Uzbek' 'Belarussian' 'Scottish Gaelic' 'Gujarati' 'Mongolian' 'Malay' 'Occitan' 'Bodo' 'Dogri' 'Kazakh' 'Konkani' 'Kashmiri' 'Maithili' 'Manipuri' 'Romanian' 'Sanskrit' 'Santali' 'Sardinian' 'Sindhi') + ooosubpkgs=(${ooosubpk...@]} 'af' 'ar' 'be-BY' 'bg' 'bn' 'bn-BD' 'bn-IN' 'br' 'bs' 'ca' 'cy' 'cs' 'da' 'el' 'en-GB' 'en-ZA' 'eo' 'et' 'eu' 'fi' 'ga' 'gl' 'gu-IN' 'he' 'hi-IN' 'hr' 'it' 'ja' 'km' 'kn-IN' 'ko' 'lo' 'lt' 'lv' 'mk' 'ms' 'nb' 'ne' 'nl' 'nn' 'nr' 'ns' 'pa-IN' 'pl' 'pt' 'pt-BR' 'ru' 'rw' 'sh-YU' 'sk' 'sl' 'sr-CS' 'ss' 'st' 'sv' 'sw' 'sw-TZ' 'sx' 'ta-IN' 'th' 'tn' 'tr' 'ts' 've' 'vi' 'xh' 'zh-CN' 'zh-TW' 'zu' 'fa' 'ku' 'as-IN' 'ml-IN' 'mr-IN' 'or-IN' 'te-IN' 'tg' 'ti-ER' 'uk' 'ur-IN' 'dz' 'ka' 'kn' 'sh' 'sr' 'uz' 'by' 'gd' 'gu' 'mn' 'my' 'oc' 'brx' 'dgo' 'kk' 'kok' 'ks' 'mai' 'mni' 'ro' 'sa-IN' 'sat' 'sc' 'sd' 'bo' 'is' 'kid' 'ky' 'om' 'pap' 'ps' 'si' 'ug') + ooosubdescs=(${ooosubdes...@]} 'Afrikaans' 'Arabic' 'Belarusian' 'Bulgarian' 'Bengali' 'Bengali (Bangladesh)' 'Bengali (India)' 'Breton' 'Bosnian' 'Catalan' 'Welsh' 'Czech' 'Danish' 'Greek' 'English (GB)' 'English (South Africa)' 'Esperanto' 'Estonian' 'Basque' 'Finnish' 'Irish' 'Galician' 'Gujarati' 'Hebrew' 'Hindi' 'Croatian' 'Italian' 'Japanese' 'Khmer (Cambodia)' 'Kannada' 'Korean' 'Lao' 'Lithuanian' 'Latvian' 'Macedonian' 'Malay' 'Norwegian Bokmal' 'Nepali' 'Dutch' 'Norwegian Nynorsk' 'Ndebele, South' 'NorthernSotho/Sepedi' 'Punjabi' 'Polish' 'Portuguese' 'Brazil (Port.)' 'Russian' 'Kinyarwanda'