0234611c59
Automatic submission by obs-autosubmit OBS-URL: https://build.opensuse.org/request/show/123152 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=33
86 lines
4.5 KiB
Diff
86 lines
4.5 KiB
Diff
Index: bin/distro-install-file-lists
|
|
===================================================================
|
|
--- bin/distro-install-file-lists.orig
|
|
+++ bin/distro-install-file-lists
|
|
@@ -74,7 +74,6 @@ if test "z$OOO_VENDOR" != "zDebian" ; th
|
|
|
|
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 \
|
|
@@ -82,6 +81,9 @@ if test "z$OOO_VENDOR" != "zDebian" ; th
|
|
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
|
|
@@ -114,6 +116,15 @@ if test "z$OOO_VENDOR" != "zDebian" ; th
|
|
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
|
|
@@ -203,6 +214,9 @@ if test "z$OOO_VENDOR" != "zDebian" ; th
|
|
|
|
cd $FILELISTSDIR
|
|
|
|
+ # postgresql subpackage
|
|
+ test -f $DESTDIR/gid_Module_Optional_PostgresqlSdbc && cp $DESTDIR/gid_Module_Optional_PostgresqlSdbc postgresql_list.txt || :
|
|
+
|
|
# kde subpackage
|
|
test -f $DESTDIR/gid_Module_Optional_Kde && cp $DESTDIR/gid_Module_Optional_Kde kde_list.txt || :
|
|
mv_file_between_flists kde_list.txt common_list.txt $INSTALLDIR/program/kdefilepicker
|
|
@@ -237,6 +251,7 @@ if test "z$OOO_VENDOR" != "zDebian" ; th
|
|
# add the files from GAC if it was installed
|
|
test -f $SRC_ROOT/mono_extra_list.txt && cat $SRC_ROOT/mono_extra_list.txt >>mono_list.txt
|
|
|
|
+
|
|
# mailmerge
|
|
if test "$SPLIT_OPT_FEATURES" = "YES" ; then
|
|
if test "z$OOO_VENDOR" = "zMandriva" ; then
|
|
@@ -248,8 +263,9 @@ if test "z$OOO_VENDOR" != "zDebian" ; th
|
|
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
|
|
@@ -268,17 +284,6 @@ if test "z$OOO_VENDOR" != "zDebian" ; th
|
|
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
|