Djam/libreoffice
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/libreoffice.git synced 2025-02-23 18:43:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rediff vendor patch

Browse source
This commit is contained in:
akdengi 2013-09-09 22:16:32 +04:00
parent c28497fdbf
commit f1623baa77
2 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
libreoffice-4.0-vendor.patch → libreoffice-4.1-vendor.patch
View file

@ -1,7 +1,6 @@
diff -Naur libreoffice-4.0.3.3/bin/distro-install-file-lists libreoffice-4.0.3.3.ROSA/bin/distro-install-file-lists
--- libreoffice-4.0.3.3/bin/distro-install-file-lists 2013-05-02 18:55:29.000000000 +0300
+++ libreoffice-4.0.3.3.ROSA/bin/distro-install-file-lists 2013-08-08 15:38:42.803997522 +0300
@@ -129,7 +129,7 @@
--- a/bin/distro-install-file-lists 2013-08-21 15:40:03.000000000 +0400
+++ b/bin/distro-install-file-lists 2013-09-09 22:09:30.051856888 +0400
@@ -135,7 +135,7 @@
fi
if test "$SPLIT_OPT_FEATURES" = "YES" ; then
@ -9,8 +8,8 @@ diff -Naur libreoffice-4.0.3.3/bin/distro-install-file-lists libreoffice-4.0.3.3
+ if test "z$OOO_VENDOR" = "zROSA" ; then
merge_flists gid_Module_Optional_Grfflt $FILELISTSDIR/draw_list.txt
merge_flists gid_Module_Optional_Headless $FILELISTSDIR/common_list.txt
merge_flists gid_Module_Optional_Javafilter $FILELISTSDIR/common_list.txt
@@ -162,7 +162,7 @@
merge_flists gid_Module_Optional_Pymailmerge $FILELISTSDIR/pyuno_list.txt
@@ -165,7 +165,7 @@
# lang packs
for lang in `echo $WITH_LANG_LIST | sed -e s/-/_/g`; do
lang_lists=
@ -19,7 +18,7 @@ diff -Naur libreoffice-4.0.3.3/bin/distro-install-file-lists libreoffice-4.0.3.3
test -f gid_Module_Langpack_Basis_$lang && lang_lists="$lang_lists gid_Module_Langpack_Basis_$lang" || :
test -f gid_Module_Langpack_Brand_$lang && lang_lists="$lang_lists gid_Module_Langpack_Brand_$lang" || :
test -f gid_Module_Langpack_Resource_$lang && lang_lists="$lang_lists gid_Module_Langpack_Resource_$lang" || :
@@ -193,7 +193,7 @@
@@ -196,7 +196,7 @@
fi
# some help files are in _Langpack_{Writer,Impress,...}_<lang>
# move them from -l10n to -help
@ -28,7 +27,7 @@ diff -Naur libreoffice-4.0.3.3/bin/distro-install-file-lists libreoffice-4.0.3.3
for lang in `echo $WITH_LANG_LIST | sed -e s/-/_/g`; do
test -f $FILELISTSDIR/help_${lang}_list.txt || continue;
mv_file_between_flists $FILELISTSDIR/help_${lang}_list.txt $FILELISTSDIR/lang_${lang}_list.txt $INSTALLDIR/help/.*
@@ -261,7 +261,7 @@
@@ -264,7 +264,7 @@
# mailmerge
if test "$SPLIT_OPT_FEATURES" = "YES" ; then
@ -37,7 +36,7 @@ diff -Naur libreoffice-4.0.3.3/bin/distro-install-file-lists libreoffice-4.0.3.3
flist=pyuno_list.txt
else
flist=mailmerge_list.txt
@@ -292,8 +292,8 @@
@@ -295,8 +295,8 @@
fi

2
libreoffice.spec
View file

@ -83,7 +83,7 @@ Patch3: libreoffice-4.1-libcmis-0.4.patch
#Patch4: libreoffice-4.1-poppler-0.24.patch
# ROSA vendor patch
Patch100: libreoffice-4.0-vendor.patch
Patch100: libreoffice-4.1-vendor.patch
%if %{use_icecream}
BuildRequires: icecream