From dade916eb0e3d654d626276e5fbdbc4c5e50a098 Mon Sep 17 00:00:00 2001 From: Sandino Araico Sanchez Date: Mon, 24 Jun 2024 20:59:17 -0600 Subject: [PATCH] Updated gob.mx 1.2 patchset --- ...001-Archivos-de-distro-config-de-brand-Office.patch | 2 +- ...002-Modificacion-al-build-y-borrado-UPDATEURL.patch | 2 +- .../0003-Custom-images-and-referencies-added.patch | 2 +- rpmbuild/SOURCES/0004-Fuentes-monserrat-y-gmx.patch | 2 +- rpmbuild/SOURCES/0005-Fonts-added.patch | 2 +- .../SOURCES/0006-Modificado-archivo-tar-xz-a-gz.patch | 4 ++-- .../0007-Corregida-instrucci-n-de-descarga.patch | 2 +- rpmbuild/SOURCES/0008-Cambios-en-logo.patch | 2 +- .../0009-Modificado-link-de-descarga-de-fuentes.patch | 2 +- .../SOURCES/0010-Restauracion-link-repos-src.patch | 2 +- rpmbuild/SOURCES/0011-logo-image-updated.patch | 2 +- .../0012-Update-OfficeLinux.conf-with-lang-es.patch | 2 +- rpmbuild/SOURCES/0013-Update-OfficeLinux.conf.patch | 2 +- rpmbuild/SOURCES/0014-fix-error-make-install.patch | 2 +- rpmbuild/SOURCES/0015-Cambios-en-logo.patch | 2 +- .../0016-Felipe-Carrillo-Puerto-image-added.patch | 2 +- .../0017-Restaurar-el-cambio-de-copyright.patch | 2 +- ...r-with-package-version-de-nuestras-distro-con.patch | 2 +- ...inar-with-jdk-home-de-nuestras-distro-configs.patch | 2 +- rpmbuild/SPECS/libreoffice.spec | 10 ++++++++-- 20 files changed, 28 insertions(+), 22 deletions(-) diff --git a/rpmbuild/SOURCES/0001-Archivos-de-distro-config-de-brand-Office.patch b/rpmbuild/SOURCES/0001-Archivos-de-distro-config-de-brand-Office.patch index ff96b6b..d309aa1 100644 --- a/rpmbuild/SOURCES/0001-Archivos-de-distro-config-de-brand-Office.patch +++ b/rpmbuild/SOURCES/0001-Archivos-de-distro-config-de-brand-Office.patch @@ -1,4 +1,4 @@ -From 949ec941fcea1ae18aa602a2ea105d8e4d46d792 Mon Sep 17 00:00:00 2001 +From 1b55f6f6b91efdd1de3025dbd2bce026104a19ec Mon Sep 17 00:00:00 2001 From: Israel Paredes Date: Tue, 20 Jun 2023 02:26:13 -0400 Subject: [PATCH 01/19] Archivos de distro-config de brand Office diff --git a/rpmbuild/SOURCES/0002-Modificacion-al-build-y-borrado-UPDATEURL.patch b/rpmbuild/SOURCES/0002-Modificacion-al-build-y-borrado-UPDATEURL.patch index 1de70cb..a38c517 100644 --- a/rpmbuild/SOURCES/0002-Modificacion-al-build-y-borrado-UPDATEURL.patch +++ b/rpmbuild/SOURCES/0002-Modificacion-al-build-y-borrado-UPDATEURL.patch @@ -1,4 +1,4 @@ -From 496a343b1763119913e00e671f2e0b3694d36af2 Mon Sep 17 00:00:00 2001 +From 37041efced586f0bf56aeddd9503a912245909a5 Mon Sep 17 00:00:00 2001 From: Israel Paredes Date: Tue, 20 Jun 2023 02:29:16 -0400 Subject: [PATCH 02/19] Modificacion al build y borrado UPDATEURL diff --git a/rpmbuild/SOURCES/0003-Custom-images-and-referencies-added.patch b/rpmbuild/SOURCES/0003-Custom-images-and-referencies-added.patch index 72c9d7a..f0c8850 100644 --- a/rpmbuild/SOURCES/0003-Custom-images-and-referencies-added.patch +++ b/rpmbuild/SOURCES/0003-Custom-images-and-referencies-added.patch @@ -1,4 +1,4 @@ -From 0f8fa4398dc5e1f03d16966f08d4157eccda2ea5 Mon Sep 17 00:00:00 2001 +From 2d5e4c115fc83fc28d077fe94bbd1c950e940f85 Mon Sep 17 00:00:00 2001 From: Adlair Cerecedo-Mendez Date: Mon, 19 Jun 2023 18:44:48 -0600 Subject: [PATCH 03/19] Custom images and referencies added diff --git a/rpmbuild/SOURCES/0004-Fuentes-monserrat-y-gmx.patch b/rpmbuild/SOURCES/0004-Fuentes-monserrat-y-gmx.patch index 806afda..9cd4dc7 100644 --- a/rpmbuild/SOURCES/0004-Fuentes-monserrat-y-gmx.patch +++ b/rpmbuild/SOURCES/0004-Fuentes-monserrat-y-gmx.patch @@ -1,4 +1,4 @@ -From 378cc5ad58c3866488bc0229e16d6f3714278e3c Mon Sep 17 00:00:00 2001 +From ab48e5d8b266e50ba168c58d1a3ba599916f7a4b Mon Sep 17 00:00:00 2001 From: Israel Paredes Date: Thu, 20 Jul 2023 08:28:06 -0600 Subject: [PATCH 04/19] Fuentes monserrat y gmx diff --git a/rpmbuild/SOURCES/0005-Fonts-added.patch b/rpmbuild/SOURCES/0005-Fonts-added.patch index 54d4a0a..5599dc9 100644 --- a/rpmbuild/SOURCES/0005-Fonts-added.patch +++ b/rpmbuild/SOURCES/0005-Fonts-added.patch @@ -1,4 +1,4 @@ -From ee8676371a7d5c035dd51b49a949052e6dad9372 Mon Sep 17 00:00:00 2001 +From 0df3ee0d443227d03bd151dbe9d430a86aca071f Mon Sep 17 00:00:00 2001 From: Adlair Cerecedo-Mendez Date: Mon, 17 Jul 2023 21:13:49 -0600 Subject: [PATCH 05/19] Fonts added diff --git a/rpmbuild/SOURCES/0006-Modificado-archivo-tar-xz-a-gz.patch b/rpmbuild/SOURCES/0006-Modificado-archivo-tar-xz-a-gz.patch index f43a784..ebe26f2 100644 --- a/rpmbuild/SOURCES/0006-Modificado-archivo-tar-xz-a-gz.patch +++ b/rpmbuild/SOURCES/0006-Modificado-archivo-tar-xz-a-gz.patch @@ -1,4 +1,4 @@ -From 5bee1fe204eb8bffd9cb82ebefd3c7b44469a388 Mon Sep 17 00:00:00 2001 +From fdef54d83b3f6dda5e4dccde556bc75a7a47dcd3 Mon Sep 17 00:00:00 2001 From: Artukryp Date: Mon, 31 Jul 2023 20:23:12 -0600 Subject: [PATCH 06/19] Modificado archivo tar xz a gz @@ -8,7 +8,7 @@ Subject: [PATCH 06/19] Modificado archivo tar xz a gz 1 file changed, 3 insertions(+) diff --git a/download.lst b/download.lst -index b878f24e8068..d70deee6d28a 100644 +index 438359f38b65..9f675b2d8fe5 100644 --- a/download.lst +++ b/download.lst @@ -3,6 +3,9 @@ diff --git a/rpmbuild/SOURCES/0007-Corregida-instrucci-n-de-descarga.patch b/rpmbuild/SOURCES/0007-Corregida-instrucci-n-de-descarga.patch index 690f2be..723dc11 100644 --- a/rpmbuild/SOURCES/0007-Corregida-instrucci-n-de-descarga.patch +++ b/rpmbuild/SOURCES/0007-Corregida-instrucci-n-de-descarga.patch @@ -1,4 +1,4 @@ -From 6617ca26d78a48b58fdf0b0f01cdfeb6360bd10b Mon Sep 17 00:00:00 2001 +From 92412588b836b3072ab6ea851b05482dea81adb5 Mon Sep 17 00:00:00 2001 From: Artukryp Date: Tue, 1 Aug 2023 14:12:02 -0600 Subject: [PATCH 07/19] =?UTF-8?q?Corregida=20instrucci=C3=B3n=20de=20desca?= diff --git a/rpmbuild/SOURCES/0008-Cambios-en-logo.patch b/rpmbuild/SOURCES/0008-Cambios-en-logo.patch index 458ea2f..c10ab77 100644 --- a/rpmbuild/SOURCES/0008-Cambios-en-logo.patch +++ b/rpmbuild/SOURCES/0008-Cambios-en-logo.patch @@ -1,4 +1,4 @@ -From b95449ed5201f52b0bcb86cb5d68530e6cae1454 Mon Sep 17 00:00:00 2001 +From 095372f9d725f94a816c3f979c4bb9c9ac25e81e Mon Sep 17 00:00:00 2001 From: Artukryp Date: Thu, 3 Aug 2023 17:36:45 -0600 Subject: [PATCH 08/19] Cambios en logo diff --git a/rpmbuild/SOURCES/0009-Modificado-link-de-descarga-de-fuentes.patch b/rpmbuild/SOURCES/0009-Modificado-link-de-descarga-de-fuentes.patch index a57ed57..885c41b 100644 --- a/rpmbuild/SOURCES/0009-Modificado-link-de-descarga-de-fuentes.patch +++ b/rpmbuild/SOURCES/0009-Modificado-link-de-descarga-de-fuentes.patch @@ -1,4 +1,4 @@ -From 1ac67cb5a0e52f49b4321c85f61d1051d7fbfd12 Mon Sep 17 00:00:00 2001 +From fade2024ec205e42737df7943b81a562ab26f07e Mon Sep 17 00:00:00 2001 From: Artukryp Date: Fri, 4 Aug 2023 20:21:33 -0600 Subject: [PATCH 09/19] Modificado link de descarga de fuentes diff --git a/rpmbuild/SOURCES/0010-Restauracion-link-repos-src.patch b/rpmbuild/SOURCES/0010-Restauracion-link-repos-src.patch index 5dc82de..849847b 100644 --- a/rpmbuild/SOURCES/0010-Restauracion-link-repos-src.patch +++ b/rpmbuild/SOURCES/0010-Restauracion-link-repos-src.patch @@ -1,4 +1,4 @@ -From 7d3e05d8b427c2fab3fc448dc7a940e86d4b70f6 Mon Sep 17 00:00:00 2001 +From 4b0bec8364de1be8d4fd1bfd0aeb9ba6a7db5b1f Mon Sep 17 00:00:00 2001 From: Israel Paredes Date: Tue, 8 Aug 2023 07:51:52 +0000 Subject: [PATCH 10/19] Restauracion link repos/src diff --git a/rpmbuild/SOURCES/0011-logo-image-updated.patch b/rpmbuild/SOURCES/0011-logo-image-updated.patch index 2d20c27..cbbe465 100644 --- a/rpmbuild/SOURCES/0011-logo-image-updated.patch +++ b/rpmbuild/SOURCES/0011-logo-image-updated.patch @@ -1,4 +1,4 @@ -From a02ccd4d002d766eb2d9ed68818a0e8d8f62f0bc Mon Sep 17 00:00:00 2001 +From 73db3fbd6a2615ada31dd2989fb8f932ae0a842a Mon Sep 17 00:00:00 2001 From: Adlair Cerecedo-Mendez Date: Mon, 14 Aug 2023 18:35:41 -0600 Subject: [PATCH 11/19] logo image updated diff --git a/rpmbuild/SOURCES/0012-Update-OfficeLinux.conf-with-lang-es.patch b/rpmbuild/SOURCES/0012-Update-OfficeLinux.conf-with-lang-es.patch index 7487d7a..8468771 100644 --- a/rpmbuild/SOURCES/0012-Update-OfficeLinux.conf-with-lang-es.patch +++ b/rpmbuild/SOURCES/0012-Update-OfficeLinux.conf-with-lang-es.patch @@ -1,4 +1,4 @@ -From f6c2af7e2243a0af07b747141d8a627bff8b6608 Mon Sep 17 00:00:00 2001 +From 43e7cc35717147e6f4fe17b60eaffb33e35b42e1 Mon Sep 17 00:00:00 2001 From: Israel Paredes Date: Wed, 8 Nov 2023 19:42:40 +0000 Subject: [PATCH 12/19] Update OfficeLinux.conf --with-lang=es diff --git a/rpmbuild/SOURCES/0013-Update-OfficeLinux.conf.patch b/rpmbuild/SOURCES/0013-Update-OfficeLinux.conf.patch index 26723d4..10154f9 100644 --- a/rpmbuild/SOURCES/0013-Update-OfficeLinux.conf.patch +++ b/rpmbuild/SOURCES/0013-Update-OfficeLinux.conf.patch @@ -1,4 +1,4 @@ -From b16027a845a86c48275271f728e54ac7d7660b25 Mon Sep 17 00:00:00 2001 +From 9e87d8e75c5d8b22e033be9eafd8dd24716c3ad0 Mon Sep 17 00:00:00 2001 From: Israel Paredes Date: Wed, 8 Nov 2023 23:23:27 +0000 Subject: [PATCH 13/19] Update OfficeLinux.conf diff --git a/rpmbuild/SOURCES/0014-fix-error-make-install.patch b/rpmbuild/SOURCES/0014-fix-error-make-install.patch index 1d10239..fce26ed 100644 --- a/rpmbuild/SOURCES/0014-fix-error-make-install.patch +++ b/rpmbuild/SOURCES/0014-fix-error-make-install.patch @@ -1,4 +1,4 @@ -From 889bda7eca1952afc206420fb1af465a4f34ce3b Mon Sep 17 00:00:00 2001 +From f843392687060dcff3ae87cde1df1f1a3da5d02f Mon Sep 17 00:00:00 2001 From: Artukryp Date: Mon, 13 Nov 2023 11:23:10 -0600 Subject: [PATCH 14/19] fix error make install diff --git a/rpmbuild/SOURCES/0015-Cambios-en-logo.patch b/rpmbuild/SOURCES/0015-Cambios-en-logo.patch index 155673a..36090ed 100644 --- a/rpmbuild/SOURCES/0015-Cambios-en-logo.patch +++ b/rpmbuild/SOURCES/0015-Cambios-en-logo.patch @@ -1,4 +1,4 @@ -From 66b6244047594c12da74f8a4c7f176ce717da55f Mon Sep 17 00:00:00 2001 +From 5976e31f4bf3700e6757812e245bd10de47255ff Mon Sep 17 00:00:00 2001 From: Artukryp Date: Thu, 3 Aug 2023 17:36:45 -0600 Subject: [PATCH 15/19] Cambios en logo diff --git a/rpmbuild/SOURCES/0016-Felipe-Carrillo-Puerto-image-added.patch b/rpmbuild/SOURCES/0016-Felipe-Carrillo-Puerto-image-added.patch index 986f441..5aac130 100644 --- a/rpmbuild/SOURCES/0016-Felipe-Carrillo-Puerto-image-added.patch +++ b/rpmbuild/SOURCES/0016-Felipe-Carrillo-Puerto-image-added.patch @@ -1,4 +1,4 @@ -From c87ea530825a7e3bfd0ab868c0a44e18a0898c49 Mon Sep 17 00:00:00 2001 +From b2b633e610a9abacb58f452f1b3275c35a33c715 Mon Sep 17 00:00:00 2001 From: Adlair Cerecedo-Mendez Date: Tue, 20 Feb 2024 21:43:58 -0600 Subject: [PATCH 16/19] Felipe Carrillo Puerto image added. diff --git a/rpmbuild/SOURCES/0017-Restaurar-el-cambio-de-copyright.patch b/rpmbuild/SOURCES/0017-Restaurar-el-cambio-de-copyright.patch index c7fafa2..907b260 100644 --- a/rpmbuild/SOURCES/0017-Restaurar-el-cambio-de-copyright.patch +++ b/rpmbuild/SOURCES/0017-Restaurar-el-cambio-de-copyright.patch @@ -1,4 +1,4 @@ -From b245b6bf0d1dd76214aacdcc471d09967770fbbd Mon Sep 17 00:00:00 2001 +From b0641618f267f2cf3a8d8842a487252741516de4 Mon Sep 17 00:00:00 2001 From: Octavio Alvarez Date: Tue, 12 Mar 2024 05:38:32 +0000 Subject: [PATCH 17/19] Restaurar el cambio de copyright. diff --git a/rpmbuild/SOURCES/0018-Eliminar-with-package-version-de-nuestras-distro-con.patch b/rpmbuild/SOURCES/0018-Eliminar-with-package-version-de-nuestras-distro-con.patch index 2e0700e..3459b73 100644 --- a/rpmbuild/SOURCES/0018-Eliminar-with-package-version-de-nuestras-distro-con.patch +++ b/rpmbuild/SOURCES/0018-Eliminar-with-package-version-de-nuestras-distro-con.patch @@ -1,4 +1,4 @@ -From a02a3c6e9ac60b544c8b5e2f80464780f0b0a897 Mon Sep 17 00:00:00 2001 +From b6b09ecad240232728f680ebd476d6c1f78b6ea8 Mon Sep 17 00:00:00 2001 From: Octavio Alvarez Date: Tue, 12 Mar 2024 05:44:12 +0000 Subject: [PATCH 18/19] Eliminar --with-package-version de nuestras diff --git a/rpmbuild/SOURCES/0019-Eliminar-with-jdk-home-de-nuestras-distro-configs.patch b/rpmbuild/SOURCES/0019-Eliminar-with-jdk-home-de-nuestras-distro-configs.patch index d1c24cc..3f77f3d 100644 --- a/rpmbuild/SOURCES/0019-Eliminar-with-jdk-home-de-nuestras-distro-configs.patch +++ b/rpmbuild/SOURCES/0019-Eliminar-with-jdk-home-de-nuestras-distro-configs.patch @@ -1,4 +1,4 @@ -From ebe9b8a133ab8b9e5f76cd5d06e9273a39ed4b74 Mon Sep 17 00:00:00 2001 +From 89d5d6206298c93dd203c796c1d21aba2b09b9ca Mon Sep 17 00:00:00 2001 From: Octavio Alvarez Date: Tue, 12 Mar 2024 05:50:09 +0000 Subject: [PATCH 19/19] Eliminar --with-jdk-home de nuestras distro-configs diff --git a/rpmbuild/SPECS/libreoffice.spec b/rpmbuild/SPECS/libreoffice.spec index 0d74ec5..c9f9505 100644 --- a/rpmbuild/SPECS/libreoffice.spec +++ b/rpmbuild/SPECS/libreoffice.spec @@ -78,7 +78,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.1 -Release: 3+gob.mx1.2%{?dist} +Release: 4+gob.mx1.2%{?dist} # default new files are: MPLv2 # older files are typically: MPLv2 incorporating work under ASLv2 @@ -162,6 +162,7 @@ Source58: %{external_url}/NotoSerifArmenian-v2.008.zip Source59: %{external_url}/NotoSerifGeorgian-v2.003.zip Source60: %{external_url}/NotoSerifHebrew-v2.003.zip Source61: %{external_url}/NotoSerifLao-v2.003.zip +Source62: %{external_url}/NotoKufiArabic-v2.109.zip # Diccionarios Source66: %{source_url}/libreoffice-dictionaries-%{version}%{?libo_prerelease}%{?libo_buildfix}.tar.xz @@ -366,7 +367,7 @@ Patch12: libreoffice-7.5.8.2-icu-74-compatibility.patch # Patch for kf6 scaling. Patch13: 86abb6fd8a8f680f9fc5ff1db775845c9f4e254b.patch -# Parches de gob.mx +# Parches gob.mx 1.2 Patch21: 0001-Archivos-de-distro-config-de-brand-Office.patch Patch22: 0002-Modificacion-al-build-y-borrado-UPDATEURL.patch Patch23: 0003-Custom-images-and-referencies-added.patch @@ -388,6 +389,7 @@ Patch38: 0018-Eliminar-with-package-version-de-nuestras-distro-con.patch Patch39: 0019-Eliminar-with-jdk-home-de-nuestras-distro-configs.patch + Patch500: 0001-disable-libe-book-support.patch # https://lists.freedesktop.org/archives/libreoffice/2023-September/090948.html Patch501: kahansum_test_fix_for_aarc64_s390x.patch @@ -2871,6 +2873,10 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || : %{_includedir}/LibreOfficeKit %changelog +* Mon Jun 24 2024 Sandino Araico Sánchez - 1:24.2.2.1-4+gob.mx1.2 +- Added NotoKufiArabic-v2.109.zip to sources +- Updated gob.mx 1.2 patchset + * Sat Jun 22 2024 Sandino Araico Sánchez - 1:24.2.2.1-3+gob.mx1.2 - merge 24.2.2.1.fc40