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 0000000..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

Reply via email to