strepsirrhini/libreoffice-compilar
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: strepsirrhini:master
Branches Tags
strepsirrhini:master
strepsirrhini:gob.mx/almalinux-9
strepsirrhini:backports/centos-9
strepsirrhini:backports/fedora-40
strepsirrhini:upstream/fedora
strepsirrhini:gob.mx/24.2.1.2-fc40
..
compare: strepsirrhini:backports/centos-9
Branches Tags
strepsirrhini:gob.mx/almalinux-9
strepsirrhini:backports/centos-9
strepsirrhini:backports/fedora-40
strepsirrhini:upstream/fedora
strepsirrhini:master
strepsirrhini:gob.mx/24.2.1.2-fc40

14 commits
master ... backports/

Author SHA1 Message Date
Sandino Araico Sánchez
be237d5749 Merge branch 'renich/symlink' into 'backports/centos-9' 
cs9: removí un symlink que no sería para nada

See merge request strepsirrhini/libreoffice-compilar!14
 2024-09-24 05:16:13 +00:00
Renich Bon Ćirić
b6bbbce6c9 cs9: removí un symlink que no sería para nada 2024-09-24 05:16:13 +00:00
Sandino Araico Sánchez
c0627863b0 std::strcmp patch 2024-09-18 16:35:31 -06:00
Sandino Araico Sánchez
a3767cab05 Parcge para std::strcmp 2024-09-18 05:35:41 -06:00
Sandino Araico Sánchez
2e653cb0fb merge 24.8.1.2-fc39 2024-09-18 02:14:42 -06:00
Sandino Araico Sánchez
8403829b68 merge upstream/fedora 2024-09-14 02:56:52 -06:00
Sandino Araico Sánchez
0ecfeebcdd Spec de Fedora 24.8.1.2 2024-09-13 21:56:22 -06:00
Sandino Araico Sánchez
05df13b5b6 Pruebas unitarias que fallan: 4 nuevas 2024-09-12 01:50:31 -06:00
Sandino Araico Sánchez
15c1854791 disabled 500 libe-book patch 2024-09-10 19:21:56 -06:00
Sandino Araico Sánchez
41eb2bbfb6 disabled gpgme patch 2024-09-10 19:15:57 -06:00
Sandino Araico Sánchez
c01cf7cae6 merge backports/fedora-39 2024-09-10 19:00:53 -06:00
Sandino Araico Sánchez
cb630bd7f7 clean unused autorelease 2024-09-10 00:59:56 -06:00
Sandino Araico Sánchez
02097e2dae merge upstream/fedora 2024-09-09 17:04:20 -06:00
Sandino Araico Sánchez
7dbb583345 Spec de Fedora 24.8.0.3 2024-09-08 02:17:20 -06:00
24 changed files with 429 additions and 2296 deletions
Show stats Expand all files Collapse all files

1
CentOS-9
View file

@ -1 +0,0 @@
rpmbuild

1
Fedora-39
View file

@ -1 +0,0 @@
rpmbuild

1
Fedora-40
View file

@ -1 +0,0 @@
rpmbuild

20
Windows/autogen.input
View file

@ -1,20 +0,0 @@
--with-ant-home=/cygdrive/c/sources/apache-ant-1.9.5
--with-visual-studio=2022
--with-jdk-home=C:\Program Files\Microsoft\jdk-11.0.12.7-hotspot
--host=x86_64-pc-cygwin
--without-junit
--without-helppack-integration
--enable-extension-integration
--enable-scripting-beanshell
--enable-scripting-javascript
--enable-ext-wiki-publisher
--enable-ext-nlpsolver
--with-myspell-dicts
--with-package-format=msi
--enable-mergelibs
--enable-lto
--enable-odk
--without-ucrt-dir
--enable-release-build
--with-lang=es
--with-branding=custom_images

41
rpmbuild/SOURCES/0001-cui-fix-without-java-build.patch Normal file
View file

@ -0,0 +1,41 @@
From af3963c32c63893949a3028396af90ee7d811e5b Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.com>
Date: Wed, 21 Jun 2023 12:06:42 +0200
Subject: [PATCH 1/2] cui: fix --without-java build
This went wrong in commit 7795a2adc0a724220440dca997495043902f1384
(Allow bootstrap variables in Java user classpath settings, 2nd try,
2023-06-12), I assume that _rPath is always empty in the without-java
case.
Change-Id: I8749f5bd30b0853a76fb9ccf5d1e7a8e4e23f1ba
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153386
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
Tested-by: Jenkins
---
cui/source/options/optjava.cxx | 2 ++
1 file changed, 2 insertions(+)
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 17f128ce9b3b..7a537dfe4eed 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -940,6 +940,7 @@ void SvxJavaClassPathDlg::SetClassPath( const OUString& _rPath )
if ( m_sOldPath.isEmpty() )
m_sOldPath = _rPath;
m_xPathList->clear();
+#if HAVE_FEATURE_JAVA
if (!_rPath.isEmpty())
{
std::vector paths = jfw_convertUserPathList(_rPath);
@@ -961,6 +962,7 @@ void SvxJavaClassPathDlg::SetClassPath( const OUString& _rPath )
// select first entry
m_xPathList->select(0);
}
+#endif
SelectHdl_Impl(*m_xPathList);
}
--
2.39.3

37
rpmbuild/SOURCES/0001-don-t-suppress-crashes.patch Normal file
View file

@ -0,0 +1,37 @@
From a6f2cba43d79347b6975b3b8069b423c94a7dba6 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Tue, 8 Nov 2016 11:50:06 +0100
Subject: [PATCH] don't suppress crashes
An automatic restart after a crash makes the crash invisible to abrt.
Change-Id: I3854e619356049b144b08575879d289a3c12e4c9
---
desktop/source/app/app.cxx | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index c54aea9dd4f7..a613fe12cef2 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1165,8 +1165,6 @@
if( bRestart )
{
RequestHandler::Disable();
- if( pSignalHandler )
- osl_removeSignalHandler( pSignalHandler );
restartOnMac(false);
#if !ENABLE_WASM_STRIP_SPLASH
@@ -1174,7 +1172,7 @@
m_rSplashScreen->reset();
#endif
- _exit( EXITHELPER_CRASH_WITH_RESTART );
+ return;
}
else
{
--
2.29.2

51
rpmbuild/SOURCES/0002-cui-don-t-build-SvxJavaClassPathDlg-SetClassPath-for.patch Normal file
View file

@ -0,0 +1,51 @@
From 8b330bb761e05fcfabd5a30f8784046c93b91431 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.com>
Date: Wed, 21 Jun 2023 16:16:57 +0200
Subject: [PATCH 2/2] cui: don't build SvxJavaClassPathDlg::SetClassPath() for
the non-java case
Since SvxJavaClassPathDlg::SetClassPath is only called from #if
HAVE_FEATURE_JAVA code (in IMPL_LINK_NOARG(SvxJavaOptionsPage,
ClassPathHdl_Impl, weld::Button&, void) in
cui/source/options/optjava.cxx ) anyway, see
<https://gerrit.libreoffice.org/c/core/+/153386/2#message-06ee95be419a14ee8f08035142b5718e0377d120>.
Change-Id: I0e5a21036ce048c18d408c07cce088dbab7fc030
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153396
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
---
cui/source/options/optjava.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 7a537dfe4eed..64ba41c3fe0b 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -935,12 +935,12 @@ OUString SvxJavaClassPathDlg::GetClassPath() const
return sPath.makeStringAndClear();
}
+#if HAVE_FEATURE_JAVA
void SvxJavaClassPathDlg::SetClassPath( const OUString& _rPath )
{
if ( m_sOldPath.isEmpty() )
m_sOldPath = _rPath;
m_xPathList->clear();
-#if HAVE_FEATURE_JAVA
if (!_rPath.isEmpty())
{
std::vector paths = jfw_convertUserPathList(_rPath);
@@ -962,8 +962,8 @@ void SvxJavaClassPathDlg::SetClassPath( const OUString& _rPath )
// select first entry
m_xPathList->select(0);
}
-#endif
SelectHdl_Impl(*m_xPathList);
}
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
--
2.39.3

51
rpmbuild/SOURCES/7.4.6-unit-tests.patch Normal file
View file

@ -0,0 +1,51 @@
From 2f5a4af93c352a091852a8230b71720c0ec7c14c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandino=20Araico=20S=C3=A1nchez?= <sandino@sandino.net>
Date: Sun, 7 May 2023 00:27:38 -0400
Subject: [PATCH] Se quitaron las pruebas unitarias que fallan en CentOS 9
---
dbaccess/Module_dbaccess.mk | 2 --
sdext/Module_sdext.mk | 1 -
sw/Module_sw.mk | 1 -
3 files changed, 4 deletions(-)
diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk
index 436f591c7a07..2e8b1b77aaed 100644
--- a/dbaccess/Module_dbaccess.mk
+++ b/dbaccess/Module_dbaccess.mk
@@ -49,8 +49,6 @@ endif
ifneq ($(filter SCRIPTING,$(BUILD_TYPE)),)
$(eval $(call gb_Module_add_check_targets,dbaccess,\
- CppunitTest_dbaccess_dialog_save \
- CppunitTest_dbaccess_empty_stdlib_save \
CppunitTest_dbaccess_nolib_save \
CppunitTest_dbaccess_macros_test \
CppunitTest_dbaccess_hsqlschema_import \
diff --git a/sdext/Module_sdext.mk b/sdext/Module_sdext.mk
index fd1d191b4939..d9ba2fbccc63 100644
--- a/sdext/Module_sdext.mk
+++ b/sdext/Module_sdext.mk
@@ -31,7 +31,6 @@ $(eval $(call gb_Module_add_targets,sdext,\
endif
$(eval $(call gb_Module_add_check_targets,sdext,\
- CppunitTest_sdext_pdfimport \
Executable_pdf2xml \
Executable_pdfunzip \
))
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 951b620aba5c..97c6235f67e0 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -114,7 +114,6 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\
CppunitTest_sw_uiwriter3 \
CppunitTest_sw_uiwriter4 \
CppunitTest_sw_uiwriter5 \
- CppunitTest_sw_uiwriter6 \
CppunitTest_sw_uiwriter7 \
CppunitTest_sw_layoutwriter \
CppunitTest_sw_layoutwriter2 \
--
2.39.1

76
rpmbuild/SOURCES/7.5.0-unit-tests.patch Normal file
View file

@ -0,0 +1,76 @@
From bf9a05748d0b4863276f920b39668e919ebeca21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandino=20Araico=20S=C3=A1nchez?= <sandino@sandino.net>
Date: Sun, 7 May 2023 20:55:21 -0400
Subject: [PATCH 1/2] Se quitaron las pruebas unitarias que fallan en CentOS 9
---
dbaccess/Module_dbaccess.mk | 2 --
sdext/Module_sdext.mk | 1 -
sw/Module_sw.mk | 1 -
3 files changed, 4 deletions(-)
diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk
index 436f591c7a07..2e8b1b77aaed 100644
--- a/dbaccess/Module_dbaccess.mk
+++ b/dbaccess/Module_dbaccess.mk
@@ -49,8 +49,6 @@ endif
ifneq ($(filter SCRIPTING,$(BUILD_TYPE)),)
$(eval $(call gb_Module_add_check_targets,dbaccess,\
- CppunitTest_dbaccess_dialog_save \
- CppunitTest_dbaccess_empty_stdlib_save \
CppunitTest_dbaccess_nolib_save \
CppunitTest_dbaccess_macros_test \
CppunitTest_dbaccess_hsqlschema_import \
diff --git a/sdext/Module_sdext.mk b/sdext/Module_sdext.mk
index fd1d191b4939..d9ba2fbccc63 100644
--- a/sdext/Module_sdext.mk
+++ b/sdext/Module_sdext.mk
@@ -31,7 +31,6 @@ $(eval $(call gb_Module_add_targets,sdext,\
endif
$(eval $(call gb_Module_add_check_targets,sdext,\
- CppunitTest_sdext_pdfimport \
Executable_pdf2xml \
Executable_pdfunzip \
))
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 8a217a85fbf6..2106094dac63 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -114,7 +114,6 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\
CppunitTest_sw_uiwriter3 \
CppunitTest_sw_uiwriter4 \
CppunitTest_sw_uiwriter5 \
- CppunitTest_sw_uiwriter6 \
CppunitTest_sw_uiwriter7 \
CppunitTest_sw_uiwriter8 \
CppunitTest_sw_layoutwriter \
--
2.39.1
From 16d2465ebd4f9de5496dfbbe9b2409a0d5bd8169 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandino=20Araico=20S=C3=A1nchez?= <sandino@sandino.net>
Date: Sun, 7 May 2023 21:52:09 -0400
Subject: [PATCH 2/2] Otra prueba que falla en CentOS 9
---
sw/Module_sw.mk | 1 -
1 file changed, 1 deletion(-)
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 2106094dac63..23fd9f4be109 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -135,7 +135,6 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\
CppunitTest_sw_uibase_uno \
CppunitTest_sw_uibase_wrtsh \
CppunitTest_sw_core_accessibilitycheck \
- CppunitTest_sw_core_layout \
CppunitTest_sw_core_fields \
CppunitTest_sw_core_tox \
CppunitTest_sw_core_frmedt \
--
2.39.1

84
rpmbuild/SOURCES/7.5.1-unit-tests.patch Normal file
View file

@ -0,0 +1,84 @@
From 0869739a3843e6ee48eba1181d71476c1e7a9541 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandino=20Araico=20S=C3=A1nchez?= <sandino@sandino.net>
Date: Mon, 8 May 2023 20:22:24 -0400
Subject: [PATCH 1/2] Pruebas unitarias omitidas de la 7.5.0
---
dbaccess/Module_dbaccess.mk | 2 --
sdext/Module_sdext.mk | 1 -
sw/Module_sw.mk | 2 --
3 files changed, 5 deletions(-)
diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk
index 436f591c7a07..2e8b1b77aaed 100644
--- a/dbaccess/Module_dbaccess.mk
+++ b/dbaccess/Module_dbaccess.mk
@@ -49,8 +49,6 @@ endif
ifneq ($(filter SCRIPTING,$(BUILD_TYPE)),)
$(eval $(call gb_Module_add_check_targets,dbaccess,\
- CppunitTest_dbaccess_dialog_save \
- CppunitTest_dbaccess_empty_stdlib_save \
CppunitTest_dbaccess_nolib_save \
CppunitTest_dbaccess_macros_test \
CppunitTest_dbaccess_hsqlschema_import \
diff --git a/sdext/Module_sdext.mk b/sdext/Module_sdext.mk
index fd1d191b4939..d9ba2fbccc63 100644
--- a/sdext/Module_sdext.mk
+++ b/sdext/Module_sdext.mk
@@ -31,7 +31,6 @@ $(eval $(call gb_Module_add_targets,sdext,\
endif
$(eval $(call gb_Module_add_check_targets,sdext,\
- CppunitTest_sdext_pdfimport \
Executable_pdf2xml \
Executable_pdfunzip \
))
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 8a217a85fbf6..23fd9f4be109 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -114,7 +114,6 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\
CppunitTest_sw_uiwriter3 \
CppunitTest_sw_uiwriter4 \
CppunitTest_sw_uiwriter5 \
- CppunitTest_sw_uiwriter6 \
CppunitTest_sw_uiwriter7 \
CppunitTest_sw_uiwriter8 \
CppunitTest_sw_layoutwriter \
@@ -136,7 +135,6 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\
CppunitTest_sw_uibase_uno \
CppunitTest_sw_uibase_wrtsh \
CppunitTest_sw_core_accessibilitycheck \
- CppunitTest_sw_core_layout \
CppunitTest_sw_core_fields \
CppunitTest_sw_core_tox \
CppunitTest_sw_core_frmedt \
--
2.39.1
From d8a95a4d40088e9cf2a15d0cacffd9167ca375a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandino=20Araico=20S=C3=A1nchez?= <sandino@sandino.net>
Date: Mon, 8 May 2023 20:22:48 -0400
Subject: [PATCH 2/2] Pruebas unitaria adicional que falla en la 7.5.1
---
sw/Module_sw.mk | 1 -
1 file changed, 1 deletion(-)
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 23fd9f4be109..4b0580716a2a 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -117,7 +117,6 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\
CppunitTest_sw_uiwriter7 \
CppunitTest_sw_uiwriter8 \
CppunitTest_sw_layoutwriter \
- CppunitTest_sw_layoutwriter2 \
CppunitTest_sw_mailmerge \
CppunitTest_sw_mailmerge2 \
CppunitTest_sw_globalfilter \
--
2.39.1

10
rpmbuild/SOURCES/CentOS-9-std-strcmp.patch Normal file
View file

@ -0,0 +1,10 @@
--- libreoffice-24.8.1.2/sw/source/uibase/config/usrpref.cxx.orig 2024-09-18 07:28:47.126523151 -0400
+++ libreoffice-24.8.1.2/sw/source/uibase/config/usrpref.cxx 2024-09-18 07:26:15.439701646 -0400
@@ -29,6 +29,7 @@
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Sequence.hxx>
#include <unotools/localedatawrapper.hxx>
+#include <cstring>
using namespace utl;
using namespace ::com::sun::star;

BIN
rpmbuild/SOURCES/GMX-Acuerdo.pdf
View file

Binary file not shown.

25
rpmbuild/SOURCES/coolwsd.service
View file

@ -1,25 +0,0 @@
[Unit]
Description=Collabora Online WebSocket Daemon
After=network.target
[Service]
EnvironmentFile=-/etc/sysconfig/coolwsd
ExecStart=/usr/bin/coolwsd --version --o:sys_template_path=/usr/lib64/cool/systemplate --o:child_root_path=/usr/lib64/cool/child-roots --o:file_server_root_path=/usr/share/coolwsd
KillSignal=SIGINT
TimeoutStopSec=120
User=cool
#KillMode=control-group
Restart=always
LimitNOFILE=infinity:infinity
#ProtectSystem=strict
#ReadWritePaths=/opt/cool /var/log
ProtectHome=yes
#PrivateTmp=yes
#ProtectControlGroups=yes
#CapabilityBoundingSet=CAP_FOWNER CAP_CHOWN CAP_MKNOD CAP_SYS_CHROOT CAP_SYS_ADMIN
[Install]
WantedBy=multi-user.target

14
rpmbuild/SOURCES/ed25519.key.asc
View file

@ -1,14 +0,0 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
mDMEYtcYTRYJKwYBBAHaRw8BAQdAup3AWA5CpavhOX16tLl1r2LukqxrJq/ZW6BK
/QXyARO0UWJ1aWxkZXIgQCBnb2IubXggKExsYXZlIEdQRyBwYXJhIGZpcm1hciBw
YXF1ZXRlcyBkZSBnb2IubXguKSA8YnVpbGRlckB1Z2QuZ29iLm14PoiTBBMWCgA7
FiEEK0iGmHzdXnGx0L9QwXjKx7ZXh80FAmLXGE0CGwMFCwkIBwICIgIGFQoJCAsC
BBYCAwECHgcCF4AACgkQwXjKx7ZXh82vRQEA20a8r7jKovPMlxGFRenlSdf5W4g4
5VuSsZbslPeWK7oA/3jD6Na0othI93yCNabafOs/7u16M6UrbQO0GNFn/h4KuDgE
YtcYTRIKKwYBBAGXVQEFAQEHQF+XtJhl1KnE524dVYn/SE+/cHCE19+p+IZ9RYPA
aV0aAwEIB4h4BBgWCgAgFiEEK0iGmHzdXnGx0L9QwXjKx7ZXh80FAmLXGE0CGwwA
CgkQwXjKx7ZXh826EgD9HnaC2QyPWl7kYqCAMabqaGxekt8gAAgKiF+RNm4FmdAA
/2FhYOTg3uBaYjaESC+tdt4T+lPAyiSIRtcxTfyQMN4A
=UtGC
-----END PGP PUBLIC KEY BLOCK-----

462
rpmbuild/SOURCES/libreoffice-24.2.5.2+gobmx1.4-patchset.patch
View file

File diff suppressed because one or more lines are too long

0
rpmbuild/SOURCES/patchset-1.1/0015-gob-mx-1.0.patch
View file

7
rpmbuild/SPECS/annobin-symlink.spec
View file

@ -3,7 +3,7 @@
Name: gcc-toolset-12-annobin-symlink
Version: 12.0.0
Release: 2%{?dist}
Release: 1%{?dist}
Summary: A symlink gcc-annobin.so to gts-gcc-annobin.so
License: Beerware
@ -19,18 +19,13 @@ A symlink gcc-annobin.so to gts-gcc-annobin.so fixes the issue
%install
install -d %{buildroot}%{scl_plugin_prefix}
ln -svf gts-annobin.so %{buildroot}%{scl_plugin_prefix}/annobin.so
ln -svf gts-gcc-annobin.so %{buildroot}%{scl_plugin_prefix}/gcc-annobin.so
%files
%{scl_plugin_prefix}/annobin.so
%{scl_plugin_prefix}/gcc-annobin.so
%changelog
* Fri Feb 16 2024 Sandino Araico Sánchez <sandino@sandino.net>
- Liga simbólica también para annobin.so
* Thu Jan 18 2024 Sandino Araico Sánchez <sandino@sandino.net>
- Liga simbólica para que jale esta chingadera
- cd /opt/rh/gcc-toolset-12/root/usr/lib/gcc/x86_64-redhat-linux/12/plugin

306
rpmbuild/SPECS/coolwsd.spec
View file

@ -1,306 +0,0 @@
# spec file for package coolwsd
#
# Copyright (c) 2015 Collabora
#
# This file is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
%global libo_version 7.6.3
%if 0%{?name_suffix:1}
Name: coolwsd%{name_suffix}
%else
Name: coolwsd
%endif
Version: 22.05.14.3
Release: 2%{?dist}
Vendor: %{vendor}
Summary: Collabora Online WebSocket Daemon
# https://github.com/CollaboraOnline/online/blob/master/COPYING
License: MPL
Source0: coolwsd-%{version}.tar.gz
Source1: coolwsd.service
BuildRequires: cppunit-devel
BuildRequires: chromium
BuildRequires: fontconfig
BuildRequires: gcc-c++
BuildRequires: libcap-devel
BuildRequires: libpng-devel
BuildRequires: libreoffice-core
BuildRequires: libreofficekit-devel >= %{libo_version}
BuildRequires: libtool
BuildRequires: libzstd-devel >= 1.4.0
BuildRequires: m4
BuildRequires: make
BuildRequires: nodejs-devel
BuildRequires: npm
BuildRequires: pam-devel
BuildRequires: poco-devel
BuildRequires: python3-polib
BuildRequires: systemd-rpm-macros
# Red Hat and CentOS
%if 0%{?rhel} == 7
BuildRequires: libpcap kernel-headers python36-polib python36-lxml
%endif
%if 0%{?rhel} == 8
BuildRequires: libpcap kernel-headers python3-polib python3-lxml
%endif
%if 0%{?rhel} == 9
BuildRequires: libpcap kernel-headers python3-polib python3-lxml
%endif
# openSUSE Leap 15.x, SLES12, SLES15
%if 0%{?suse_version}
BuildRequires: libcap-progs linux-glibc-devel systemd-rpm-macros python3-polib python3-lxml
%endif
# Si compilamos contra cierta versiónb libreofficekit, vamos a requerir un libreoffice de esa misma
# versióm o nos va a faltar funcionalidad y algo se podría romper.
Requires: libreoffice >= %{libo_version}
Requires: libreoffice-calc >= %{libo_version}
Requires: libreoffice-core >= %{libo_version}
Requires: libreoffice-draw >= %{libo_version}
Requires: libreoffice-graphicfilter >= %{libo_version}
Requires: libreoffice-impress >= %{libo_version}
Requires: libreoffice-langpack-en >= %{libo_version}
Requires: libreoffice-math >= %{libo_version}
Requires: libreoffice-pdfimport >= %{libo_version}
Requires: libreoffice-ure >= %{libo_version}
Requires: libreoffice-writer >= %{libo_version}
Requires(post): coreutils grep sed cpio
%if 0%{?rhel}
# coolwsd dependencies
Requires: systemd expat keyutils-libs krb5-libs libattr libcap libcom_err libgcc libpng libselinux openssh-clients openssl-libs pcre xz-libs zlib
# Collabora Office dependencies (unfortunately Collabora Office RPM packages do not have real dependencies)
Requires: expat fontconfig freetype libuuid bzip2-libs
# Esta dependencia la debería jalar Libreoffice #TODO
Requires: harfbuzz >= 5.1.0
%endif
%if 0%{?suse_version}
# coolwsd dependencies
Requires(post): libcap-progs
Requires: systemd libopenssl1_0_0 libpcre1 libz1 libcap2 libpng12-0 %{fillup_prereq}
# Collabora Office dependencies (unfortunately Collabora Office RPM packages do not have real dependencies)
# cd /usr/lib64/libreoffice/program ; for i in soffice.bin *.so ;do ldd $i | grep '=>' | sed -e "s/^.*=> //" -e "s/ [(].*$//"; done | sort | uniq | xargs rpm -qf --qf="%{NAME}\n" | sort | uniq | grep -v libreoffice
Requires: fontconfig libbz2-1 libexpat1 libfreetype6 libpng16-16 libuuid1 openssh
%endif
%description
%if 0%{?suse_version}
%debug_package
%endif
%prep
%setup
%build
libtoolize
aclocal
autoheader
automake --add-missing
autoreconf
scripts/refresh-git-hooks
# usando versión marrana (incluyendo una librería embebida)
%configure \
--disable-androidapp \
--disable-android-google-play \
--disable-iosapp \
--disable-setcap \
--disable-werror \
--enable-cypress \
--enable-debug \
--enable-silent-rules \
--with-dictionaries="en_US es_ES es_MX" \
--with-lokit-path=/usr/include/LibreOfficeKit \
--with-lo-path=/usr/lib64/libreoffice \
--with-vendor="Strepsirrhini"
%if 0%{?config_options:1}
%{config_options}
%endif
env BUILDING_FROM_RPMBUILD=yes make %{?_smp_mflags}
%check
#env BUILDING_FROM_RPMBUILD=yes make check
%install
env BUILDING_FROM_RPMBUILD=yes make install DESTDIR=%{buildroot}
install -d -m 755 %{buildroot}/var/adm/fillup-templates
%if 0%{?rhel}
install -D -m 444 %{SOURCE1} %{buildroot}%{_unitdir}/coolwsd.service
#install -D -m 444 coolwsd.service %{buildroot}%{_unitdir}/coolwsd.service
# systemd in RHEL 7 does not understand these options
%if 0%{?rhel} <= 7
sed -i "/^ReadWritePaths/d;/^ProtectControlGroups/d;/^ProtectSystem/d" %{buildroot}%{_unitdir}/coolwsd.service
%endif
install -D -m 644 sysconfig.coolwsd %{buildroot}/etc/sysconfig/coolwsd
install -d -m 755 %{buildroot}/etc/httpd/conf
install -D -m 755 etc/apache2/coolwsd.conf %{buildroot}/etc/httpd/conf
rm %{buildroot}/etc/apache2/conf-available/coolwsd.conf
%endif
%if 0%{?suse_version}
install -D -m 444 %{SOURCE1} %{buildroot}%{_unitdir}/coolwsd.service
#install -D -m 444 coolwsd.service %{buildroot}%{_unitdir}/coolwsd.service
install -D -m 644 sysconfig.coolwsd %{buildroot}/var/adm/fillup-templates
%endif
mkdir -p %{buildroot}/etc/pam.d
echo "auth required pam_unix.so" > %{buildroot}/etc/pam.d/coolwsd
echo "account required pam_unix.so" >> %{buildroot}/etc/pam.d/coolwsd
%files
%defattr(-,root,root,-)
/usr/bin/coolwsd
/usr/bin/loolwsd
/usr/bin/coolwsd-systemplate-setup
/usr/bin/loolwsd-systemplate-setup
/usr/bin/coolwsd-generate-proof-key
/usr/bin/coolforkit
/usr/bin/coolconvert
/usr/bin/coolconfig
/usr/bin/loolconfig
/usr/bin/coolmount
/usr/bin/coolstress
/usr/share/coolwsd/discovery.xml
/usr/share/coolwsd/favicon.ico
/usr/share/coolwsd/browser
/usr/share/doc/coolwsd/README
/usr/share/doc/coolwsd/README.vars
/usr/share/doc/coolwsd/metrics.txt
/usr/share/doc/coolwsd/protocol.txt
/usr/share/doc/coolwsd/reference.md
/usr/share/man/man1/coolwsd.1.gz
/usr/share/man/man1/coolforkit.1.gz
/usr/share/man/man1/coolconvert.1.gz
/usr/share/man/man1/coolconfig.1.gz
/usr/share/man/man1/coolwsd-systemplate-setup.1.gz
/usr/share/man/man1/coolwsd-generate-proof-key.1.gz
/usr/share/man/man1/coolmount.1.gz
/usr/share/man/man1/coolstress.1.gz
%{_unitdir}/coolwsd.service
%if 0%{?rhel}
%config(noreplace) /etc/sysconfig/coolwsd
%endif
%if 0%{?suse_version}
/var/adm/fillup-templates/sysconfig.coolwsd
%endif
%config(noreplace) /etc/pam.d/coolwsd
%config(noreplace) %attr(640, cool, root) /etc/coolwsd/coolwsd.xml
%config /etc/coolwsd/coolkitconfig.xcu
%config(noreplace) /etc/nginx/snippets/coolwsd.conf
%if 0%{?suse_version} > 0
%config(noreplace) /etc/apache2/conf-available/coolwsd.conf
%endif
%if 0%{?rhel} > 0
%config(noreplace) /etc/httpd/conf/coolwsd.conf
%endif
%doc README.md
%pre
%if 0%{?suse_version}
%service_add_pre coolwsd.service
%endif
getent group cool >/dev/null || groupadd -r cool
getent passwd cool >/dev/null || useradd -g cool -r cool -d /opt/cool -s /bin/bash
# for filename in `find /opt/cool/systemplate -type f`;do stripped=$(echo -ne $filename | sed -e "s|/opt/cool/systemplate||");rpm -qf --qf="%{NAME}\n" $stripped;done | grep -v devel | grep -v 32bit | grep -v -- -fonts | sort | uniq
%triggerin -- expat fontconfig freetype freetype2 glibc glibc-locale kernel keyutils-libs krb5 krb5-libs libbz2-1 libcap libcap-ng libcap2 libexpat1 libfreetype6 libgcc libgcc_s1 libgcrypt libiscsi libpng libpng12 libpng12-0 libpng15-15 libpng16-16 libstdc++ libstdc++6 libuuid libuuid1 libz1 lsb nss-mdns nss-softokn-freebl pcre sssd sssd-client systemd-libs timezone tzdata zlib
echo -ne "Triggered update of coolwsd systemplate..."
%if 0%{?rhel} >= 7 || 0%{?suse_version} >= 1300
systemctl is-active -q coolwsd && COOLWSD_IS_ACTIVE=1 || COOLWSD_IS_ACTIVE=0
if [ $COOLWSD_IS_ACTIVE == "1" ]; then systemctl stop coolwsd; fi
%endif
# Figure out where LO is installed, let's hope it is not a mount point
# Create a directory for coolwsd on the same file system
loroot=/usr/lib64/libreoffice
coolparent=`cd ${loroot} && cd .. && /bin/pwd`
rm -rf ${coolparent}/cool
mkdir -p ${coolparent}/cool/child-roots
chown cool:cool ${coolparent}/cool
chown cool:cool ${coolparent}/cool/child-roots
fc-cache ${loroot}/share/fonts/truetype
coolwsd-systemplate-setup ${coolparent}/cool/systemplate ${loroot} >/dev/null 2>&1
coolwsd-generate-proof-key >/dev/null 2>&1
%if 0%{?rhel} || 0%{?suse_version}
if [ $COOLWSD_IS_ACTIVE == "1" ]; then systemctl start coolwsd; fi
%endif
echo " Done."
%post
setcap cap_fowner,cap_chown,cap_mknod,cap_sys_chroot=ep /usr/bin/coolforkit
setcap cap_sys_admin=ep /usr/bin/coolmount
if [ -f /etc/loolwsd/loolwsd.xml ]; then /usr/bin/coolconfig migrateconfig --write; fi
%if 0%{?rhel} >= 7
%systemd_post coolwsd.service
%else
%if 0%{?suse_version}
%service_add_post coolwsd.service
%{fillup_only -n coolwsd}
%endif
%endif
%preun
%if 0%{?rhel} >= 7
%systemd_preun coolwsd.service
%else
%if 0%{?suse_version}
%service_del_preun coolwsd.service
%endif
%endif
%postun
%if 0%{?rhel} >= 7
%systemd_postun coolwsd.service
%else
%if 0%{?suse_version}
%service_del_postun coolwsd.service
%endif
%endif
%changelog
* Tue Jan 16 2024 Sandino Araico Sánchez <sandino@sandino.net> - 22.05.14.3-2
- Subida de versión
- Dependencias de libreoffice >= 7.6.3
* Tue Jan 16 2024 Sandino Araico Sánchez <sandino@sandino.net> - 22.05.11.1-1
- Subida de versión
* Tue Jan 16 2024 Sandino Araico Sánchez <sandino@sandino.net> - 22.05.9.6-3
- Dependencia hacia harfbuzz >= 5.1.0
* Fri Aug 18 2023 Sandino Araico Sánchez <sandino@sandino.net> - 22.05.9.6-2
- 22.05.9.6 compila contra libreofficekit 7.5.5.2-4+gob.mx
- Opciones de compilación que usó @renichbon
- Archivo coolwsd.service que mandó @renichbon
* Tue May 09 2023 Sandino Araico Sánchez <sandino@sandino.net> - 22.05.9.6-1
- basado en el spec que subió @imcsk8 de coolwsd cp-22.05.5-4
- coolws 22.05.9.6 compila contra libreofficekit 7.5.3
* Mon Aug 03 2015 Mihai Varga
- added the cronjob
* Tue May 19 2015 Tor Lillqvist
- Initial RPM release

817
rpmbuild/SPECS/libreoffice.spec
View file

File diff suppressed because it is too large Load diff

94
rpmbuild/SPECS/zxing-cpp.spec
View file

@ -1,94 +0,0 @@
Name: zxing-cpp
Version: 1.2.0
Release: 1%{?dist}
Summary: C++ port of the ZXing ("Zebra Crossing") barcode scanning library
# The entire source is ASL 2.0, except:
#
# - TextCodec files, that is, core/src/textcodec/*, are
# (LGPLv2 with exceptions or LGPLv3 with exceptions).
# - core/src/textcodec/JPText{En,De}coder.* are, formally,
# ((LGPLv2 with exceptions or LGPLv3 with exceptions) and BSD),
# which still forms an effective license of
# (LGPLv2 with exceptions or LGPLv3 with exceptions)
# - wrappers/wasm/base64ArrayBuffer.js is MIT (but is not used)
# - thirdparty/stb/stb_image.h and thirdparty/stb/stb_image_write.h are MIT
# (but are unbundled)
#
# The resulting effective license for the combined library is:
License: LGPLv2 with exceptions or LGPLv3 with exceptions
Url: https://github.com/nu-book/zxing-cpp
Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
BuildRequires: gcc-c++
BuildRequires: cmake
BuildRequires: cmake(fmt)
# -static BR’s required by guidelines for tracking of header-only libraries:
BuildRequires: stb_image-devel
BuildRequires: stb_image-static
BuildRequires: stb_image_write-devel
BuildRequires: stb_image_write-static
# https://github.com/nu-book/zxing-cpp/issues/248
Patch0: 0001-Add-a-mode-to-build-against-system-versions-of-depen.patch
# Update stb_image/stb_image_write
# https://github.com/nu-book/zxing-cpp/pull/269
# Fixes CVE-2021-28021, CVE-2021-42715, and CVE-2021-42716, and adds a patch
# file for zxing-cpp-specific changes
Patch1: %{url}/pull/269.patch
%description
ZXing-C++ ("zebra crossing") is an open-source, multi-format 1D/2D barcode
image processing library implemented in C++.
%package devel
# The entire contents are ASL 2.0, except:
#
# - %%{_includedir}/ZXing/textcodec/*.h are exactly or effectively
# (LGPLv2 with exceptions or LGPLv3 with exceptions)
#
# See licensing breakdown above base package’s License field for further
# details.
License: ASL 2.0 and (LGPLv2 with exceptions or LGPLv3 with exceptions)
Summary: Development files for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.
%prep
%autosetup -p1
# remove bundled stb libraries:
rm -v thirdparty/stb/stb_image_write.h thirdparty/stb/stb_image.h
# stb_image.h is trivially forked: reconstruct the changes with the latest
# unbundled copy
cp -p %{_includedir}/stb/stb_image.h thirdparty/stb/
pushd thirdparty/stb
patch -p1 < stb_image.patch
popd
%build
%cmake -DBUILD_EXAMPLES=OFF
%cmake_build
%install
%cmake_install
%check
%ctest
%files
%license LICENSE LICENSE.ZXing LICENSE.Qt LGPL_EXCEPTION.Qt NOTICE
%{_libdir}/libZXing.so.1
%{_libdir}/libZXing.so.%{version}
%files devel
%doc README.md
%{_includedir}/ZXing/
%{_libdir}/libZXing.so
%{_libdir}/cmake/ZXing/
%{_libdir}/pkgconfig/zxing.pc
%changelog
* Fri Dec 10 2021 Caolán McNamara <caolanm@redhat.com> 1.2.0-1
- initial import

34
scripts/dict-pkg.sh
View file

@ -1,34 +0,0 @@
#!/bin/bash
SRC=dict.lst
[[ -f $SRC ]] || exit 1
SPEC=CentOS-9/SPECS/libreoffice.spec
[[ -f $SPEC ]] || exit 2
for D in `cat dict.lst` ; do
LNG=`cut -d '-' -f 2-3 <<< $D`
LNW=`sed 's/#.*$//' $SPEC | grep 'langpack -l' | grep " $LNG " \
| head -1 | cut -d ' ' -f 5`
if [[ -n $LNW ]] ; then
if [[ -n `grep langpack <<< $LNW` ]] ; then
#echo "Looking for $LNG " >&2
LNW=`sed 's/#.*$//' $SPEC | grep -B1 $LNG | grep 'define' \
| head -1 | cut -d ' ' -f 3-9`
#LNW=$LNP
fi
#echo "$D - $LNW"
cat << EOF
%package myspell-$D
Summary: Myspell $LNW dictionary
BuildArch: noarch
%description myspell-$D
Myspell $LNW dictionary
%files myspell-$D
%{baseinstdir}/share/extensions/$D
EOF
fi
done

36
scripts/libreoffice-backport-1.0.sh
View file

@ -1,36 +0,0 @@
git checkout Sandino-2023-07-08-base
git checkout -b gobmx-1.0-rebase-branch
git merge gob-mx-1.0
git checkout upstream
git tag Sandino-branch-point-2024-01-28
git checkout master
git rebase --onto Sandino-branch-point-2024-01-28 Sandino-2023-07-08-base gobmx-1.0-rebase-branch
git log --oneline --graph
git checkout Sandino-branch-point-2024-01-28
git checkout -b gobmx-1.0-backport-24.2
git merge gobmx-1.0-rebase-branch
git log --oneline --graph
git checkout master
git rebase --onto libreoffice-24-2-branch-point Sandino-branch-point-2024-01-28 gobmx-1.0-backport-24.2
git log --oneline --graph
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

527
scripts/libreoffice-backport.sh
View file

@ -1,527 +0,0 @@
#!/bin/bash
cd /usr/src/libreoffice
cd office-gobmx/
git branch
git checkout master
git pull
git checkout upstream
git pull
git checkout office-gobmx
git pull
git checkout merge-office-gobmx
git log --oneline --graph
# * 3bdfa25eebcd (HEAD -> merge-office-gobmx) Merge branch 'merge-features-LO' into merge-office-gobmx
# |\
# | * a1ddf9127cbf (merge-features-LO) Corregida instrucción de descarga
# | * eae787411b4d Modificado archivo tar xz a gz
# | * 7435ee002391 Fonts added
# | * e07c2005f6a7 Fuentes monserrat y gmx
# | * 38e2537e17e4 Modificacion al build y borrado UPDATEURL
# | * 8cce9ed454c0 Archivos de distro-config de brand Office
# | * 5f7c01a69216 Custom images and referencies added
# * | f4f17a292b13 Merge branch 'office-gobmx' into merge-office-gobmx
# |\ \
# | * | 6dd3de980fae (origin/test-win11, origin/master, origin/HEAD, office-gobmx) Custom images and referencies added
# * | | a5f3d80dbd05 Modificacion al build y borrado UPDATEURL
# * | | f257c9faa1c7 Archivos de distro-config de brand Office
# * | | befaca4b8f53 Custom images and referencies added
# | |/
# |/|
# * | 42364fbfafaa tdf#104918 Add Firebird's DATEDIFF syntax to the sql parser
# * | 616c1da0cc8b Fix typos
git rebase upstream
# dropping 6dd3de980fae66d02f30e99276bb5857e8fd543f Custom images and referencies added -- patch contents already upstream
# dropping 5f7c01a69216f382b6cd07d5c5321a27a4fe6350 Custom images and referencies added -- patch contents already upstream
# dropping 8cce9ed454c0d12925031772ec5f6ae4d38d96d3 Archivos de distro-config de brand Office -- patch contents already upstream
# dropping 38e2537e17e4da4aa601b1f046649e70622385a5 Modificacion al build y borrado UPDATEURL -- patch contents already upstream
# Successfully rebased and updated refs/heads/merge-office-gobmx.
git log --oneline --graph
# * e6c56cf96e02 (HEAD -> merge-office-gobmx) Corregida instrucción de descarga
# * 486586c643f1 Modificado archivo tar xz a gz
# * 0c08dfe318b7 Fonts added
# * e652e8d4919a Fuentes monserrat y gmx
# * d40798b3836b Modificacion al build y borrado UPDATEURL
# * af8dbc35b9f3 Archivos de distro-config de brand Office
# * 7bd6075d04d2 Custom images and referencies added
# * 34d32740d898 (gerrit/master, upstream) on invalidating other views, specific what Tab is invalidated
# * a35311beef37 for LibreOfficeKit::isActive we can skip to LogicInvalidate
git merge office-gobmx
# Merge made by the 'ort' strategy.
# custom_images/about.svg | 2516 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
# custom_images/logo.svg | 1 +
# fonts/gmx-fonts.tar.gz | Bin 0 -> 2409292 bytes
# 3 files changed, 2517 insertions(+)
# create mode 100644 custom_images/about.svg
# create mode 100644 custom_images/logo.svg
# create mode 100644 fonts/gmx-fonts.tar.gz
git log --oneline --graph
# * 32e6b8531261 (HEAD -> merge-office-gobmx) Merge branch 'office-gobmx' into merge-office-gobmx
# |\
# | * 2c08276498f4 (origin/office-gobmx, office-gobmx) Merge branch 'ipar/features-LO' into 'office-gobmx'
# | |\
# | | * 4d471b7edb71 Merge branch 'logos' into 'ipar/features-LO'
# | | |\
# | | | * d03adba81b37 logo image updated
# | | | * 8d8ef5d2dcaa Restauracion link repos/src
# | | | * effe4847a786 (origin/logos, logos) Modificado link de descarga de fuentes
# | | | * f7f97c6f3bdd Cambios en logo
# | | |/
# | | * 4c5250184feb (origin/ipar/features-LO, ipar/features-LO) Corregida instrucción de descarga
# | | * df95e5c7691a Modificado archivo tar xz a gz
# | | * 3b93cbfa68e6 Merge branch 'fonts' into 'ipar/features-LO'
# | | |\
# | | | * 8f903a611d09 (origin/fonts, fonts) Fonts added
# | | |/
# | |/|
# | | * b81b8d03d6e6 Fuentes monserrat y gmx
# | | * f8f77d53f46c Merge branch 'master' into 'ipar/features-LO'
# | | |\
# | | |/
# | |/|
# | * | 6dd3de980fae (origin/test-win11, origin/master, origin/HEAD) Custom images and referencies added
# | | * bc323d264231 Modificacion al build y borrado UPDATEURL
# | | * d9e88050c6af Archivos de distro-config de brand Office
# * | | e6c56cf96e02 Corregida instrucción de descarga
# * | | 486586c643f1 Modificado archivo tar xz a gz
# * | | 0c08dfe318b7 Fonts added
# * | | e652e8d4919a Fuentes monserrat y gmx
# * | | d40798b3836b Modificacion al build y borrado UPDATEURL
# * | | af8dbc35b9f3 Archivos de distro-config de brand Office
# * | | 7bd6075d04d2 Custom images and referencies added
# * | | 34d32740d898 (gerrit/master, upstream) on invalidating other views, specific what Tab is invalidated
# * | | a35311beef37 for LibreOfficeKit::isActive we can skip to LogicInvalidate
git branch
# Sandino/2023-07-08
# fonts
# ipar/features-LO
# logos
# master
# merge-features-LO
# merge-fonts
# merge-logos
#* merge-office-gobmx
# office-gobmx
# office-gobmx-7.4.5.1
# office-gobmx-7.4.7.2
# office-gobmx-7.5-branch
# office-gobmx-7.5.4.2
# office-gobmx-7.6.0.1
# ofiice-gobmx-7.4-001-custom-images
# ofiice-gobmx-7.4-branch
# test-logos-7.5
# test-logos-7.5.5.1
# test-logos-7.5.5.2
# test-office-gobmx
# upstream
git checkout -b backport-gobmx-7.5
# Switched to a new branch 'backport-gobmx-7.5'
git checkout office-gobmx-7.5-branch
git log --oneline --graph
# * 9716480d7f84 (HEAD -> office-gobmx-7.5-branch, origin/office-gobmx-7.5-branch) Modificacion al build y borrado UPDATEURL
# * 25e8fddddd42 Archivos de distro-config de brand Office
# * cf4545f2ac1e Custom images and referencies added
# * 77cd3d7ad444 (tag: libreoffice-7.5.0.1) Version 7.5.0.1, tag libreoffice-7.5.0.1
# * 2d7fb3cd1181 bump product version to 7.5.0.1
# https://git-scm.com/book/en/v2/Git-Branching-Rebasing
git rebase --onto libreoffice-7.5.0.1 upstream backport-gobmx-7.5
# Auto-merging cui/source/dialogs/about.cxx
# CONFLICT (content): Merge conflict in cui/source/dialogs/about.cxx
# error: could not apply 7bd6075d04d2... Custom images and referencies added
vi cui/source/dialogs/about.cxx # merge de 1 línea (la que se borra es <<<< HEAD)
# <<<<<<< HEAD
# if (SfxApplication::loadBrandSvg("shell/about", aBackgroundBitmap, nWidth * 0.9)) {
# =======
# if (SfxApplication::loadBrandSvg("shell/MexGob", aBackgroundBitmap, nWidth * 0.9)) {
# >>>>>>> 7bd6075d04d2 (Custom images and referencies added)
git add cui/source/dialogs/about.cxx
git rebase --continue
# Auto-merging Makefile.fetch
# CONFLICT (content): Merge conflict in Makefile.fetch
# error: could not apply b81b8d03d6e6... Fuentes monserrat y gmx
vi Makefile.fetch # merge de 1 línea (la que se borra es <<<< HEAD)
git add Makefile.fetch
git rebase --continue
# Successfully rebased and updated refs/heads/backport-gobmx-7.5.
git branch
# Sandino/2023-07-08
# * backport-gobmx-7.5
# fonts
git log --oneline --graph
# * c3a14c4d09ec (HEAD -> backport-gobmx-7.5) logo image updated
# * f1b40f9a1eb5 Restauracion link repos/src
# * 7f17590772d9 Modificado link de descarga de fuentes
# * 0898ab93b686 Cambios en logo
# * 059d798a2888 Corregida instrucción de descarga
# * 25a576d62436 Fuentes monserrat y gmx
# * a04e1f43871f Corregida instrucción de descarga
# * 2c6d262d1693 Modificado archivo tar xz a gz
# * 52809ef04bee Fonts added
# * 3e78de880e79 Fuentes monserrat y gmx
# * fca537bb124e Modificacion al build y borrado UPDATEURL
# * c7e521fdf24f Archivos de distro-config de brand Office
# * 60dbf3b96d0e Custom images and referencies added
# * 77cd3d7ad444 (tag: libreoffice-7.5.0.1) Version 7.5.0.1, tag libreoffice-7.5.0.1
# * 2d7fb3cd1181 bump product version to 7.5.0.1
git checkout office-gobmx-7.5.4.2
git log --oneline --graph
# * f983157cbec6 (HEAD -> office-gobmx-7.5.4.2, origin/office-gobmx-7.5.4.2) Modificacion al build y borrado UPDATEURL
# * 447616056e24 Archivos de distro-config de brand Office
# * a1890cbcb03a Custom images and referencies added
# * 36ccfdc35048 (tag: libreoffice-7.5.4.2) Version 7.5.4.2, tag libreoffice-7.5.4.2
# * 2a18b6147ac2 bump product version to 7.5.4.2
git checkout backport-gobmx-7.5
git checkout -b backport-gobmx-7.5.4.2
git rebase libreoffice-7.5.4.2
# Auto-merging configure.ac
# CONFLICT (content): Merge conflict in configure.ac
# error: could not apply 2d7fb3cd1181... bump product version to 7.5.0.1
vi configure.ac # merge de 1 línea (ahora nos quedamos con <<<< HEAD)
# <<<<<<< HEAD
# AC_INIT([LibreOffice],[7.5.4.2],[],[],[http://documentfoundation.org/])
# =======
# AC_INIT([LibreOffice],[7.5.0.1],[],[],[http://documentfoundation.org/])
# >>>>>>> 2d7fb3cd1181 (bump product version to 7.5.0.1)
git add configure.ac
git rebase --continue
# Failed to merge submodule dictionaries (not checked out)
# CONFLICT (submodule): Merge conflict in dictionaries
# Failed to merge submodule helpcontent2 (not checked out)
# CONFLICT (submodule): Merge conflict in helpcontent2
# Failed to merge submodule translations (not checked out)
# CONFLICT (submodule): Merge conflict in translations
# Recursive merging with submodules currently only supports trivial cases.
git rebase --skip
#Successfully rebased and updated refs/heads/backport-gobmx-7.5.4.2.
git log --oneline --graph
# * ef3a7d5303e6 (HEAD -> backport-gobmx-7.5.4.2) logo image updated
# * d8ad1c1944dd Restauracion link repos/src
# * 0d0668e29a45 Modificado link de descarga de fuentes
# * 0eb95d793d79 Cambios en logo
# * 95ee6b3a6cda Corregida instrucción de descarga
# * 0d5224ff89e8 Fuentes monserrat y gmx
# * 323fc35fe00c Corregida instrucción de descarga
# * 2b90813bf084 Modificado archivo tar xz a gz
# * 1108dd9775c8 Fonts added
# * e7b586fc66a0 Fuentes monserrat y gmx
# * 52ef278b6b1f Modificacion al build y borrado UPDATEURL
# * 75d0ce7b4694 Archivos de distro-config de brand Office
# * dac0ec8a1d1a Custom images and referencies added
# * 36ccfdc35048 (tag: libreoffice-7.5.4.2) Version 7.5.4.2, tag libreoffice-7.5.4.2
# * 2a18b6147ac2 bump product version to 7.5.4.2
git checkout office-gobmx-7.5.4.2
git merge backport-gobmx-7.5.4.2
# Merge made by the 'ort' strategy.
# .git-hooks/pre-commit | 2 +-
# Makefile.fetch | 4 +
# Repository.mk | 1 +
# custom_images/about.svg | 2516 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
# custom_images/logo.svg | 1 +
# download.lst | 3 +
# external/more_fonts/ExternalPackage_gmx.mk | 49 +++
# external/more_fonts/Module_more_fonts.mk | 2 +
# external/more_fonts/UnpackedTarball_gmx.mk | 14 +
# fonts/gmx-fonts.tar.gz | Bin 0 -> 2409292 bytes
# solenv/flatpak-manifest.in | 7 +
# 11 files changed, 2598 insertions(+), 1 deletion(-)
# create mode 100644 custom_images/about.svg
# create mode 100644 custom_images/logo.svg
# create mode 100644 external/more_fonts/ExternalPackage_gmx.mk
# create mode 100644 external/more_fonts/UnpackedTarball_gmx.mk
# create mode 100644 fonts/gmx-fonts.tar.gz
git log --oneline --graph
# * 839cfb6a57d8 (HEAD -> office-gobmx-7.5.4.2) Merge branch 'backport-gobmx-7.5.4.2' into office-gobmx-7.5.4.2
# |\
# | * ef3a7d5303e6 (backport-gobmx-7.5.4.2) logo image updated
# | * d8ad1c1944dd Restauracion link repos/src
# | * 0d0668e29a45 Modificado link de descarga de fuentes
# | * 0eb95d793d79 Cambios en logo
# | * 95ee6b3a6cda Corregida instrucción de descarga
# | * 0d5224ff89e8 Fuentes monserrat y gmx
# | * 323fc35fe00c Corregida instrucción de descarga
# | * 2b90813bf084 Modificado archivo tar xz a gz
# | * 1108dd9775c8 Fonts added
# | * e7b586fc66a0 Fuentes monserrat y gmx
# | * 52ef278b6b1f Modificacion al build y borrado UPDATEURL
# | * 75d0ce7b4694 Archivos de distro-config de brand Office
# | * dac0ec8a1d1a Custom images and referencies added
# * | f983157cbec6 (origin/office-gobmx-7.5.4.2) Modificacion al build y borrado UPDATEURL
# * | 447616056e24 Archivos de distro-config de brand Office
# * | a1890cbcb03a Custom images and referencies added
# |/
# * 36ccfdc35048 (tag: libreoffice-7.5.4.2) Version 7.5.4.2, tag libreoffice-7.5.4.2
# * 2a18b6147ac2 bump product version to 7.5.4.2
git push
# To git.softwarelibre.mx:strepsirrhini/office-gobmx.git
# f983157cbec6..839cfb6a57d8 office-gobmx-7.5.4.2 -> office-gobmx-7.5.4.2
git tag | grep libreoffice-7.5
# libreoffice-7-5-branch-point
# libreoffice-7.5.0.0.alpha1
# libreoffice-7.5.0.0.beta1
# libreoffice-7.5.0.1
# libreoffice-7.5.0.2
# libreoffice-7.5.0.3
# libreoffice-7.5.1.1
# libreoffice-7.5.1.2
# libreoffice-7.5.2.1
# libreoffice-7.5.2.2
# libreoffice-7.5.3.1
# libreoffice-7.5.3.2
# libreoffice-7.5.4.1
# libreoffice-7.5.4.2
# libreoffice-7.5.5.1
git checkout upstream
git checkout libreoffice-7.5.5.1
git checkout -b office-gobmx-7.5.5.1
git log --oneline --graph
# * 2c5e46c1980e (HEAD -> office-gobmx-7.5.5.1, tag: libreoffice-7.5.5.1) Version 7.5.5.1, tag libreoffice-7.5.5.1
# * 1aebdd74e1ea bump product version to 7.5.5.1
# * d0e9744e48cf Branch libreoffice-7-5-5
git checkout backport-gobmx-7.5.4.2
git log --oneline --graph
git checkout -b backport-gobmx-7.5.5.1
git rebase libreoffice-7.5.5.1
# Auto-merging .gitreview
# CONFLICT (content): Merge conflict in .gitreview
# Failed to merge submodule dictionaries (not checked out)
# CONFLICT (submodule): Merge conflict in dictionaries
# Failed to merge submodule helpcontent2 (not checked out)
# CONFLICT (submodule): Merge conflict in helpcontent2
# Failed to merge submodule translations (not checked out)
# CONFLICT (submodule): Merge conflict in translations
vi .gitreview # merge de 1 línea (ahora nos quedamos con <<<< HEAD)
# <<<<<<< HEAD
# defaultbranch=libreoffice-7-5-5
# =======
# defaultbranch=libreoffice-7-5-4
# >>>>>>> 80f8211a86b2 (Branch libreoffice-7-5-4)
git add .gitreview
git rebase --continue
# dictionaries: needs merge
# helpcontent2: needs merge
# translations: needs merge
# You must edit all merge conflicts and then
# mark them as resolved using git add
git rebase --skip
# Auto-merging configure.ac
# CONFLICT (content): Merge conflict in configure.ac
# error: could not apply 0545bb2635ed... bump product version to 7.5.4.1.0+
vi configure.ac # merge de 1 línea (ahora nos quedamos con <<<< HEAD)
# <<<<<<< HEAD
# AC_INIT([LibreOffice],[7.5.5.1],[],[],[http://documentfoundation.org/])
# =======
# AC_INIT([LibreOffice],[7.5.4.1.0+],[],[],[http://documentfoundation.org/])
# >>>>>>> 0545bb2635ed (bump product version to 7.5.4.1.0+)
git add configure.ac
git rebase --continue
# Failed to merge submodule translations (not checked out)
# CONFLICT (submodule): Merge conflict in translations
git rebase --skip
# Auto-merging configure.ac
# CONFLICT (content): Merge conflict in configure.ac
# error: could not apply 2a18b6147ac2... bump product version to 7.5.4.2
vi configure.ac # merge de 1 línea (ahora nos quedamos con <<<< HEAD)
# <<<<<<< HEAD
# AC_INIT([LibreOffice],[7.5.5.1],[],[],[http://documentfoundation.org/])
# =======
# AC_INIT([LibreOffice],[7.5.4.2],[],[],[http://documentfoundation.org/])
# >>>>>>> 2a18b6147ac2 (bump product version to 7.5.4.2)
git add configure.ac
git rebase --continue
#Failed to merge submodule dictionaries (not checked out)
#CONFLICT (submodule): Merge conflict in dictionaries
#Failed to merge submodule helpcontent2 (not checked out)
#CONFLICT (submodule): Merge conflict in helpcontent2
#Failed to merge submodule translations (not checked out)
#CONFLICT (submodule): Merge conflict in translations
#Recursive merging with submodules currently only supports trivial cases.
git rebase --skip
#Successfully rebased and updated refs/heads/backport-gobmx-7.5.5.1.
git log --oneline --graph
# * 834913d296fe (HEAD -> backport-gobmx-7.5.5.1) logo image updated
# * af9834b0d961 Restauracion link repos/src
# * add6a95dbdaf Modificado link de descarga de fuentes
# * a532c3217d12 Cambios en logo
# * 512a322aa72f Corregida instrucción de descarga
# * ed08ea286b25 Fuentes monserrat y gmx
# * 684bdc893345 Corregida instrucción de descarga
# * dd12ecc76930 Modificado archivo tar xz a gz
# * 7357239b4e14 Fonts added
# * 6530a88db69f Fuentes monserrat y gmx
# * 70709c6186a6 Modificacion al build y borrado UPDATEURL
# * 38db47a28ad0 Archivos de distro-config de brand Office
# * 342bd97085b9 Custom images and referencies added
# * 2c5e46c1980e (tag: libreoffice-7.5.5.1, office-gobmx-7.5.5.1) Version 7.5.5.1, tag libreoffice-7.5.5.1
# * 1aebdd74e1ea bump product version to 7.5.5.1
# * d0e9744e48cf Branch libreoffice-7-5-5
git checkout office-gobmx-7.5.5.1
git merge backport-gobmx-7.5.5.1
# Updating 2c5e46c1980e..834913d296fe
# Fast-forward
# .git-hooks/pre-commit | 2 +-
# Makefile.fetch | 4 +
# Repository.mk | 1 +
# cui/source/dialogs/about.cxx | 5 +-
# custom_images/MexGob.svg | 2516 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
# custom_images/about.svg | 2516 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
# custom_images/logo.svg | 1 +
# distro-configs/OfficeLinux.conf | 10 +
# distro-configs/OfficeWin64.conf | 24 ++
# download.lst | 3 +
# external/more_fonts/ExternalPackage_gmx.mk | 49 +++
# external/more_fonts/Module_more_fonts.mk | 2 +
# external/more_fonts/UnpackedTarball_gmx.mk | 14 +
# fonts/gmx-fonts.tar.gz | Bin 0 -> 2409292 bytes
# instsetoo_native/util/openoffice.lst.in | 73 ++++
# solenv/flatpak-manifest.in | 7 +
# 16 files changed, 5223 insertions(+), 4 deletions(-)
# create mode 100644 custom_images/MexGob.svg
# create mode 100644 custom_images/about.svg
# create mode 100644 custom_images/logo.svg
# create mode 100644 distro-configs/OfficeLinux.conf
# create mode 100644 distro-configs/OfficeWin64.conf
# create mode 100644 external/more_fonts/ExternalPackage_gmx.mk
# create mode 100644 external/more_fonts/UnpackedTarball_gmx.mk
# create mode 100644 fonts/gmx-fonts.tar.gz
git log --oneline --graph
# * 834913d296fe (HEAD -> office-gobmx-7.5.5.1, backport-gobmx-7.5.5.1) logo image updated
# * af9834b0d961 Restauracion link repos/src
# * add6a95dbdaf Modificado link de descarga de fuentes
# * a532c3217d12 Cambios en logo
# * 512a322aa72f Corregida instrucción de descarga
# * ed08ea286b25 Fuentes monserrat y gmx
# * 684bdc893345 Corregida instrucción de descarga
# * dd12ecc76930 Modificado archivo tar xz a gz
# * 7357239b4e14 Fonts added
# * 6530a88db69f Fuentes monserrat y gmx
# * 70709c6186a6 Modificacion al build y borrado UPDATEURL
# * 38db47a28ad0 Archivos de distro-config de brand Office
# * 342bd97085b9 Custom images and referencies added
# * 2c5e46c1980e (tag: libreoffice-7.5.5.1) Version 7.5.5.1, tag libreoffice-7.5.5.1
# * 1aebdd74e1ea bump product version to 7.5.5.1
# * d0e9744e48cf Branch libreoffice-7-5-5
git push --set-upstream origin office-gobmx-7.5.5.1
# To git.softwarelibre.mx:strepsirrhini/office-gobmx.git
# * [new branch] office-gobmx-7.5.5.1 -> office-gobmx-7.5.5.1
# branch 'office-gobmx-7.5.5.1' set up to track 'origin/office-gobmx-7.5.5.1'.
git diff libreoffice-7.5.5.1
mkdir ../formatpatch-2023-08-18
git format-patch -o ../formatpatch-2023-08-18 libreoffice-7.5.5.1
# ../formatpatch-2023-08-18/0001-Custom-images-and-referencies-added.patch
# ../formatpatch-2023-08-18/0002-Archivos-de-distro-config-de-brand-Office.patch
# ../formatpatch-2023-08-18/0003-Modificacion-al-build-y-borrado-UPDATEURL.patch
# ../formatpatch-2023-08-18/0004-Fuentes-monserrat-y-gmx.patch
# ../formatpatch-2023-08-18/0005-Fonts-added.patch
# ../formatpatch-2023-08-18/0006-Modificado-archivo-tar-xz-a-gz.patch
# ../formatpatch-2023-08-18/0007-Corregida-instrucci-n-de-descarga.patch
# ../formatpatch-2023-08-18/0008-Fuentes-monserrat-y-gmx.patch
# ../formatpatch-2023-08-18/0009-Corregida-instrucci-n-de-descarga.patch
# ../formatpatch-2023-08-18/0010-Cambios-en-logo.patch
# ../formatpatch-2023-08-18/0011-Modificado-link-de-descarga-de-fuentes.patch
# ../formatpatch-2023-08-18/0012-Restauracion-link-repos-src.patch
# ../formatpatch-2023-08-18/0013-logo-image-updated.patch
### backport de la versión 7.6
git tag | grep libreoffice-7.6
# libreoffice-7-6-branch-point
# libreoffice-7.6.0.0.alpha1
# libreoffice-7.6.0.0.beta1
# libreoffice-7.6.0.1
git checkout libreoffice-7-6-branch-point
git checkout -b office-gobmx-7.6-branch
git checkout merge-office-gobmx
git checkout -b backport-gobmx-7.6
git rebase --onto libreoffice-7-6-branch-point upstream backport-gobmx-7.6
# Auto-merging cui/source/dialogs/about.cxx
# CONFLICT (content): Merge conflict in cui/source/dialogs/about.cxx
# error: could not apply 7bd6075d04d2... Custom images and referencies added
vi cui/source/dialogs/about.cxx
git add cui/source/dialogs/about.cxx
git rebase --continue
#Auto-merging Makefile.fetch
#CONFLICT (content): Merge conflict in Makefile.fetch
#error: could not apply b81b8d03d6e6... Fuentes monserrat y gmx
vi Makefile.fetch
git add Makefile.fetch
git rebase --continue
# Successfully rebased and updated refs/heads/backport-gobmx-7.6.
git log --oneline --graph
# * c48759ec23e6 (HEAD -> backport-gobmx-7.6) logo image updated
# * df5c1af513f7 Restauracion link repos/src
# * 4c4fb6ae341b Modificado link de descarga de fuentes
# * 726b88b2aa1d Cambios en logo
# * 5d2bff76e124 Corregida instrucción de descarga
# * af6a0f5f0b4a Fuentes monserrat y gmx
# * c612942b7f46 Corregida instrucción de descarga
# * 4d8306149dad Modificado archivo tar xz a gz
# * ca753ba3b968 Fonts added
# * 495744f62e26 Fuentes monserrat y gmx
# * 5c2e7e004997 Modificacion al build y borrado UPDATEURL
# * e9ea190ade84 Archivos de distro-config de brand Office
# * 6c0439ee4f38 Custom images and referencies added
# * 6f227b0dd912 (tag: libreoffice-7-6-branch-point, office-gobmx-7.6-branch) Update git submodules
# * 2940fb7d2aba tdf#64830: Don’t require hunspell dictionary for every Arabic locale
# * e0a6c730b9fc Update git submodules
git checkout office-gobmx-7.6-branch
git merge backport-gobmx-7.6
git checkout -b office-gobmx-7.6.0.1
git rebase libreoffice-7.6.0.1
git log --oneline --graph
# * ba6ac0cbf319 (HEAD -> office-gobmx-7.6.0.1) logo image updated
# * 1ad3e4094f2e Restauracion link repos/src
# * f2fddd20beea Modificado link de descarga de fuentes
# * c671d19775c6 Cambios en logo
# * c249224c123d Corregida instrucción de descarga
# * 2a3065395481 Fuentes monserrat y gmx
# * 52df24398dfc Corregida instrucción de descarga
# * 8ade7f36535f Modificado archivo tar xz a gz
# * d8174c2c6a7e Fonts added
# * 67d71742de48 Fuentes monserrat y gmx
# * bb34bb0c48ed Modificacion al build y borrado UPDATEURL
# * 5c707ee188f6 Archivos de distro-config de brand Office
# * b49749cab20c Custom images and referencies added
# * 776eaf34564c (tag: libreoffice-7.6.0.1) Version 7.6.0.1, tag libreoffice-7.6.0.1
# * f489f1da6dcc bump product version to 7.6.0.1
git push --set-upstream origin office-gobmx-7.6.0.1
mkdir ../formatpatch-2023-08-22-7.6.0.1
git format-patch -o ../formatpatch-2023-08-22-7.6.0.1 libreoffice-7.6.0.1
# ../formatpatch-2023-08-22-7.6.0.1/0001-Custom-images-and-referencies-added.patch
# ../formatpatch-2023-08-22-7.6.0.1/0002-Archivos-de-distro-config-de-brand-Office.patch
# ../formatpatch-2023-08-22-7.6.0.1/0003-Modificacion-al-build-y-borrado-UPDATEURL.patch
# ../formatpatch-2023-08-22-7.6.0.1/0004-Fuentes-monserrat-y-gmx.patch
# ../formatpatch-2023-08-22-7.6.0.1/0005-Fonts-added.patch
# ../formatpatch-2023-08-22-7.6.0.1/0006-Modificado-archivo-tar-xz-a-gz.patch
# ../formatpatch-2023-08-22-7.6.0.1/0007-Corregida-instrucci-n-de-descarga.patch
# ../formatpatch-2023-08-22-7.6.0.1/0008-Fuentes-monserrat-y-gmx.patch
# ../formatpatch-2023-08-22-7.6.0.1/0009-Corregida-instrucci-n-de-descarga.patch
# ../formatpatch-2023-08-22-7.6.0.1/0010-Cambios-en-logo.patch
# ../formatpatch-2023-08-22-7.6.0.1/0011-Modificado-link-de-descarga-de-fuentes.patch
# ../formatpatch-2023-08-22-7.6.0.1/0012-Restauracion-link-repos-src.patch
# ../formatpatch-2023-08-22-7.6.0.1/0013-logo-image-updated.patch

30
scripts/weekly-update.sh
View file

@ -1,30 +0,0 @@
#Es necesario agregar el remoto de core
#git remote add upstream https://git.libreoffice.org/core
set -x
pushd night-v2-updates
git fetch --all --tags
git merge --abort
git reset --hard
git clean -df
git checkout -q -f origin/master
git fetch upstream master
DATE="$(date +%Y-%m-%d)"
git branch -D actualizacion-master-"$DATE"
git checkout -b actualizacion-master-"$DATE"
git merge --no-commit upstream/master
if [ "$?" -eq "0" ]; then
#hacer push de rama
git commit -a -m "actualizacion automatica $DATE"
git push origin actualizacion-master-"$DATE"
else
#enviar mensaje de log de error
echo "ERR_BOT: No actualizO repositorio"
fi
popd