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

Change vendor to ROSA

Browse source
This commit is contained in:
Andrew Lukoshko 2013-08-08 15:42:52 +03:00
parent 4f862f4d00
commit 6316a7c4c4
2 changed files with 57 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
libreoffice-4.0-vendor.patch Normal file
View file

@ -0,0 +1,50 @@
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 @@
fi
if test "$SPLIT_OPT_FEATURES" = "YES" ; then
- if test "z$OOO_VENDOR" = "zMandriva" ; then
+ 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 @@
# lang packs
for lang in `echo $WITH_LANG_LIST | sed -e s/-/_/g`; do
lang_lists=
- if test "$OOO_VENDOR" = "Mandriva" -o \( "$OOO_VENDOR" = "SUSE" -a "$SPLIT_APP_MODULES" = "YES" \) ; then
+ if test "$OOO_VENDOR" = "ROSA" -o \( "$OOO_VENDOR" = "SUSE" -a "$SPLIT_APP_MODULES" = "YES" \) ; then
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 @@
fi
# some help files are in _Langpack_{Writer,Impress,...}_<lang>
# move them from -l10n to -help
- if test "$OOO_VENDOR" = "Mandriva" -o \( "$OOO_VENDOR" = "SUSE" -a "$SPLIT_APP_MODULES" = "YES" \) ; then
+ if test "$OOO_VENDOR" = "ROSA" -o \( "$OOO_VENDOR" = "SUSE" -a "$SPLIT_APP_MODULES" = "YES" \) ; then
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 @@
# mailmerge
if test "$SPLIT_OPT_FEATURES" = "YES" ; then
- if test "z$OOO_VENDOR" = "zMandriva" ; then
+ if test "z$OOO_VENDOR" = "zROSA" ; then
flist=pyuno_list.txt
else
flist=mailmerge_list.txt
@@ -292,8 +292,8 @@
fi
- # Mandriva packaging
- if test "$OOO_VENDOR" = "Mandriva"; then
+ # ROSA packaging
+ if test "$OOO_VENDOR" = "ROSA"; then
# Not used
remove_file common_list.txt $INSTALLDIR/share/gallery/htmltheme.orig
remove_file common_list.txt $INSTALLDIR/share/dict/ooo/dictionary.lst

8
libreoffice.spec
View file

@ -305,6 +305,9 @@ Patch5: libreoffice-3.5.2-no-slackwareicons.patch
# bug fix 64789
Patch13: help-images-mdv64789.patch
# ROSA vendor patch
Patch100: libreoffice-4.0-vendor.patch
%description
LibreOffice is an Open Source, community-developed, multi-platform
office productivity suite. It includes the key desktop applications,
@ -3371,6 +3374,9 @@ tar -xjvf %{SOURCE60}
%patch5 -p1 -b .noslack~
%patch13 -p1 -b .xmlhelp~
# ROSA vendor patch
%patch100 -p1
# Add lzma support (REVIEW)
%if %{oootarext} == "lzma"
%patch1 -p1 -b .lzma
@ -3437,7 +3443,7 @@ ENVCXXFLAGS="%{optflags} %{optsafe} -g0 -fno-omit-frame-pointer -fno-strict-alia
--mandir=%{_mandir} \
--infodir=%{_infodir} \
--with-distro=%{distroname} \
--with-vendor=Mandriva \
--with-vendor=ROSA \
--with-build-version="%{buildver}" \
--with-system-stdlibs \
--enable-lockdown \