parches de gob.mx: fonts y logo
Subpaquete de fonts GMX Se habilitan los more_fonts, donde viene el font GMX Se omiten los more_fonts que ya proporciona la distro
This commit is contained in:
parent
cade9e8fef
commit
d7f3fb320e
1 changed files with 60 additions and 34 deletions
|
|
@ -50,7 +50,7 @@ Summary: Free Software Productivity Suite
|
|||
Name: libreoffice
|
||||
Epoch: 1
|
||||
Version: %{libo_version}.2
|
||||
Release: 3+gob.mx%{?libo_prerelease}%{?dist}
|
||||
Release: 4+gob.mx%{?libo_prerelease}%{?dist}
|
||||
# default new files are: MPLv2
|
||||
# older files are typically: MPLv2 incorporating work under ASLv2
|
||||
# nlpsolver is: LGPLv3
|
||||
|
|
@ -81,7 +81,26 @@ Source11: %{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zi
|
|||
#backwards compatability.
|
||||
Source12: %{external_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
|
||||
Source13: %{external_url}/../extern/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
|
||||
Source14: https://repos.libreoffice.gob.mx/src/gmx-fonts.tar.gz
|
||||
# Fonts GMX (gob.mx)
|
||||
Source21: https://repos.libreoffice.gob.mx/src/gmx-fonts.tar.gz
|
||||
# Source22: licenciade GMX
|
||||
# More fonts
|
||||
Source23: %{external_url}/368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz
|
||||
Source24: %{external_url}/c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz
|
||||
Source25: %{external_url}/33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip
|
||||
Source26: %{external_url}/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip
|
||||
Source27: %{external_url}/liberation-narrow-fonts-ttf-1.07.6.tar.gz
|
||||
Source28: %{external_url}/liberation-fonts-ttf-2.1.4.tar.gz
|
||||
Source29: %{external_url}/e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip
|
||||
Source30: %{external_url}/edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz
|
||||
Source31: %{external_url}/noto-fonts-20171024.tar.gz
|
||||
Source32: %{external_url}/culmus-0.133.tar.gz
|
||||
Source33: %{external_url}/libre-hebrew-1.0.tar.gz
|
||||
Source34: %{external_url}/alef-1.001.tar.gz
|
||||
Source35: %{external_url}/Amiri-1.000.zip
|
||||
Source36: %{external_url}/ReemKufi-1.2.zip
|
||||
Source37: %{external_url}/Scheherazade-2.100.zip
|
||||
|
||||
%global bundling_options %{?bundling_options} --without-system-hsqldb
|
||||
|
||||
Provides: bundled(hsqldb) = 1.8.0
|
||||
|
|
@ -333,6 +352,7 @@ filters.
|
|||
|
||||
%package core
|
||||
Summary: Core modules for LibreOffice
|
||||
Requires: %{name}-gmx-fonts = %{epoch}:%{version}-%{release}
|
||||
Requires: %{name}-%{fontname}-fonts = %{epoch}:%{version}-%{release}
|
||||
Requires: %{name}-ure%{?_isa} = %{epoch}:%{version}-%{release}
|
||||
Requires: %{name}-data = %{epoch}:%{version}-%{release}
|
||||
|
|
@ -459,6 +479,14 @@ BuildArch: noarch
|
|||
A dingbats font, OpenSymbol, suitable for use by LibreOffice for bullets and
|
||||
mathematical symbols.
|
||||
|
||||
%package gmx-fonts
|
||||
Summary: gob.mx font
|
||||
Requires: fontpackages-filesystem
|
||||
BuildArch: noarch
|
||||
|
||||
%description gmx-fonts
|
||||
Fuente oficial del gobierno de México.
|
||||
|
||||
%package writer
|
||||
Summary: LibreOffice Word Processor Application
|
||||
Requires: %{name}-core%{?_isa} = %{epoch}:%{version}-%{release}
|
||||
|
|
@ -1052,30 +1080,19 @@ git rm vcl/qa/cppunit/graphicfilter/data/tiff/fail/CVE-2017-9936-1.tiff
|
|||
# Pruebas unitarias que fallaban en 7.4.6
|
||||
#sed -i -e /CppunitTest_dbaccess_dialog_save/d dbaccess/Module_dbaccess.mk
|
||||
#sed -i -e /CppunitTest_dbaccess_empty_stdlib_save/d dbaccess/Module_dbaccess.mk
|
||||
sed -i -e /CppunitTest_sdext_pdfimport/d sdext/Module_sdext.mk
|
||||
sed -i -e /CppunitTest_sw_uiwriter6/d sw/Module_sw.mk
|
||||
sed -i -e /CppunitTest_sdext_pdfimport/d sdext/Module_sdext.mk
|
||||
sed -i -e /CppunitTest_sw_uiwriter6/d sw/Module_sw.mk
|
||||
# Pruebas unitarias que fallaban en 7.5.0
|
||||
sed -i -e /CppunitTest_sw_core_layout/d sw/Module_sw.mk
|
||||
sed -i -e /CppunitTest_sw_core_layout/d sw/Module_sw.mk
|
||||
# Pruebas unitarias que fallaban en 7.5.1
|
||||
sed -i -e /CppunitTest_sw_layoutwriter2/d sw/Module_sw.mk
|
||||
sed -i -e /CppunitTest_sw_layoutwriter2/d sw/Module_sw.mk
|
||||
# Pruebas que fallan en la 7.5.5
|
||||
sed -i -e /CppunitTest_sw_layoutwriter/d sw/Module_sw.mk
|
||||
sed -i -e /CppunitTest_sw_layoutwriter\\s/d sw/Module_sw.mk
|
||||
|
||||
%endif
|
||||
|
||||
# More fonts que no nos interesa embeber
|
||||
# Los debe proveer la distro.
|
||||
for FONT in alef amiri caladea carlito dejavu gentium liberation liberation_narrow \
|
||||
noto culmus libertineg libre_hebrew sourcesans reem scheherazade ; do
|
||||
sed -i -e /UnpackedTarball_${FONT}/d external/more_fonts/Module_more_fonts.mk
|
||||
sed -i -e /ExternalPackage_${FONT}/d external/more_fonts/Module_more_fonts.mk
|
||||
rm -vf external/more_fonts/ExternalPackage_${FONT}.mk
|
||||
rm -vf external/more_fonts/UnpackedTarball_${FONT}.mk
|
||||
sed -i -e /fonts_${FONT}/d Repository.mk
|
||||
done
|
||||
git commit -q -a -m 'temporarily disable failing tests'
|
||||
|
||||
|
||||
# Seeing .git dir makes some of the build tools change their behavior.
|
||||
# We do not want that. Note: it is still possible to use
|
||||
# git --git-dir=.git-rpm
|
||||
|
|
@ -1126,7 +1143,8 @@ SMP_MFLAGS=$[${SMP_MFLAGS/-j/}]
|
|||
%define flatpakoptions --with-beanshell-jar=/app/share/java/bsh.jar --with-boost-libdir=%{_libdir} --with-external-dict-dir=/app/share/hunspell --with-external-hyph-dir=/app/share/hyphen --with-external-thes-dir=/app/share/mythes --with-flute-jar=/app/share/java/flute.jar --with-jdk-home=/app/lib/jvm/java --with-jfreereport-jar=/app/share/java/flow-engine.jar --with-libbase-jar=/app/share/java/libbase.jar --with-libfonts-jar=/app/share/java/libfonts.jar --with-libformula-jar=/app/share/java/libformula.jar --with-liblayout-jar=/app/share/java/liblayout.jar --with-libloader-jar=/app/share/java/libloader.jar --with-librepository-jar=/app/share/java/librepository.jar --with-libserializer-jar=/app/share/java/libserializer.jar --with-libxml-jar=/app/share/java/libxml.jar --with-sac-jar=/app/share/java/sac.jar FIREBIRDCONFIG=%{_libdir}/fb_config QT4INC=%{_includedir}
|
||||
%endif
|
||||
|
||||
%define gobmxoptions --with-branding=custom_images --with-product-name=Office --disable-community-flavor
|
||||
#define gobmxoptions --with-branding=custom_images --with-product-name=Office --disable-community-flavor
|
||||
%define gobmxoptions --with-branding=custom_images --disable-community-flavor
|
||||
|
||||
# TODO: enable coinmp?
|
||||
# avoid running autogen.sh on make
|
||||
|
|
@ -1203,16 +1221,6 @@ rm -rf $WORKDIR/CxxObject $WORKDIR/GenCxxObject $WORKDIR/HelpTarget $WORKDIR/Lin
|
|||
. ./bin/get_config_variables PRODUCTVERSIONSHORT PRODUCTVERSION SRCDIR WORKDIR
|
||||
export PRODUCTVERSIONSHORT PRODUCTVERSION
|
||||
|
||||
#for FONT in alef amiri caladea carlito dejavu gentium liberation liberation_narrow \
|
||||
# noto culmus libertineg libre_hebrew sourcesans reem scheherazade ; do
|
||||
# sed -i -e /auto_ooo_fonts_pkg_fonts_${FONT}/,+4d workdir/InstallScriptTarget/setup_osl.ins
|
||||
# sed -i -e /auto_ooo_fonts_pkg_fonts_${FONT}/,+4d workdir/ScpTarget/scp2/source/ooo/module_hidden_ooo.par
|
||||
# sed -i -e /auto_ooo_fonts_pkg_fonts_${FONT}/d workdir/AutoInstall/ooo_fonts
|
||||
# sed -i -e /auto_ooo_fonts_pkg_fonts_${FONT}\\sDir/d workdir/ScpPreprocessTarget/scp2/source/ooo/module_hidden_ooo.pre
|
||||
# sed -i -e s/,\\s\\+auto_ooo_fonts_pkg_fonts_${FONT}// workdir/ScpPreprocessTarget/scp2/source/ooo/module_hidden_ooo.pre
|
||||
# sed -i -e /fonts_${FONT}/d Repository.mk
|
||||
#done
|
||||
|
||||
# installation
|
||||
|
||||
install -m 0755 -d %{buildroot}%{instdir}
|
||||
|
|
@ -1336,8 +1344,18 @@ pushd %{buildroot}%{baseinstdir}/program/resource/common/fonts
|
|||
install -d -m 0755 %{buildroot}%{_fontdir}
|
||||
install -p -m 0644 *.ttf %{buildroot}%{_fontdir}
|
||||
popd
|
||||
rm -rf %{buildroot}%{baseinstdir}/program/resource/common/fonts/*ttf
|
||||
rm -rf %{buildroot}%{baseinstdir}/share/fonts/truetype/*.ttf
|
||||
|
||||
# Fonts GMX
|
||||
pushd %{buildroot}%{baseinstdir}/share/fonts/truetype
|
||||
#install -d -m 0755 %{buildroot}%{baseinstdir}/share/fonts/gmx
|
||||
#install -p -m 0644 GMX-* %{buildroot}%{baseinstdir}/share/fonts/gmx
|
||||
install -d -m 0755 %{buildroot}%{_datadir}/fonts/gmx
|
||||
install -p -m 0644 GMX-* %{buildroot}%{_datadir}/fonts/gmx
|
||||
popd
|
||||
|
||||
rm -vf %{buildroot}%{baseinstdir}/program/resource/common/fonts/*ttf
|
||||
rm -vf %{buildroot}%{baseinstdir}/share/fonts/truetype/*.ttf
|
||||
rm -vf %{buildroot}%{baseinstdir}/share/fonts/truetype/*.otf
|
||||
|
||||
# move platform-independent data into shared dir
|
||||
install -m 0755 -d %{buildroot}%{datadir}
|
||||
|
|
@ -2005,6 +2023,10 @@ rm -rvf %{buildroot}%{libo_python_sitearch}/__pycache__
|
|||
%_font_pkg -n %{fontname} opens___.ttf
|
||||
%doc instdir/LICENSE
|
||||
|
||||
%files gmx-fonts
|
||||
#{baseinstdir}/share/fonts/gmx/GMX-*
|
||||
%{_datadir}/fonts/gmx/GMX-*
|
||||
|
||||
%files calc
|
||||
%if 0%{?fedora}
|
||||
%{baseinstdir}/program/calc.abignore
|
||||
|
|
@ -2319,10 +2341,14 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || :
|
|||
%{_includedir}/LibreOfficeKit
|
||||
|
||||
%changelog
|
||||
* Tue Aug 08 2023 Sandino Araico Sánchez <sandino@sandino.net> - 1:7.5.5.2-3+gob.mx
|
||||
* Thu Aug 17 2023 Sandino Araico Sánchez <sandino@sandino.net> - 1:7.5.5.2-4+gob.mx
|
||||
- Se cambió la ruta de gmx-fonts a /usr/share/fonts/gmx
|
||||
|
||||
* Wed Aug 16 2023 Sandino Araico Sánchez <sandino@sandino.net> - 1:7.5.5.2-3+gob.mx
|
||||
- parches de gob.mx: fonts y logo
|
||||
- se quitó la opción de compilación --without-fonts
|
||||
- Se quitaron los fonts que no vienen incluídos en las fuentes y que ya proporciona la distro
|
||||
- se quitó la opción de compilación --without-fonts para habilitar el font GMX
|
||||
- subpaquete de fonts GMX
|
||||
- Se omiten los fonts que no vienen incluídos en las fuentes y que ya proporciona la distro
|
||||
|
||||
* Sat Jul 29 2023 Sandino Araico Sánchez <sandino@sandino.net> - 1:7.5.5.2-2+gob.mx
|
||||
- merge gob.mx
|
||||
|
|
|
|||
Loading…
Reference in a new issue