From aced140abe36a5bd943c75b3fef430349b2e4556 Mon Sep 17 00:00:00 2001 From: Sandino Araico Sanchez Date: Sun, 28 Jan 2024 04:51:28 -0600 Subject: [PATCH] Patchset gobmx-1.0_24.2.0 --- CentOS-9/SPECS/libreoffice.spec | 2 +- scripts/libreoffice-backport-1.0.sh | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/CentOS-9/SPECS/libreoffice.spec b/CentOS-9/SPECS/libreoffice.spec index c7602ff..06efa1f 100644 --- a/CentOS-9/SPECS/libreoffice.spec +++ b/CentOS-9/SPECS/libreoffice.spec @@ -341,7 +341,7 @@ Patch31: 0011-logo-image-updated.patch Patch32: 0012-Update-OfficeLinux.conf-with-lang-es.patch Patch33: 0013-Update-OfficeLinux.conf.patch Patch34: 0014-fix-error-make-install.patch -Patch35: 0015-gob-mx-1.0.patch +#Patch35: 0015-gob-mx-1.0.patch %global instdir %{_libdir} diff --git a/scripts/libreoffice-backport-1.0.sh b/scripts/libreoffice-backport-1.0.sh index f9615b8..6a6892a 100644 --- a/scripts/libreoffice-backport-1.0.sh +++ b/scripts/libreoffice-backport-1.0.sh @@ -21,3 +21,16 @@ git push --set-upstream origin gobmx-1.0-backport-24.2 mkdir ../patchset-gobmx-1.0_24.2 git format-patch -o ../patchset-gobmx-1.0_24.2 libreoffice-24-2-branch-point +git checkout libreoffice-24-2-0 +git tag Sandino-24-2-0 +git checkout -b gobmx-1.0-backport-24.2.0 +git merge gobmx-1.0-backport-24.2 +git log --oneline --graph + +git push --set-upstream origin gobmx-1.0-backport-24.2.0 + +mkdir ../patchset-gobmx-1.0_24.2.0 +git format-patch -o ../patchset-gobmx-1.0_24.2.0 Sandino-24-2-0 + + +