summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetr Mladek <pmladek@suse.cz>2012-04-13 16:58:40 +0200
committerPetr Mladek <pmladek@suse.cz>2012-04-13 17:06:11 +0200
commitfc09ed737cef00baa7c5e0b206efac0cb36c1f7c (patch)
treeac14a50714cdaf45ea666f0f12801227062d8290
parent0d34f0ebcaf75863daaa608cc962ee888b2fa7e6 (diff)
distro-install-file-lists: handle new file lists that appeared for LO-3.5
Process the newly added file lists: + Script_Provider_For_Javascript + Script_Provider_For_Beanshell + PostgresqlSdbc + Files_Images
-rwxr-xr-xbin/distro-install-file-lists30
1 files changed, 17 insertions, 13 deletions
diff --git a/bin/distro-install-file-lists b/bin/distro-install-file-lists
index de32ddc5591a..014769c27b85 100755
--- a/bin/distro-install-file-lists
+++ b/bin/distro-install-file-lists
@@ -80,7 +80,6 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
rm -f common_list.txt
for module in gid_Module_Root gid_Module_Root_Brand \
- gid_Module_Root_Files_Images \
gid_Module_Root_Files_[0-9] \
gid_Module_Root_Hack \
gid_Module_Oo_Linguistic \
@@ -88,6 +87,9 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
merge_flists $module $FILELISTSDIR/common_list.txt
done
+ # it is not a real extension; it used to be in the main package...
+ merge_flists gid_Module_Optional_Extensions_Script_Provider_For_Javascript $FILELISTSDIR/common_list.txt
+
if test "$SPLIT_APP_MODULES" = "YES" ; then
merge_flists gid_Module_Prg_Base_Bin $FILELISTSDIR/base_list.txt
merge_flists gid_Module_Prg_Calc_Bin $FILELISTSDIR/calc_list.txt
@@ -120,6 +122,15 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
merge_flists gid_Module_Optional_OGLTrans $FILELISTSDIR/common_list.txt
fi
+ if test "$SPLIT_APP_MODULES" = "YES" -a "$OOO_VENDOR" = "Novell, Inc." ; then
+ # move the prebuilt icons into a hacky temporary package
+ # we want to repack them into a noarch package as soon as possible
+ # without the build dependency on the huge devel package
+ merge_flists gid_Module_Root_Files_Images $FILELISTSDIR/icon_themes_prebuilt.txt
+ else
+ merge_flists gid_Module_Root_Files_Images $FILELISTSDIR/common_list.txt
+ fi
+
if test "$SPLIT_OPT_FEATURES" = "YES" ; then
if test "z$OOO_VENDOR" = "zMandriva" ; then
merge_flists gid_Module_Optional_Binfilter $FILELISTSDIR/filter-binfilter_list.txt
@@ -238,6 +249,9 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
add_used_directories mono_list.txt common_list.txt
# add the files from GAC if it was installed
test -f mono_gac && cat mono_gac >>mono_list.txt
+
+ # postgresql subpackage
+ test -f $DESTDIR/gid_Module_Optional_PostgresqlSdbc && cp $DESTDIR/gid_Module_Optional_PostgresqlSdbc postgresql_list.txt || :
# mailmerge
if test "$SPLIT_OPT_FEATURES" = "YES" ; then
@@ -250,8 +264,9 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
add_used_directories $flist common_list.txt
fi
- if test "z$OOO_VENDOR" = "zNovell" ; then
+ if test "z$OOO_VENDOR" = "zNovell, Inc." ; then
# officebean subpackage
+ test -f $DESTDIR/gid_Module_Optional_Extensions_Script_Provider_For_Beanshell && cp $DESTDIR/gid_Module_Optional_Extensions_Script_Provider_For_Beanshell officebean_list.txt || :
mv_file_between_flists officebean_list.txt common_list.txt $INSTALLDIR/program/classes/officebean.jar
mv_file_between_flists officebean_list.txt common_list.txt $INSTALLDIR/program/libofficebean.so
add_used_directories officebean_list.txt common_list.txt
@@ -270,17 +285,6 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
add_used_directories sdk_doc_list.txt sdk_list.txt
fi
- if test "$OOO_VENDOR" = "Novell, Inc." -a "$SPLIT_APP_MODULES" = "YES" ; then
- # move the prebuilt icons into a hacky temporary package
- # we want to repack them into a noarch package as soon as possible
- # without the build dependency on the huge devel package
- mv_file_between_flists icon_themes_prebuilt.txt common_list.txt $INSTALLDIR/share/config/images_classic8.zip
- mv_file_between_flists icon_themes_prebuilt.txt common_list.txt $INSTALLDIR/share/config/images_crystal.zip
- mv_file_between_flists icon_themes_prebuilt.txt common_list.txt $INSTALLDIR/share/config/images_hicontrast.zip
- mv_file_between_flists icon_themes_prebuilt.txt common_list.txt $INSTALLDIR/share/config/images_industrial.zip
- mv_file_between_flists icon_themes_prebuilt.txt common_list.txt $INSTALLDIR/share/config/images_tango.zip
- mv_file_between_flists icon_themes_prebuilt.txt common_list.txt $INSTALLDIR/share/config/images.zip
- fi
# Mandriva packaging
if test "$OOO_VENDOR" = "Mandriva"; then