merge gob.mx/fedora-39
This commit is contained in:
commit
fa94ce7ea8
2 changed files with 52 additions and 26 deletions
|
|
@ -198,7 +198,7 @@ index 000000000000..25996d9d6710
|
|||
+--with-vendor=INFOTEC
|
||||
+--disable-community-flavor
|
||||
diff --git a/download.lst b/download.lst
|
||||
index d3dad6bdbe82..c921f29647e0 100644
|
||||
index 2c76067761b7..b4e5d9bbf8a3 100644
|
||||
--- a/download.lst
|
||||
+++ b/download.lst
|
||||
@@ -3,6 +3,9 @@
|
||||
|
|
@ -304,12 +304,21 @@ index 000000000000..28b53b415a2a
|
|||
+$(eval $(call gb_UnpackedTarball_set_tarball,font_gmx,$(FONT_GMX_TARBALL)))
|
||||
+
|
||||
+# vim: set noet sw=4 ts=4:
|
||||
diff --git a/fonts/gmx-fonts.tar.gz b/fonts/gmx-fonts.tar.gz
|
||||
new file mode 100644
|
||||
index 000000000000..8f4675722946
|
||||
Binary files /dev/null and b/fonts/gmx-fonts.tar.gz differ
|
||||
diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk
|
||||
index 48efab143c82..8c7e14e709f6 100644
|
||||
--- a/instsetoo_native/CustomTarget_setup.mk
|
||||
+++ b/instsetoo_native/CustomTarget_setup.mk
|
||||
@@ -185,7 +185,7 @@ ExtensionUpdateURL=https://updateexte.libreoffice.org/ExtensionUpdateService/che
|
||||
UpdateChannel=$(if $(ENABLE_ONLINE_UPDATE_MAR),LOOnlineUpdater)
|
||||
ReferenceOOoMajorMinor=4.1
|
||||
UpdateID=$(PRODUCTNAME)_$(LIBO_VERSION_MAJOR)_en-US
|
||||
-UpdateURL=$(if $(ENABLE_ONLINE_UPDATE),https://update.libreoffice.org/check.php$(if $(filter-out WNT,$(OS)),?pkgfmt=$(PKGFORMAT)))
|
||||
+UpdateURL=$(if $(ENABLE_ONLINE_UPDATE),https://update.libreoffice.gob.mx/check.php$(if $(filter-out WNT,$(OS)),?pkgfmt=$(PKGFORMAT)))
|
||||
UpdateUserAgent=<PRODUCT> ($${buildid}; $${_OS}; $${_ARCH}; <OPTIONAL_OS_HW_DATA>)
|
||||
Vendor=$(OOO_VENDOR)
|
||||
endef
|
||||
diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in
|
||||
index b5da0bfb6697..de7de46a22ff 100644
|
||||
index b5da0bfb6697..abd2276640fd 100644
|
||||
--- a/instsetoo_native/util/openoffice.lst.in
|
||||
+++ b/instsetoo_native/util/openoffice.lst.in
|
||||
@@ -193,3 +193,120 @@ LibreOfficeDev_SDK
|
||||
|
|
@ -333,7 +342,7 @@ index b5da0bfb6697..de7de46a22ff 100644
|
|||
+ USERDIRPRODUCTVERSION 4
|
||||
+ BASEPRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
|
||||
+ PCPFILENAME libreoffice.pcp
|
||||
+ UPDATEURL
|
||||
+ UPDATEURL https://update.libreoffice.gob.mx/check.php
|
||||
+ ADD_INCLUDE_FILES cli_ure/version/version.txt,unoil/climaker/version.txt
|
||||
+ ADDSYSTEMINTEGRATION 1
|
||||
+ PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
|
||||
|
|
@ -410,7 +419,7 @@ index b5da0bfb6697..de7de46a22ff 100644
|
|||
+ UREPACKAGEPREFIX libreofficedev
|
||||
+ SOLSUREPACKAGEPREFIX libreofficedev
|
||||
+ REGISTRYLAYERNAME LayerDev
|
||||
+ UPDATEURL https://update.libreoffice.org/check.php
|
||||
+ UPDATEURL https://update.libreoffice.gob.mx/check.php
|
||||
+ ADD_INCLUDE_FILES cli_ure/version/version.txt,unoil/climaker/version.txt
|
||||
+ ADDSYSTEMINTEGRATION 1
|
||||
+ PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
|
||||
|
|
@ -434,7 +443,7 @@ index b5da0bfb6697..de7de46a22ff 100644
|
|||
+ }
|
||||
+}
|
||||
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
|
||||
index e5150ccbc5c8..00ac6eee25ba 100644
|
||||
index ad004c1868bb..a171c9d5280d 100644
|
||||
--- a/solenv/flatpak-manifest.in
|
||||
+++ b/solenv/flatpak-manifest.in
|
||||
@@ -592,6 +592,13 @@
|
||||
|
|
@ -78,7 +78,7 @@ Summary: Free Software Productivity Suite
|
|||
Name: libreoffice
|
||||
Epoch: 1
|
||||
Version: %{libo_version}.2
|
||||
Release: 4+gob.mx1.3%{?dist}
|
||||
Release: 5+gob.mx1.4%{?dist}
|
||||
|
||||
# default new files are: MPLv2
|
||||
# older files are typically: MPLv2 incorporating work under ASLv2
|
||||
|
|
@ -150,18 +150,19 @@ Source48: https://raw.githubusercontent.com/gnome-design-team/gnome-icons/
|
|||
|
||||
# New fonts required in 24.2
|
||||
Source49: %{external_url}/NotoKufiArabic-v2.109.zip
|
||||
Source50: %{external_url}/NotoSans-v2.012.zip
|
||||
Source51: %{external_url}/NotoSansArabic-v2.010.zip
|
||||
Source52: %{external_url}/NotoSansArmenian-v2.008.zip
|
||||
Source53: %{external_url}/NotoSansGeorgian-v2.003.zip
|
||||
Source54: %{external_url}/NotoSansHebrew-v2.004.zip
|
||||
Source55: %{external_url}/NotoSansLao-v2.003.zip
|
||||
Source56: %{external_url}/NotoSansLisu-v2.102.zip
|
||||
Source57: %{external_url}/NotoSerif-v2.012.zip
|
||||
Source58: %{external_url}/NotoSerifArmenian-v2.008.zip
|
||||
Source59: %{external_url}/NotoSerifGeorgian-v2.003.zip
|
||||
Source60: %{external_url}/NotoSerifHebrew-v2.004.zip
|
||||
Source61: %{external_url}/NotoSerifLao-v2.003.zip
|
||||
Source50: %{external_url}/NotoNaskhArabic-v2.019.zip
|
||||
Source51: %{external_url}/NotoSans-v2.012.zip
|
||||
Source52: %{external_url}/NotoSansArabic-v2.010.zip
|
||||
Source53: %{external_url}/NotoSansArmenian-v2.008.zip
|
||||
Source54: %{external_url}/NotoSansGeorgian-v2.003.zip
|
||||
Source55: %{external_url}/NotoSansHebrew-v3.001.zip
|
||||
Source56: %{external_url}/NotoSansLao-v2.003.zip
|
||||
Source57: %{external_url}/NotoSansLisu-v2.102.zip
|
||||
Source58: %{external_url}/NotoSerif-v2.012.zip
|
||||
Source59: %{external_url}/NotoSerifArmenian-v2.008.zip
|
||||
Source60: %{external_url}/NotoSerifGeorgian-v2.003.zip
|
||||
Source61: %{external_url}/NotoSerifHebrew-v2.004.zip
|
||||
Source62: %{external_url}/NotoSerifLao-v2.003.zip
|
||||
|
||||
# Diccionarios
|
||||
Source66: %{source_url}/libreoffice-dictionaries-%{version}%{?libo_prerelease}%{?libo_buildfix}.tar.xz
|
||||
|
|
@ -388,7 +389,7 @@ Patch12: libreoffice-7.5.8.2-icu-74-compatibility.patch
|
|||
Patch15: 0001-gpgme.patch
|
||||
|
||||
# Patchset gob.mx 1.3
|
||||
Patch21: libreoffice-24.2.4.2+gobmx1.3-patchset.patch
|
||||
Patch21: libreoffice-24.2.5.2+gobmx1.4-patchset.patch
|
||||
|
||||
Patch500: 0001-disable-libe-book-support.patch
|
||||
# https://lists.freedesktop.org/archives/libreoffice/2023-September/090948.html
|
||||
|
|
@ -2939,12 +2940,30 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || :
|
|||
%{_includedir}/LibreOfficeKit
|
||||
|
||||
%changelog
|
||||
* Fri Aug 02 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.2.5.2-5+gob.mx1.4
|
||||
- Backport to CentOS 9
|
||||
|
||||
* Thu Aug 01 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.2.5.2-4+gob.mx1.4
|
||||
- Backport to Fedora 39
|
||||
|
||||
* Wed Jul 31 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.2.5.2-3+gob.mx1.4
|
||||
- patchset gob.mx 1.4
|
||||
|
||||
* Fri Jul 26 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.2.5.2-3
|
||||
- Backport to CentOS 9
|
||||
|
||||
* Thu Jul 25 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.2.5.2-3+gob.mx1.3
|
||||
- Backport to Fedora 39
|
||||
|
||||
* Wed Jul 24 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.2.5.2-2
|
||||
- Backport to Fedora 39
|
||||
|
||||
* Wed Jul 24 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.2.5.2-2+gob.mx1.3
|
||||
- Merge 24.2.5.2.fc40
|
||||
- Se agregan paquetes de fonts faltantes:
|
||||
- NotoNaskhArabic-v2.019.zip
|
||||
- NotoSansHebrew-v3.001.zip
|
||||
|
||||
* Thu Jul 11 2024 Gwyn Ciesla <gwync@protonmail.com> - 1:24.2.5.2-1
|
||||
- 24.2.5.2
|
||||
|
||||
|
|
@ -2975,15 +2994,13 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || :
|
|||
- Merge gob.mx-1.3-24.2.4.2-fc40
|
||||
- Rebuild on Fedora 39
|
||||
|
||||
* Tue Jun 25 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.2.4.2-3+gob.mx1.3
|
||||
* Tue Jun 25 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.2.4.2-2+gob.mx1.3
|
||||
- Merge 24.2.4.2.fc40
|
||||
- Actualización del patchset gob.mx 1.3 para Libreoffice 24.2.4.2
|
||||
- Fuentes que cambian de versión: NotoSansHebrew-v2.004.zip y NotoSerifHebrew-v2.004.zip
|
||||
|
||||
* Tue Jun 25 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.2.3.2-2+gob.mx1.3
|
||||
- Merge gob.mx-1.3-24.2.3.2-fc40
|
||||
|
||||
* Tue Jun 25 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.2.3.2-2+gob.mx1.3
|
||||
- Merge 24.2.3.2.fc40
|
||||
- Patchset gob.mx 1.3
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue