From c1b004a586010da0f249550a075b2955ce76ffca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandino=20Araico=20S=C3=A1nchez?= Date: Sun, 14 Apr 2024 05:39:12 -0600 Subject: [PATCH 01/19] Spec de Fedora 24.2.2.1 --- rpmbuild/SPECS/libreoffice.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/rpmbuild/SPECS/libreoffice.spec b/rpmbuild/SPECS/libreoffice.spec index e7d8995..9b86076 100644 --- a/rpmbuild/SPECS/libreoffice.spec +++ b/rpmbuild/SPECS/libreoffice.spec @@ -2,14 +2,14 @@ ## (rpmautospec version 0.6.1) ## RPMAUTOSPEC: autorelease, autochangelog %define autorelease(e:s:pb:n) %{?-p:0.}%{lua: - release_number = 5; + release_number = 3; base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); print(release_number + base_release_number - 1); }%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} ## END: Set by rpmautospec # download path contains version without the last (fourth) digit -%global libo_version 24.2.1 +%global libo_version 24.2.2 # Should contain .alphaX / .betaX, if this is pre-release (actually # pre-RC) version. The pre-release string is part of tarball file names, # so we need a way to define it easily at one place. @@ -91,7 +91,7 @@ ExcludeArch: %{ix86} Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 -Version: %{libo_version}.2 +Version: %{libo_version}.1 %if 0%{?libo_prerelease} Release: %autorelease -e %{?libo_prerelease} %else @@ -339,6 +339,7 @@ Patch11: lo-7.6-ppc64le-tests.patch # https://bugs.gentoo.org/917618 # https://bugs.documentfoundation.org/show_bug.cgi?id=158108 Patch12: libreoffice-7.5.8.2-icu-74-compatibility.patch +# Patch for kf6 scaling. Patch13: 86abb6fd8a8f680f9fc5ff1db775845c9f4e254b.patch Patch500: 0001-disable-libe-book-support.patch # https://lists.freedesktop.org/archives/libreoffice/2023-September/090948.html @@ -2349,9 +2350,12 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || : %changelog ## START: Generated by rpmautospec -* Mon Mar 18 2024 Gwyn Ciesla - 1:24.2.1.2-5 +* Mon Mar 18 2024 Gwyn Ciesla - 1:24.2.2.1-2 - Patch for kf6 scaling +* Wed Mar 13 2024 Gwyn Ciesla - 1:24.2.2.1-1 +- 24.2.2.1 + * Fri Mar 08 2024 Neal Gompa - 1:24.2.1.2-2 - Rework build conditionals for firebird+kf5+kf6 and fix supplements for kf5 From c3121c40f9f9528a8e6552d68ba183c2088ac15b Mon Sep 17 00:00:00 2001 From: Sandino Araico Sanchez Date: Thu, 20 Jun 2024 22:06:57 -0600 Subject: [PATCH 02/19] Spec de Fedora 24.2.3.2-2 --- rpmbuild/SPECS/libreoffice.spec | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/rpmbuild/SPECS/libreoffice.spec b/rpmbuild/SPECS/libreoffice.spec index 9b86076..e390a51 100644 --- a/rpmbuild/SPECS/libreoffice.spec +++ b/rpmbuild/SPECS/libreoffice.spec @@ -1,15 +1,15 @@ ## START: Set by rpmautospec -## (rpmautospec version 0.6.1) +## (rpmautospec version 0.6.3) ## RPMAUTOSPEC: autorelease, autochangelog %define autorelease(e:s:pb:n) %{?-p:0.}%{lua: - release_number = 3; + release_number = 2; base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); print(release_number + base_release_number - 1); }%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} ## END: Set by rpmautospec # download path contains version without the last (fourth) digit -%global libo_version 24.2.2 +%global libo_version 24.2.3 # Should contain .alphaX / .betaX, if this is pre-release (actually # pre-RC) version. The pre-release string is part of tarball file names, # so we need a way to define it easily at one place. @@ -91,7 +91,7 @@ ExcludeArch: %{ix86} Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 -Version: %{libo_version}.1 +Version: %{libo_version}.2 %if 0%{?libo_prerelease} Release: %autorelease -e %{?libo_prerelease} %else @@ -339,8 +339,6 @@ Patch11: lo-7.6-ppc64le-tests.patch # https://bugs.gentoo.org/917618 # https://bugs.documentfoundation.org/show_bug.cgi?id=158108 Patch12: libreoffice-7.5.8.2-icu-74-compatibility.patch -# Patch for kf6 scaling. -Patch13: 86abb6fd8a8f680f9fc5ff1db775845c9f4e254b.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 @@ -751,7 +749,7 @@ A plug-in for LibreOffice that enables integration into the KDE Frameworks 6. %package -n libreofficekit Summary: A library providing access to LibreOffice functionality -License: MPLv2.0 +License: MPL-2.0 %description -n libreofficekit LibreOfficeKit can be used to access LibreOffice functionality @@ -763,7 +761,7 @@ experimental tiled rendering API). %package -n libreofficekit-devel Summary: Development files for libreofficekit Requires: libreofficekit%{?_isa} = %{epoch}:%{version}-%{release} -License: MPLv2.0 +License: MPL-2.0 %description -n libreofficekit-devel The libreofficekit-devel package contains libraries and header files for @@ -1138,6 +1136,9 @@ sed -i -e /CppunitTest_sd_png_export_tests/d sd/Module_sd.mk #see rhbz#2072615 rm -f vcl/qa/cppunit/graphicfilter/data/tiff/fail/CVE-2017-9936-1.tiff +# Failing on multiple arches +sed -i -e /CppunitTest_svgio/d svgio/Module_svgio.mk + %build # path to external tarballs EXTSRCDIR=`dirname %{SOURCE0}` @@ -2350,6 +2351,15 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || : %changelog ## START: Generated by rpmautospec +* Thu May 02 2024 Gwyn Ciesla - 1:24.2.3.2-1 +- 24.2.3.2 + +* Mon Apr 29 2024 Gwyn Ciesla - 1:24.2.3.1-1 +- 24.2.3.1 + +* Sat Apr 13 2024 Miroslav Suchý - 1:24.2.2.1-3 +- convert MPLv2.0 license to SPDX + * Mon Mar 18 2024 Gwyn Ciesla - 1:24.2.2.1-2 - Patch for kf6 scaling From 837dd105fc5ae36de232243c7bb03eab0963b388 Mon Sep 17 00:00:00 2001 From: Sandino Araico Sanchez Date: Fri, 21 Jun 2024 02:25:11 -0600 Subject: [PATCH 03/19] Spec de Fedora 24.2.4.2 --- rpmbuild/SPECS/libreoffice.spec | 279 ++++++++++++++++++-------------- 1 file changed, 154 insertions(+), 125 deletions(-) diff --git a/rpmbuild/SPECS/libreoffice.spec b/rpmbuild/SPECS/libreoffice.spec index e390a51..b21e452 100644 --- a/rpmbuild/SPECS/libreoffice.spec +++ b/rpmbuild/SPECS/libreoffice.spec @@ -9,7 +9,7 @@ ## END: Set by rpmautospec # download path contains version without the last (fourth) digit -%global libo_version 24.2.3 +%global libo_version 24.2.4 # Should contain .alphaX / .betaX, if this is pre-release (actually # pre-RC) version. The pre-release string is part of tarball file names, # so we need a way to define it easily at one place. @@ -787,7 +787,7 @@ This package provides gdb pretty printers for package %{name}. %define _langpack_common(Eg:j:l:) \ %{!-E: \ -%{baseinstdir}/program/resource/%{-g:%{-g*}}%{!-g:%{-l*}}/LC_MESSAGES/*.mo \ +%{baseinstdir}/program/resource/%{-g:%{-g*}}%{!-g:%{-l*}} \ %{baseinstdir}/share/registry/res/registry_%{-l*}.xcd \ } \ %{baseinstdir}/share/template/%{-l*} \ @@ -963,8 +963,8 @@ Rules for auto-correcting common %{langname} typing errors. \ %langpack -l ml -n Malayalam -F -H -Y -X %langpack -l mr -n Marathi -F -H -Y -X %langpack -l nb -n Bokmal -F -H -Y -M -T -X -%langpack -l nl -n Dutch -F -H -Y -M -A -T -X -X -%langpack -l nn -n Nynorsk -F -H -Y -M -T +%langpack -l nl -n Dutch -F -H -Y -M -A -T -X +%langpack -l nn -n Nynorsk -F -H -Y -M -T -X %define langpack_lang Southern Ndebele %langpack -l nr -n %{langpack_lang} -F -H -X %define langpack_lang Northern Sotho @@ -1132,6 +1132,14 @@ sed -i -e /CppunitTest_vcl_png_test/d vcl/Module_vcl.mk # https://bugs.documentfoundation.org/show_bug.cgi?id=159211 sed -i -e /CppunitTest_sd_png_export_tests/d sd/Module_sd.mk %endif +%ifarch riscv64 +# Failed test on RV64 +# confimed on 2024-06-01, version 24.2.3.2 +sed -i -e s/CustomTarget_uno_test// testtools/Module_testtools.mk +sed -i -e s/CppunitTest_sw_macros_test// sw/Module_sw.mk +# https://bugs.documentfoundation.org/show_bug.cgi?id=152943 +sed -i -e s/CppunitTest_sc_ucalc_formula2// sc/Module_sc.mk +%endif #see rhbz#2072615 rm -f vcl/qa/cppunit/graphicfilter/data/tiff/fail/CVE-2017-9936-1.tiff @@ -1597,6 +1605,7 @@ make unitcheck slowcheck # we don't need this anymore rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar + %files %files filters @@ -1611,12 +1620,7 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar %{baseinstdir}/help/main_transform.xsl %{baseinstdir}/presets %dir %{baseinstdir}/program -%if 0%{?fedora} -%{baseinstdir}/program/core.abignore -%endif -%{baseinstdir}/program/libbasprovlo.so -%{baseinstdir}/program/libcairocanvaslo.so -%{baseinstdir}/program/libcanvasfactorylo.so +%{baseinstdir}/program/bootstraprc %ifarch %{java_arches} %dir %{baseinstdir}/program/classes %{baseinstdir}/program/classes/commonwizards.jar @@ -1630,26 +1634,32 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar %{baseinstdir}/program/classes/XMergeBridge.jar %{baseinstdir}/program/classes/xmerge.jar %endif -%{baseinstdir}/program/libcmdmaillo.so -%{baseinstdir}/program/libdeployment.so -%{baseinstdir}/program/libdeploymentgui.so -%{baseinstdir}/program/libdlgprovlo.so -%{baseinstdir}/program/libfps_officelo.so +%if 0%{?fedora} +%{baseinstdir}/program/core.abignore +%endif +%{baseinstdir}/program/fundamentalrc %{baseinstdir}/program/gdbtrace %{baseinstdir}/program/gengal %{baseinstdir}/program/gengal.bin -%{baseinstdir}/program/libi18nsearchlo.so -%{baseinstdir}/program/libldapbe2lo.so +%{baseinstdir}/program/intro.png +%{baseinstdir}/program/intro-highres.png %{baseinstdir}/program/libacclo.so %{baseinstdir}/program/libanimcorelo.so %{baseinstdir}/program/libavmedia*.so %{baseinstdir}/program/libbasctllo.so +%{baseinstdir}/program/libbasegfxlo.so +%{baseinstdir}/program/libbasprovlo.so %{baseinstdir}/program/libbiblo.so %{baseinstdir}/program/libcached1.so +%{baseinstdir}/program/libcairocanvaslo.so +%{baseinstdir}/program/libcanvasfactorylo.so %{baseinstdir}/program/libcanvastoolslo.so %{baseinstdir}/program/libchart*lo.so %{baseinstdir}/program/libclewlo.so +%{baseinstdir}/program/libcmdmaillo.so %{baseinstdir}/program/libcollator_data.so +%{baseinstdir}/program/libcomphelper.so +%{baseinstdir}/program/libconfigmgrlo.so %{baseinstdir}/program/libcppcanvaslo.so %{baseinstdir}/program/libctllo.so %{baseinstdir}/program/libcuilo.so @@ -1660,10 +1670,14 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar %{baseinstdir}/program/libdbpool2.so %{baseinstdir}/program/libdbtoolslo.so %{baseinstdir}/program/libdbulo.so +%{baseinstdir}/program/libdeployment.so +%{baseinstdir}/program/libdeploymentgui.so %{baseinstdir}/program/libdeploymentmisclo.so %{baseinstdir}/program/libdesktop_detectorlo.so +%{baseinstdir}/program/libdesktopbe1lo.so %{baseinstdir}/program/libdict_ja.so %{baseinstdir}/program/libdict_zh.so +%{baseinstdir}/program/libdlgprovlo.so %{baseinstdir}/program/libdocmodello.so %{baseinstdir}/program/libdrawinglayerlo.so %{baseinstdir}/program/libdrawinglayercorelo.so @@ -1673,39 +1687,56 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar %{baseinstdir}/program/libemfiolo.so %{baseinstdir}/program/libevoab*.so %{baseinstdir}/program/libevtattlo.so +%{baseinstdir}/program/libfps_officelo.so +%{baseinstdir}/program/libfwklo.so %{baseinstdir}/program/libicglo.so %{baseinstdir}/program/libindex_data.so %{baseinstdir}/program/libfilelo.so %{baseinstdir}/program/libfilterconfiglo.so %{baseinstdir}/program/libflatlo.so %{baseinstdir}/program/libfrmlo.so +%{baseinstdir}/program/libfsstoragelo.so %{baseinstdir}/program/libguesslanglo.so %{baseinstdir}/program/libhelplinkerlo.so %{baseinstdir}/program/libhyphenlo.so +%{baseinstdir}/program/libi18npoollo.so +%{baseinstdir}/program/libi18nsearchlo.so +%{baseinstdir}/program/libi18nutil.so +%{baseinstdir}/program/libldapbe2lo.so %ifarch %{java_arches} %{baseinstdir}/program/libjdbclo.so %endif %{baseinstdir}/program/libLanguageToollo.so %{baseinstdir}/program/liblnglo.so +%{baseinstdir}/program/liblnthlo.so %{baseinstdir}/program/libloglo.so +%{baseinstdir}/program/liblocalebe1lo.so %{baseinstdir}/program/liblocaledata_en.so %{baseinstdir}/program/liblocaledata_es.so %{baseinstdir}/program/liblocaledata_euro.so %{baseinstdir}/program/liblocaledata_others.so +%{baseinstdir}/program/liblosessioninstalllo.so +%{baseinstdir}/program/libmigrationoo2lo.so +%{baseinstdir}/program/libmigrationoo3lo.so %{baseinstdir}/program/libmozbootstraplo.so %{baseinstdir}/program/libmsfilterlo.so +%{baseinstdir}/program/libmsformslo.so %{baseinstdir}/program/libmtfrendererlo.so %{baseinstdir}/program/libmysql_jdbclo.so %{baseinstdir}/program/libmysqlclo.so %{baseinstdir}/program/libodbclo.so +%{baseinstdir}/program/libodfflatxmllo.so %{baseinstdir}/program/liboglcanvaslo.so %{baseinstdir}/program/liboffacclo.so %{baseinstdir}/program/libooxlo.so %{baseinstdir}/program/libopencllo.so +%{baseinstdir}/program/libpackage2.so +%{baseinstdir}/program/libpasswordcontainerlo.so %{baseinstdir}/program/libpcrlo.so %{baseinstdir}/program/libpdffilterlo.so %{baseinstdir}/program/libprotocolhandlerlo.so %{baseinstdir}/program/libsaxlo.so +%{baseinstdir}/program/libsblo.so %{baseinstdir}/program/libscnlo.so %{baseinstdir}/program/libscriptframe.so %{baseinstdir}/program/libsdlo.so @@ -1713,85 +1744,96 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar %{baseinstdir}/program/libsdbtlo.so %{baseinstdir}/program/libsddlo.so %{baseinstdir}/program/libsduilo.so +%{baseinstdir}/program/libsfxlo.so +%{baseinstdir}/program/libsimplecanvaslo.so +%{baseinstdir}/program/libslideshowlo.so +%{baseinstdir}/program/libsmlo.so +%{baseinstdir}/program/libsmdlo.so +%{baseinstdir}/program/libsofficeapp.so +%{baseinstdir}/program/libsotlo.so %{baseinstdir}/program/libspelllo.so +%{baseinstdir}/program/libspllo.so +%{baseinstdir}/program/libstringresourcelo.so %{baseinstdir}/program/libsrtrs1.so %{baseinstdir}/program/libstoragefdlo.so %{baseinstdir}/program/libsvgiolo.so +%{baseinstdir}/program/libsvllo.so +%{baseinstdir}/program/libsvtlo.so %{baseinstdir}/program/libsvxlo.so %{baseinstdir}/program/libsvxcorelo.so %{baseinstdir}/program/libswdlo.so %{baseinstdir}/program/libswlo.so +%{baseinstdir}/program/libsysshlo.so %{baseinstdir}/program/libtextconv_dict.so %{baseinstdir}/program/libtextconversiondlgslo.so %{baseinstdir}/program/libtextfdlo.so -%{baseinstdir}/program/libodfflatxmllo.so -# TODO: shouldn't it have lo suffix? +%{baseinstdir}/program/libtklo.so +%{baseinstdir}/program/libtllo.so +%{baseinstdir}/program/libucb1.so %{baseinstdir}/program/libucbhelper.so %{baseinstdir}/program/libucpchelp1.so +%{baseinstdir}/program/libucpcmis1lo.so %{baseinstdir}/program/libucpdav1.so +%{baseinstdir}/program/libucpexpand1lo.so +%{baseinstdir}/program/libucpextlo.so +%{baseinstdir}/program/libucpfile1.so +%{baseinstdir}/program/libucpgio1lo.so +%{baseinstdir}/program/libucpimagelo.so +%{baseinstdir}/program/libucptdoc1lo.so %{baseinstdir}/program/libucphier1.so %{baseinstdir}/program/libucppkg1.so %{baseinstdir}/program/libunordflo.so %{baseinstdir}/program/libunopkgapp.so %{baseinstdir}/program/libunoxmllo.so +%{baseinstdir}/program/libutllo.so +%{baseinstdir}/program/libupdatefeedlo.so %{baseinstdir}/program/libuuilo.so +%{baseinstdir}/program/libvbaeventslo.so %{baseinstdir}/program/libvbahelperlo.so +%{baseinstdir}/program/libvclcanvaslo.so +%{baseinstdir}/program/libvcllo.so +%{baseinstdir}/program/libwriterperfectlo.so %{baseinstdir}/program/libxmlfalo.so %{baseinstdir}/program/libxmlfdlo.so +%{baseinstdir}/program/libxmlscriptlo.so +%{baseinstdir}/program/libxmlsecurity.so %{baseinstdir}/program/libxoflo.so +%{baseinstdir}/program/libxolo.so %{baseinstdir}/program/libxsec_xmlsec.so %{baseinstdir}/program/libxsltdlglo.so %{baseinstdir}/program/libxsltfilterlo.so %{baseinstdir}/program/libxstor.so -# TODO how useful this is in Fedora? -%{baseinstdir}/program/liblosessioninstalllo.so -%{baseinstdir}/program/libmigrationoo2lo.so -%{baseinstdir}/program/libmigrationoo3lo.so -%{baseinstdir}/program/libmsformslo.so +%{baseinstdir}/program/lounorc +%{baseinstdir}/program/oosplash %{baseinstdir}/program/opencl +%{baseinstdir}/program/opencltest %dir %{baseinstdir}/program/opengl %{baseinstdir}/program/opengl/*.glsl -%{baseinstdir}/program/types/offapi.rdb -%{baseinstdir}/program/libpasswordcontainerlo.so %{baseinstdir}/program/pagein-common +%{baseinstdir}/program/redirectrc %dir %{baseinstdir}/program/resource %dir %{baseinstdir}/program/resource/common %dir %{baseinstdir}/program/resource/common/fonts %{baseinstdir}/program/senddoc %dir %{baseinstdir}/program/services %{baseinstdir}/program/services/services.rdb -%{baseinstdir}/program/libsimplecanvaslo.so -%{baseinstdir}/program/libslideshowlo.so -%{baseinstdir}/program/libsmlo.so -%{baseinstdir}/program/libsmdlo.so -%{baseinstdir}/program/libsofficeapp.so -%{baseinstdir}/program/libstringresourcelo.so -%{baseinstdir}/program/libsysshlo.so -%{baseinstdir}/program/libucpcmis1lo.so -%{baseinstdir}/program/libucpexpand1lo.so -%{baseinstdir}/program/libucpextlo.so -%{baseinstdir}/program/libucpimagelo.so -%{baseinstdir}/program/libucptdoc1lo.so -%{baseinstdir}/program/lounorc -%{baseinstdir}/program/libupdatefeedlo.so +%{baseinstdir}/program/setuprc +%{baseinstdir}/program/shell/ +%{baseinstdir}/program/soffice +%{baseinstdir}/program/soffice.bin +%{baseinstdir}/program/sofficerc +%{baseinstdir}/program/types +%{baseinstdir}/program/unoinfo +%{baseinstdir}/program/unopkg +%{baseinstdir}/program/unopkg.bin %{baseinstdir}/program/uri-encode -%{baseinstdir}/program/libvbaeventslo.so -%{baseinstdir}/program/libvclcanvaslo.so %{baseinstdir}/program/versionrc %dir %{baseinstdir}/share +%{baseinstdir}/share/autocorr +%dir %{baseinstdir}/share/autotext +%{baseinstdir}/share/basic %dir %{baseinstdir}/share/classification %{baseinstdir}/share/classification/example*.xml -%dir %{baseinstdir}/share/fonts -%dir %{baseinstdir}/share/fonts/truetype -%{baseinstdir}/share/fonts/truetype/fc_local.conf -%dir %{baseinstdir}/share/Scripts -%ifarch %{java_arches} -%{baseinstdir}/share/Scripts/java -%endif -%dir %{baseinstdir}/share/autotext -%dir %{_datadir}/autocorr -%{baseinstdir}/share/autocorr -%{baseinstdir}/share/basic %dir %{baseinstdir}/share/config %{baseinstdir}/share/config/images_breeze.zip %{baseinstdir}/share/config/images_breeze_svg.zip @@ -1814,23 +1856,47 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar %{baseinstdir}/share/config/images_sukapura_svg.zip %{baseinstdir}/share/config/images_sukapura_dark.zip %{baseinstdir}/share/config/images_sukapura_dark_svg.zip -%dir %{baseinstdir}/share/tipoftheday -%{baseinstdir}/share/tipoftheday/* -%dir %{baseinstdir}/share/toolbarmode -%{baseinstdir}/share/toolbarmode/* %dir %{baseinstdir}/share/config/soffice.cfg +%{baseinstdir}/share/config/soffice.cfg/cui +%{baseinstdir}/share/config/soffice.cfg/dbaccess +%{baseinstdir}/share/config/soffice.cfg/desktop +%{baseinstdir}/share/config/soffice.cfg/editeng +%{baseinstdir}/share/config/soffice.cfg/filter +%{baseinstdir}/share/config/soffice.cfg/formula +%{baseinstdir}/share/config/soffice.cfg/fps %{baseinstdir}/share/config/soffice.cfg/modules +%{baseinstdir}/share/config/soffice.cfg/sfx +%{baseinstdir}/share/config/soffice.cfg/svx +%{baseinstdir}/share/config/soffice.cfg/svt +%{baseinstdir}/share/config/soffice.cfg/uui +%{baseinstdir}/share/config/soffice.cfg/vcl +%{baseinstdir}/share/config/soffice.cfg/writerperfect +%{baseinstdir}/share/config/soffice.cfg/xmlsec %{baseinstdir}/share/config/soffice.cfg/*/ui -%{baseinstdir}/share/palette %{baseinstdir}/share/config/wizard %dir %{baseinstdir}/share/dtd %{baseinstdir}/share/dtd/officedocument +%dir %{baseinstdir}/share/extensions +%dir %{baseinstdir}/share/filter +%{baseinstdir}/share/filter/oox-drawingml-adj-names +%{baseinstdir}/share/filter/oox-drawingml-cs-presets +%{baseinstdir}/share/filter/signature-line.svg +%{baseinstdir}/share/filter/signature-line-draw.svg +%{baseinstdir}/share/filter/vml-shape-types +%dir %{baseinstdir}/share/fonts +%dir %{baseinstdir}/share/fonts/truetype +%{baseinstdir}/share/fonts/truetype/fc_local.conf %{baseinstdir}/share/gallery %dir %{baseinstdir}/share/labels %{baseinstdir}/share/labels/labels.xml +%{baseinstdir}/share/palette %dir %{baseinstdir}/share/psprint %config %{baseinstdir}/share/psprint/psprint.conf %{baseinstdir}/share/psprint/driver +%dir %{baseinstdir}/share/Scripts +%ifarch %{java_arches} +%{baseinstdir}/share/Scripts/java +%endif %dir %{baseinstdir}/share/registry %{baseinstdir}/share/registry/draw.xcd %{baseinstdir}/share/registry/gnome.xcd @@ -1852,96 +1918,47 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar %{baseinstdir}/share/template/common/wizard %{baseinstdir}/share/template/common/l10n/ %{baseinstdir}/share/template/wizard +%dir %{baseinstdir}/share/tipoftheday +%{baseinstdir}/share/tipoftheday/* +%dir %{baseinstdir}/share/toolbarmode +%{baseinstdir}/share/toolbarmode/* +%dir %{baseinstdir}/share/wizards %dir %{baseinstdir}/share/wordbook %{baseinstdir}/share/wordbook/en-GB.dic %{baseinstdir}/share/wordbook/en-US.dic %{baseinstdir}/share/wordbook/technical.dic -%{baseinstdir}/program/liblnthlo.so -%{_bindir}/unopkg -%{_mandir}/man1/unopkg.1* -%{baseinstdir}/program/libxmlsecurity.so -%{baseinstdir}/program/libconfigmgrlo.so -%{baseinstdir}/program/libdesktopbe1lo.so -%{baseinstdir}/program/libfsstoragelo.so -%{baseinstdir}/program/libi18npoollo.so -%{baseinstdir}/program/libbasegfxlo.so -# TODO: shouldn't it have lo suffix? -%{baseinstdir}/program/libcomphelper.so -%{baseinstdir}/program/libfwklo.so -# TODO: shouldn't it have lo suffix? -%{baseinstdir}/program/libi18nutil.so -%{baseinstdir}/program/libpackage2.so -%{baseinstdir}/program/libsblo.so -%{baseinstdir}/program/libsfxlo.so -%{baseinstdir}/program/libsotlo.so -%{baseinstdir}/program/libspllo.so -%{baseinstdir}/program/libsvllo.so -%{baseinstdir}/program/libsvtlo.so -%{baseinstdir}/program/libtklo.so -%{baseinstdir}/program/libtllo.so -%{baseinstdir}/program/libucb1.so -%{baseinstdir}/program/libucpfile1.so -%{baseinstdir}/program/libutllo.so -%{baseinstdir}/program/libvcllo.so -%{baseinstdir}/program/libwriterperfectlo.so -%{baseinstdir}/program/libxmlscriptlo.so -%{baseinstdir}/program/libxolo.so -%{baseinstdir}/program/liblocalebe1lo.so -%{baseinstdir}/program/libucpgio1lo.so -%{baseinstdir}/program/types/oovbaapi.rdb -#share unopkg -%dir %{baseinstdir}/share/extensions -%{baseinstdir}/program/unopkg -%{baseinstdir}/program/unopkg.bin -%{baseinstdir}/program/bootstraprc -%{baseinstdir}/program/fundamentalrc -%{baseinstdir}/program/setuprc -%{baseinstdir}/program/intro.png -%{baseinstdir}/program/intro-highres.png -%{baseinstdir}/program/opencltest -%{baseinstdir}/program/soffice -%{baseinstdir}/program/soffice.bin -%{baseinstdir}/program/sofficerc -%{baseinstdir}/program/unoinfo -%{baseinstdir}/program/oosplash -%{baseinstdir}/program/shell/ -%dir %{baseinstdir}/share/filter -%{baseinstdir}/share/filter/oox-drawingml-adj-names -%{baseinstdir}/share/filter/oox-drawingml-cs-presets -%{baseinstdir}/share/filter/signature-line.svg -%{baseinstdir}/share/filter/signature-line-draw.svg -%{baseinstdir}/share/filter/vml-shape-types %{baseinstdir}/share/xdg/ -%{baseinstdir}/program/redirectrc +%{_bindir}/libreoffice +%{_bindir}/openoffice.org +%{_bindir}/ooffice +%{_bindir}/ooviewdoc +%{_bindir}/soffice +%{_bindir}/unopkg +%dir %{_datadir}/autocorr %if 0%{?flatpak} %{_datadir}/metainfo/org.libreoffice.LibreOffice.appdata.xml %{_datadir}/applications/org.libreoffice.LibreOffice.desktop %else %{_datadir}/applications/libreoffice-startcenter.desktop %endif -#launchers -%{_bindir}/libreoffice -%{_bindir}/openoffice.org -%{_bindir}/soffice -%{_bindir}/ooffice -%{_bindir}/ooviewdoc %{_mandir}/man1/libreoffice.1* %{_mandir}/man1/openoffice.org.1* %{_mandir}/man1/soffice.1* %{_mandir}/man1/ooffice.1* %{_mandir}/man1/ooviewdoc.1* +%{_mandir}/man1/unopkg.1* %files base +%{baseinstdir}/program/access2base.py +%if 0%{?fedora} +%{baseinstdir}/program/base.abignore +%endif %ifarch %{java_arches} %{baseinstdir}/program/classes/hsqldb.jar %{baseinstdir}/program/classes/reportbuilder.jar %{baseinstdir}/program/classes/reportbuilderwizard.jar %{baseinstdir}/program/classes/sdbc_hsqldb.jar %endif -%{baseinstdir}/program/access2base.py -%if 0%{?fedora} -%{baseinstdir}/program/base.abignore -%endif %{baseinstdir}/program/libabplo.so %{baseinstdir}/program/libdbplo.so %if %{with firebird} @@ -2045,7 +2062,7 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar %{baseinstdir}/program/libsolverlo.so %{baseinstdir}/program/libwpftcalclo.so %{baseinstdir}/program/libvbaobjlo.so -%{baseinstdir}/share/calc/styles.xml +%{baseinstdir}/share/calc %{baseinstdir}/share/registry/calc.xcd %{baseinstdir}/program/pagein-calc %{baseinstdir}/program/scalc @@ -2351,6 +2368,18 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || : %changelog ## START: Generated by rpmautospec +* Sat Jun 08 2024 Gwyn Ciesla - 1:24.2.4.2-1 +- 24.2.4.2 + +* Fri Jun 07 2024 Nianqing Yao - 1:24.2.3.2-4 +- Fix build on rv64 + +* Mon Jun 03 2024 Mattia Verga - 1:24.2.3.2-3 +- Fix Nynorsk langpack filelist (fedora#2284264) + +* Mon May 27 2024 Mattia Verga - 1:24.2.3.2-2 +- Fix file and directories ownership + * Thu May 02 2024 Gwyn Ciesla - 1:24.2.3.2-1 - 24.2.3.2 From 427fba04177e9d81c5e05f3fa45a67045308a623 Mon Sep 17 00:00:00 2001 From: Sandino Araico Sanchez Date: Fri, 21 Jun 2024 10:40:31 -0600 Subject: [PATCH 04/19] Dependencia hacia kf6 deshabilitada en fedora < 40 --- CentOS-9 | 1 - Fedora-38 | 1 - rpmbuild/SPECS/libreoffice.spec | 15 +++++++-------- 3 files changed, 7 insertions(+), 10 deletions(-) delete mode 120000 CentOS-9 delete mode 120000 Fedora-38 diff --git a/CentOS-9 b/CentOS-9 deleted file mode 120000 index 8dcc934..0000000 --- a/CentOS-9 +++ /dev/null @@ -1 +0,0 @@ -rpmbuild \ No newline at end of file diff --git a/Fedora-38 b/Fedora-38 deleted file mode 120000 index 023c254..0000000 --- a/Fedora-38 +++ /dev/null @@ -1 +0,0 @@ -CentOS-9 \ No newline at end of file diff --git a/rpmbuild/SPECS/libreoffice.spec b/rpmbuild/SPECS/libreoffice.spec index e390a51..15a3464 100644 --- a/rpmbuild/SPECS/libreoffice.spec +++ b/rpmbuild/SPECS/libreoffice.spec @@ -17,12 +17,7 @@ # Should contain any suffix of release tarball name, e.g., -buildfix1. %global libo_buildfix %{nil} # rhbz#715152 state vendor -%if 0%{?rhel} -%global vendoroption --with-vendor="Red Hat, Inc." -%endif -%if 0%{?fedora} -%global vendoroption --with-vendor="The Fedora Project" -%endif +%global vendoroption --with-vendor="INFOTEC" %global libo_python python3 %global libo_python_executable %{__python3} %global libo_python_sitearch %{python3_sitearch} @@ -75,7 +70,7 @@ %endif # KDE Plasma 6 integration for Fedora and RHEL/EPEL 10+ -%if 0%{?fedora} || 0%{?rhel} >= 10 +%if 0%{?fedora} >= 40 || 0%{?rhel} >= 10 %bcond_without kf6 %endif @@ -95,7 +90,7 @@ Version: %{libo_version}.2 %if 0%{?libo_prerelease} Release: %autorelease -e %{?libo_prerelease} %else -Release: %autorelease +Release: 2 %endif # default new files are: MPLv2 # older files are typically: MPLv2 incorporating work under ASLv2 @@ -2351,6 +2346,10 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || : %changelog ## START: Generated by rpmautospec +* Fri Jun 21 2024 Sandino Araico Sánchez - 1:24.2.3.2-2 +- Backport to Fedora 39 +- Disabled kf6 dependency on fedora < 40 + * Thu May 02 2024 Gwyn Ciesla - 1:24.2.3.2-1 - 24.2.3.2 From e609af8ed13457333404b6993b799dd152c3199f Mon Sep 17 00:00:00 2001 From: Sandino Araico Sanchez Date: Fri, 21 Jun 2024 13:02:34 -0600 Subject: [PATCH 05/19] Rollback: autorelease --- rpmbuild/SPECS/libreoffice.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rpmbuild/SPECS/libreoffice.spec b/rpmbuild/SPECS/libreoffice.spec index 15a3464..b332e4c 100644 --- a/rpmbuild/SPECS/libreoffice.spec +++ b/rpmbuild/SPECS/libreoffice.spec @@ -2,7 +2,7 @@ ## (rpmautospec version 0.6.3) ## RPMAUTOSPEC: autorelease, autochangelog %define autorelease(e:s:pb:n) %{?-p:0.}%{lua: - release_number = 2; + release_number = 3; base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); print(release_number + base_release_number - 1); }%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} @@ -90,7 +90,7 @@ Version: %{libo_version}.2 %if 0%{?libo_prerelease} Release: %autorelease -e %{?libo_prerelease} %else -Release: 2 +Release: %autorelease %endif # default new files are: MPLv2 # older files are typically: MPLv2 incorporating work under ASLv2 From ea2fe5f35a17fb4f692fc80796ac4eaa107503f0 Mon Sep 17 00:00:00 2001 From: Sandino Araico Sanchez Date: Fri, 21 Jun 2024 18:34:05 -0600 Subject: [PATCH 06/19] Removed old CentOS 8 backports --- CentOS-8/SOURCES/0001-gpgme.patch | 25 - CentOS-8/SOURCES/0001-unistr.patch | 22 - .../0003-disable-libe-book-support.patch | 145 -- CentOS-8/SPECS/Box2D.spec | 142 -- CentOS-8/SPECS/coolwsd.spec | 248 --- CentOS-8/SPECS/curl.spec | 1938 ----------------- CentOS-8/SPECS/libabw.spec | 176 -- CentOS-8/SPECS/libcdr.spec | 268 --- CentOS-8/SPECS/libcmis.spec | 250 --- CentOS-8/SPECS/libe-book.spec | 266 --- CentOS-8/SPECS/libeot.spec | 90 - CentOS-8/SPECS/libexttextcat.spec | 134 -- CentOS-8/SPECS/libfreehand.spec | 157 -- CentOS-8/SPECS/libixion.spec | 278 --- CentOS-8/SPECS/libmspub.spec | 227 -- CentOS-8/SPECS/libmwaw.spec | 242 -- CentOS-8/SPECS/libnumbertext.spec | 97 - CentOS-8/SPECS/liborcus.spec | 441 ---- CentOS-8/SPECS/libpagemaker.spec | 162 -- CentOS-8/SPECS/libqxp.spec | 116 - CentOS-8/SPECS/libstaroffice.spec | 138 -- CentOS-8/SPECS/libzmf.spec | 127 -- CentOS-8/SPECS/mdds.spec | 294 --- CentOS-8/SPECS/neon.spec | 444 ---- CentOS-8/SPECS/pakchois.spec | 123 -- CentOS-8/SPECS/poco.spec | 726 ------ CentOS-8/SPECS/ucpp.spec | 117 - CentOS-8/SPECS/xmlsec1.spec | 369 ---- CentOS-8/SPECS/zxing-cpp.spec | 94 - Fedora-38 | 1 - 30 files changed, 7857 deletions(-) delete mode 100644 CentOS-8/SOURCES/0001-gpgme.patch delete mode 100644 CentOS-8/SOURCES/0001-unistr.patch delete mode 100644 CentOS-8/SOURCES/0003-disable-libe-book-support.patch delete mode 100644 CentOS-8/SPECS/Box2D.spec delete mode 100644 CentOS-8/SPECS/coolwsd.spec delete mode 100644 CentOS-8/SPECS/curl.spec delete mode 100644 CentOS-8/SPECS/libabw.spec delete mode 100644 CentOS-8/SPECS/libcdr.spec delete mode 100644 CentOS-8/SPECS/libcmis.spec delete mode 100644 CentOS-8/SPECS/libe-book.spec delete mode 100644 CentOS-8/SPECS/libeot.spec delete mode 100644 CentOS-8/SPECS/libexttextcat.spec delete mode 100644 CentOS-8/SPECS/libfreehand.spec delete mode 100644 CentOS-8/SPECS/libixion.spec delete mode 100644 CentOS-8/SPECS/libmspub.spec delete mode 100644 CentOS-8/SPECS/libmwaw.spec delete mode 100644 CentOS-8/SPECS/libnumbertext.spec delete mode 100644 CentOS-8/SPECS/liborcus.spec delete mode 100644 CentOS-8/SPECS/libpagemaker.spec delete mode 100644 CentOS-8/SPECS/libqxp.spec delete mode 100644 CentOS-8/SPECS/libstaroffice.spec delete mode 100644 CentOS-8/SPECS/libzmf.spec delete mode 100644 CentOS-8/SPECS/mdds.spec delete mode 100644 CentOS-8/SPECS/neon.spec delete mode 100644 CentOS-8/SPECS/pakchois.spec delete mode 100644 CentOS-8/SPECS/poco.spec delete mode 100644 CentOS-8/SPECS/ucpp.spec delete mode 100644 CentOS-8/SPECS/xmlsec1.spec delete mode 100644 CentOS-8/SPECS/zxing-cpp.spec delete mode 120000 Fedora-38 diff --git a/CentOS-8/SOURCES/0001-gpgme.patch b/CentOS-8/SOURCES/0001-gpgme.patch deleted file mode 100644 index 9ab589b..0000000 --- a/CentOS-8/SOURCES/0001-gpgme.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 1e4bed0bedcb90425ca1cb6be74153c68c1b40bc Tue Mar 29 00:00:00 2022 -From: -Date: Tue Mar 29 00:00:00 2022 -Subject: [PATCH] compatibility with gpgme-1.13.1 - -Change-Id: 1e4bed0bedcb90425ca1cb6be74153c68c1b40bc ---- - xmlsecurity/source/gpg/CertificateImpl.cxx | 5 +---- - 1 file changed, 1 additions(+), 4 deletions(-) - -diff -uri a/xmlsecurity/source/gpg/CertificateImpl.cxx b/xmlsecurity/source/gpg/CertificateImpl.cxx -index 0000000..e28482c 100644 ---- a/xmlsecurity/source/gpg/CertificateImpl.cxx 2022-02-28 12:19:33.000000000 -0600 -+++ b/xmlsecurity/source/gpg/CertificateImpl.cxx 2022-03-29 15:07:40.000000000 -0600 -@@ -215,9 +215,7 @@ - ctx->setArmor(false); // caller will base64-encode anyway - GpgME::Error err = ctx->exportPublicKeys( - key.primaryFingerprint(), -- data_out, -- officecfg::Office::Common::Security::OpenPGP::MinimalKeyExport::get() -- ? GpgME::Context::ExportMinimal : 0 -+ data_out - ); - - if (err) diff --git a/CentOS-8/SOURCES/0001-unistr.patch b/CentOS-8/SOURCES/0001-unistr.patch deleted file mode 100644 index 2afb46b..0000000 --- a/CentOS-8/SOURCES/0001-unistr.patch +++ /dev/null @@ -1,22 +0,0 @@ -From b4b20ade990d7cf75c4dc742af9770f0068f7948 Tue Mar 29 00:00:00 2022 -From: -Date: Tue Mar 29 00:00:00 2022 -Subject: [PATCH] aggregate 'icu_60::UnicodeString aResult' - -Change-Id: b4b20ade990d7cf75c4dc742af9770f0068f7948 ---- - i18nlangtag/source/languagetag/languagetagicu.cxx | 1 + - 1 file changed, 1 additions(+) - -diff --git a/i18nlangtag/source/languagetag/languagetagicu.cxx b/i18nlangtag/source/languagetag/languagetagicu.cxx -index 0000000..5e64791 100644 ---- a/i18nlangtag/source/languagetag/languagetagicu.cxx 2022-02-28 12:19:33.000000000 -0600 -+++ b/i18nlangtag/source/languagetag/languagetagicu.cxx 2022-03-29 04:34:25.000000000 -0600 -@@ -9,6 +9,7 @@ - - #include - #include -+#include - - - // static diff --git a/CentOS-8/SOURCES/0003-disable-libe-book-support.patch b/CentOS-8/SOURCES/0003-disable-libe-book-support.patch deleted file mode 100644 index 74a930a..0000000 --- a/CentOS-8/SOURCES/0003-disable-libe-book-support.patch +++ /dev/null @@ -1,145 +0,0 @@ -From 4cac125f90e0a3d6828d879cb06f3a4bac14321b Mon Sep 17 00:00:00 2001 -From: David Tardon -Date: Thu, 21 Aug 2014 16:10:51 +0200 -Subject: [PATCH] disable libe-book support - -Change-Id: Ie915a9bd2acf7f3aeb8b0933252da33c17043bc4 ---- - configure.ac | 3 --- - external/Module_external.mk | 1 - - filter/Configuration_filter.mk | 8 -------- - writerperfect/Library_wpftwriter.mk | 2 -- - writerperfect/qa/unit/WpftFilterFixture.hxx | 4 ---- - writerperfect/qa/unit/WpftWriterFilterTest.cxx | 5 ----- - writerperfect/source/writer/wpftwriter.component | 5 ----- - 7 files changed, 28 deletions(-) - -diff --git a/configure.ac b/configure.ac -index fe425319b8f8..4b8f6a95472c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -8566,9 +8566,6 @@ libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.8]) - - libo_CHECK_SYSTEM_MODULE([libfreehand],[FREEHAND],[libfreehand-0.1]) - --libo_CHECK_SYSTEM_MODULE([libebook],[EBOOK],[libe-book-0.1]) --libo_PKG_VERSION([EBOOK], [libe-book-0.1], [0.1.2]) -- - libo_CHECK_SYSTEM_MODULE([libabw],[ABW],[libabw-0.1]) - - libo_CHECK_SYSTEM_MODULE([libpagemaker],[PAGEMAKER],[libpagemaker-0.0]) -diff --git a/external/Module_external.mk b/external/Module_external.mk -index 41e018d2ef3f..1b7627a1b3e2 100644 ---- a/external/Module_external.mk -+++ b/external/Module_external.mk -@@ -33,7 +33,6 @@ $(eval $(call gb_Module_add_moduledirs,external,\ - $(call gb_Helper_optional,CT2N,ct2n) \ - $(call gb_Helper_optional,CURL,curl) \ - dtoa \ -- $(call gb_Helper_optional,EBOOK,libebook) \ - $(call gb_Helper_optional,EPM,epm) \ - $(call gb_Helper_optional,EPOXY,epoxy) \ - $(call gb_Helper_optional,EPUBGEN,libepubgen) \ -diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk -index e71ffacf8f25..74d2ef05c4aa 100644 ---- a/filter/Configuration_filter.mk -+++ b/filter/Configuration_filter.mk -@@ -359,10 +359,6 @@ - writer_OOXML_Template \ - writer_layout_dump_xml \ - writer_indexing_export_xml \ -- writer_BroadBand_eBook \ -- writer_FictionBook_2 \ -- writer_PalmDoc \ -- writer_Plucker_eBook \ - writer_ApplePages \ - MWAW_Text_Document \ - Palm_Text_Document \ -@@ -409,10 +405,6 @@ - OOXML_Text_Template \ - writer_layout_dump \ - writer_indexing_export \ -- BroadBand_eBook \ -- FictionBook_2 \ -- PalmDoc \ -- Plucker_eBook \ - ApplePages \ - MWAW_Text_Document \ - Palm_Text_Document \ -diff --git a/writerperfect/Library_wpftwriter.mk b/writerperfect/Library_wpftwriter.mk -index 8993cca31490..b6e11f356d97 100644 ---- a/writerperfect/Library_wpftwriter.mk -+++ b/writerperfect/Library_wpftwriter.mk -@@ -53,7 +53,6 @@ $(eval $(call gb_Library_use_libraries,wpftwriter,\ - $(eval $(call gb_Library_use_externals,wpftwriter,\ - abw \ - boost_headers \ -- ebook \ - epubgen \ - etonyek \ - icu_headers \ -@@ -73,7 +72,6 @@ $(eval $(call gb_Library_use_externals,wpftwriter,\ - - $(eval $(call gb_Library_add_exception_objects,wpftwriter,\ - writerperfect/source/writer/AbiWordImportFilter \ -- writerperfect/source/writer/EBookImportFilter \ - writerperfect/source/writer/EPUBExportDialog \ - writerperfect/source/writer/EPUBExportFilter \ - writerperfect/source/writer/EPUBExportUIComponent \ -diff --git a/writerperfect/qa/unit/WpftFilterFixture.hxx b/writerperfect/qa/unit/WpftFilterFixture.hxx -index f32478165617..f42edb0d7f55 100644 ---- a/writerperfect/qa/unit/WpftFilterFixture.hxx -+++ b/writerperfect/qa/unit/WpftFilterFixture.hxx -@@ -26,10 +26,6 @@ - || ((major) == (req_major) \ - && ((minor) > (req_minor) || ((minor) == (req_minor) && ((micro) >= (req_micro))))) - --#define REQUIRE_EBOOK_VERSION(major, minor, micro) \ -- REQUIRE_VERSION(EBOOK_VERSION_MAJOR, EBOOK_VERSION_MINOR, EBOOK_VERSION_MICRO, major, minor, \ -- micro) -- - #define REQUIRE_ETONYEK_VERSION(major, minor, micro) \ - REQUIRE_VERSION(ETONYEK_VERSION_MAJOR, ETONYEK_VERSION_MINOR, ETONYEK_VERSION_MICRO, major, \ - minor, micro) -diff --git a/writerperfect/qa/unit/WpftWriterFilterTest.cxx b/writerperfect/qa/unit/WpftWriterFilterTest.cxx -index 8bc4c7cadbb3..eca43caf8d8c 100644 ---- a/writerperfect/qa/unit/WpftWriterFilterTest.cxx -+++ b/writerperfect/qa/unit/WpftWriterFilterTest.cxx -@@ -30,9 +30,6 @@ - - void WpftWriterFilterTest::test() - { -- const writerperfect::test::WpftOptionalMap_t aEBookOptional{ -- { "FictionBook2.fb2.zip", REQUIRE_EBOOK_VERSION(0, 1, 1) }, -- }; - const writerperfect::test::WpftOptionalMap_t aEtonyekOptional{ - { "Pages_4.pages", REQUIRE_ETONYEK_VERSION(0, 1, 2) }, - { "Pages_5.pages", REQUIRE_ETONYEK_VERSION(0, 1, 8) }, -@@ -59,8 +56,6 @@ - - doTest("com.sun.star.comp.Writer.AbiWordImportFilter", - u"/writerperfect/qa/unit/data/writer/libabw/"); -- doTest("org.libreoffice.comp.Writer.EBookImportFilter", -- u"/writerperfect/qa/unit/data/writer/libe-book/", aEBookOptional); - doTest("com.sun.star.comp.Writer.MSWorksImportFilter", - u"/writerperfect/qa/unit/data/writer/libwps/", aWpsOptional); - doTest("com.sun.star.comp.Writer.MWAWImportFilter", -diff --git a/writerperfect/source/writer/wpftwriter.component b/writerperfect/source/writer/wpftwriter.component -index 8ab436634052..2720023baedf 100644 ---- a/writerperfect/source/writer/wpftwriter.component -+++ b/writerperfect/source/writer/wpftwriter.component -@@ -38,11 +38,6 @@ - - - -- -- -- -- - - --- -2.25.1 - diff --git a/CentOS-8/SPECS/Box2D.spec b/CentOS-8/SPECS/Box2D.spec deleted file mode 100644 index 3cfb3e6..0000000 --- a/CentOS-8/SPECS/Box2D.spec +++ /dev/null @@ -1,142 +0,0 @@ -%global __cmake_in_source_build 1 -Name: Box2D -Version: 2.4.1 -Release: 5%{?dist} -Summary: A 2D Physics Engine for Games - -License: zlib -URL: http://box2d.org/ -Source0: https://github.com/erincatto/box2d/archive/v%{version}/%{name}-%{version}.tar.gz -BuildRequires: gcc -BuildRequires: gcc-c++ -BuildRequires: cmake -BuildRequires: make - -%package devel -Summary: Development files for %{name} -Requires: %{name} = %{version}-%{release} - -%description -Box2D is an open source C++ engine for simulating rigid bodies in 2D. -Box2D is developed by Erin Catto and has the zlib license. -While the zlib license does not require acknowledgement, -we encourage you to give credit to Box2D in your product. - -%description devel -Box2D is an open source C++ engine for simulating rigid bodies in 2D. -Box2D is developed by Erin Catto and has the zlib license. -While the zlib license does not require acknowledgement, -we encourage you to give credit to Box2D in your product. - -These are the development files. - -%prep -%setup -qn box2d-%{version} -rm -r extern - -%build -%cmake -DBOX2D_INSTALL=ON -DBOX2D_BUILD_SHARED=ON -DBOX2D_BUILD_TESTBED=OFF -DBOX2D_BUILD_UNIT_TESTS=OFF . -%cmake_build - -%install -%make_install - -%ldconfig_scriptlets - -%files -%license LICENSE -%{_libdir}/*.so.2* - -%files devel -%doc README.md docs/ -%{_libdir}/*.so -%{_includedir}/box2d -%{_libdir}/cmake/box2d/*.cmake - -%changelog -* Wed Feb 17 2021 Caolán McNamara - 2.4.1-5 -- disable building BOX2D_BUILD_UNIT_TESTS due to "SIGSTKSZ ... no - longer constant on Linux ... redefined to sysconf(_SC_SIGSTKSZ)" - https://github.com/bminor/glibc/blob/master/NEWS causing build failure - -* Wed Feb 17 2021 Caolán McNamara - 2.4.1-4 -- reduce unnecessary dependencies - -* Wed Feb 10 2021 Timm Bäder - 2.4.1-3 -- Use make macros - -* Mon Jan 25 2021 Fedora Release Engineering - 2.4.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Oct 19 2020 Gwyn Ciesla - 2.4.1-1 -- 2.4.1 - -* Mon Aug 10 2020 Gwyn Ciesla - 2.4.0-1 -- 2.4.0 with patch for cmake shared libs. - -* Tue Aug 04 2020 Gwyn Ciesla - 2.3.1-15 -- Fix FTBFS. - -* Sat Aug 01 2020 Fedora Release Engineering - 2.3.1-14 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 2.3.1-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jan 28 2020 Fedora Release Engineering - 2.3.1-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Wed Jul 24 2019 Fedora Release Engineering - 2.3.1-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Jan 31 2019 Fedora Release Engineering - 2.3.1-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Jul 12 2018 Fedora Release Engineering - 2.3.1-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 07 2018 Fedora Release Engineering - 2.3.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Aug 02 2017 Fedora Release Engineering - 2.3.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 2.3.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 2.3.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Feb 03 2016 Fedora Release Engineering - 2.3.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Jun 16 2015 Fedora Release Engineering - 2.3.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat May 02 2015 Kalev Lember - 2.3.1-2 -- Rebuilt for GCC 5 C++11 ABI change - -* Fri Feb 20 2015 Lubomir Rintel - 2.3.1-1 -- Update - -* Fri Aug 15 2014 Fedora Release Engineering - 2.2.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Fri Jun 06 2014 Fedora Release Engineering - 2.2.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri Aug 02 2013 Fedora Release Engineering - 2.2.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Feb 13 2013 Fedora Release Engineering - 2.2.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Mon Aug 06 2012 Jon Ciesla - 2.2.1-3 -- Review fixes from BZ 844090 comment 6. - -* Thu Aug 02 2012 Jon Ciesla - 2.2.1-2 -- Unbundle freeglut and glui. - -* Sat Jul 28 2012 Jon Ciesla - 2.2.1-1 -- create. diff --git a/CentOS-8/SPECS/coolwsd.spec b/CentOS-8/SPECS/coolwsd.spec deleted file mode 100644 index e47fe84..0000000 --- a/CentOS-8/SPECS/coolwsd.spec +++ /dev/null @@ -1,248 +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/. - -%if 0%{?name_suffix:1} -Name: coolwsd%{name_suffix} -%else -Name: coolwsd -%endif -Version: 22.05.5.4 -Release: 1%{?dist} -Vendor: %{vendor} -Summary: Collabora Online WebSocket Daemon -License: EULA -Source0: coolwsd-22.05.5.4.tar.gz - -BuildRequires: cppunit-devel -BuildRequires: fontconfig -BuildRequires: gcc-c++ -BuildRequires: libcap-devel -BuildRequires: libpng-devel -BuildRequires: m4 -BuildRequires: make -BuildRequires: nodejs -BuildRequires: npm -BuildRequires: pam-devel -BuildRequires: poco-devel -BuildRequires: python3 -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 - -# openSUSE Leap 15.x, SLES12, SLES15 -%if 0%{?suse_version} -BuildRequires: libcap-progs linux-glibc-devel systemd-rpm-macros python3-polib python3-lxml -%endif - -Requires: libreoffice -Requires: libreoffice-calc -Requires: libreoffice-core -Requires: libreoffice-draw -Requires: libreoffice-graphicfilter -Requires: libreoffice-impress -Requires: libreoffice-langpack-en -Requires: libreoffice-math -Requires: libreoffice-pdfimport -Requires: libreoffice-ure -Requires: libreoffice-writer - -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 -%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 -n coolwsd-22.05.5.4 - -%build -# usando versión marrana (incluyendo una librería embebida) -%configure \ - --enable-silent-rules \ - --with-lokit-path=bundled/include \ - --with-lo-path=/usr/lib64/libreoffice \ - --disable-setcap \ -%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 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 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/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 -%{_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 -* Mon Aug 03 2015 Mihai Varga -- added the cronjob -* Tue May 19 2015 Tor Lillqvist -- Initial RPM release diff --git a/CentOS-8/SPECS/curl.spec b/CentOS-8/SPECS/curl.spec deleted file mode 100644 index 64734ca..0000000 --- a/CentOS-8/SPECS/curl.spec +++ /dev/null @@ -1,1938 +0,0 @@ -Summary: A utility for getting files from remote servers (FTP, HTTP, and others) -Name: curl -Version: 7.76.1 -Release: 13%{?dist} -License: MIT -Source: https://curl.se/download/%{name}-%{version}.tar.xz - -# http2: fix resource leaks detected by Coverity -Patch1: 0001-curl-7.76.1-resource-leaks.patch - -# fix TELNET stack contents disclosure (CVE-2021-22898) -Patch2: 0002-curl-7.76.1-CVE-2021-22898.patch - -# fix TLS session caching disaster (CVE-2021-22901) -Patch3: 0003-curl-7.76.1-CVE-2021-22901.patch - -# fix SIGSEGV upon disconnect of a ldaps:// transfer (#1941925) -Patch4: 0004-curl-7.76.1-ldaps-segv.patch - -# fix bad connection reuse due to flawed path name checks (CVE-2021-22924) -Patch5: 0005-curl-7.76.1-CVE-2021-22924.patch - -# fix TELNET stack contents disclosure again (CVE-2021-22925) -Patch6: 0006-curl-7.76.1-CVE-2021-22925.patch - -# fix use-after-free and double-free in MQTT sending (CVE-2021-22945) -Patch7: 0007-curl-7.76.1-CVE-2021-22945.patch - -# fix protocol downgrade required TLS bypass (CVE-2021-22946) -Patch8: 0008-curl-7.76.1-CVE-2021-22946.patch - -# fix STARTTLS protocol injection via MITM (CVE-2021-22947) -Patch9: 0009-curl-7.76.1-CVE-2021-22947.patch - -# patch making libcurl multilib ready -Patch101: 0101-curl-7.32.0-multilib.patch - -# prevent configure script from discarding -g in CFLAGS (#496778) -Patch102: 0102-curl-7.36.0-debug.patch - -# prevent valgrind from reporting false positives on x86_64 -Patch105: 0105-curl-7.63.0-lib1560-valgrind.patch - -Provides: curl-full = %{version}-%{release} -Provides: webclient -URL: https://curl.se/ -BuildRequires: automake -BuildRequires: brotli-devel -BuildRequires: coreutils -BuildRequires: gcc -BuildRequires: groff -BuildRequires: krb5-devel -BuildRequires: libidn2-devel -BuildRequires: libnghttp2-devel -BuildRequires: libpsl-devel -BuildRequires: libssh-devel -BuildRequires: libtool -BuildRequires: make -BuildRequires: openldap-devel -BuildRequires: openssh-clients -BuildRequires: openssh-server -BuildRequires: openssl-devel -BuildRequires: perl-interpreter -BuildRequires: pkgconfig -BuildRequires: python3-devel -BuildRequires: sed -BuildRequires: zlib-devel - -# needed to compress content of tool_hugehelp.c after changing curl.1 man page -BuildRequires: perl(IO::Compress::Gzip) - -# needed for generation of shell completions -BuildRequires: perl(Getopt::Long) -BuildRequires: perl(Pod::Usage) -BuildRequires: perl(strict) -BuildRequires: perl(warnings) - -# gnutls-serv is used by the upstream test-suite -BuildRequires: gnutls-utils - -# hostname(1) is used by the test-suite but it is missing in armv7hl buildroot -BuildRequires: hostname - -# nghttpx (an HTTP/2 proxy) is used by the upstream test-suite -BuildRequires: nghttp2 - -# perl modules used in the test suite -BuildRequires: perl(Cwd) -BuildRequires: perl(Digest::MD5) -BuildRequires: perl(Exporter) -BuildRequires: perl(File::Basename) -BuildRequires: perl(File::Copy) -BuildRequires: perl(File::Spec) -BuildRequires: perl(IPC::Open2) -BuildRequires: perl(MIME::Base64) -BuildRequires: perl(Time::Local) -BuildRequires: perl(Time::HiRes) -BuildRequires: perl(vars) - -%if 0%{?fedora} -# needed for upstream test 1451 -BuildRequires: python3-impacket -%endif - -# The test-suite runs automatically through valgrind if valgrind is available -# on the system. By not installing valgrind into mock's chroot, we disable -# this feature for production builds on architectures where valgrind is known -# to be less reliable, in order to avoid unnecessary build failures (see RHBZ -# #810992, #816175, and #886891). Nevertheless developers are free to install -# valgrind manually to improve test coverage on any architecture. -%ifarch x86_64 -BuildRequires: valgrind -%endif - -# stunnel is used by upstream tests but it does not seem to work reliably -# on s390x and occasionally breaks some tests (mainly 1561 and 1562) -%ifnarch s390x -BuildRequires: stunnel -%endif - -# using an older version of libcurl could result in CURLE_UNKNOWN_OPTION -Requires: libcurl%{?_isa} >= %{version}-%{release} - -# require at least the version of libpsl that we were built against, -# to ensure that we have the necessary symbols available (#1631804) -%global libpsl_version %(pkg-config --modversion libpsl 2>/dev/null || echo 0) - -# require at least the version of libssh that we were built against, -# to ensure that we have the necessary symbols available (#525002, #642796) -%global libssh_version %(pkg-config --modversion libssh 2>/dev/null || echo 0) - -# require at least the version of openssl-libs that we were built against, -# to ensure that we have the necessary symbols available (#1462184, #1462211) -%global openssl_version %(pkg-config --modversion openssl 2>/dev/null || echo 0) - -%description -curl is a command line tool for transferring data with URL syntax, supporting -FTP, FTPS, HTTP, HTTPS, SCP, SFTP, TFTP, TELNET, DICT, LDAP, LDAPS, FILE, IMAP, -SMTP, POP3 and RTSP. curl supports SSL certificates, HTTP POST, HTTP PUT, FTP -uploading, HTTP form based upload, proxies, cookies, user+password -authentication (Basic, Digest, NTLM, Negotiate, kerberos...), file transfer -resume, proxy tunneling and a busload of other useful tricks. - -%package -n libcurl -Summary: A library for getting files from web servers -Requires: libpsl%{?_isa} >= %{libpsl_version} -Requires: libssh%{?_isa} >= %{libssh_version} -Requires: openssl-libs%{?_isa} >= 1:%{openssl_version} -Provides: libcurl-full = %{version}-%{release} -Provides: libcurl-full%{?_isa} = %{version}-%{release} - -%description -n libcurl -libcurl is a free and easy-to-use client-side URL transfer library, supporting -FTP, FTPS, HTTP, HTTPS, SCP, SFTP, TFTP, TELNET, DICT, LDAP, LDAPS, FILE, IMAP, -SMTP, POP3 and RTSP. libcurl supports SSL certificates, HTTP POST, HTTP PUT, -FTP uploading, HTTP form based upload, proxies, cookies, user+password -authentication (Basic, Digest, NTLM, Negotiate, Kerberos4), file transfer -resume, http proxy tunneling and more. - -%package -n libcurl-devel -Summary: Files needed for building applications with libcurl -Requires: libcurl%{?_isa} = %{version}-%{release} - -Provides: curl-devel = %{version}-%{release} -Provides: curl-devel%{?_isa} = %{version}-%{release} -Obsoletes: curl-devel < %{version}-%{release} - -%description -n libcurl-devel -The libcurl-devel package includes header files and libraries necessary for -developing programs which use the libcurl library. It contains the API -documentation of the library, too. - -%package -n curl-minimal -Summary: Conservatively configured build of curl for minimal installations -Provides: curl = %{version}-%{release} -Conflicts: curl -RemovePathPostfixes: .minimal - -# using an older version of libcurl could result in CURLE_UNKNOWN_OPTION -Requires: libcurl%{?_isa} >= %{version}-%{release} - -%description -n curl-minimal -This is a replacement of the 'curl' package for minimal installations. It -comes with a limited set of features compared to the 'curl' package. On the -other hand, the package is smaller and requires fewer run-time dependencies to -be installed. - -%package -n libcurl-minimal -Summary: Conservatively configured build of libcurl for minimal installations -Requires: openssl-libs%{?_isa} >= 1:%{openssl_version} -Provides: libcurl = %{version}-%{release} -Provides: libcurl%{?_isa} = %{version}-%{release} -Conflicts: libcurl%{?_isa} -RemovePathPostfixes: .minimal -# needed for RemovePathPostfixes to work with shared libraries -%undefine __brp_ldconfig - -%description -n libcurl-minimal -This is a replacement of the 'libcurl' package for minimal installations. It -comes with a limited set of features compared to the 'libcurl' package. On the -other hand, the package is smaller and requires fewer run-time dependencies to -be installed. - -%prep -%setup -q - -# upstream patches -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 - -# Fedora patches -%patch101 -p1 -%patch102 -p1 -%patch105 -p1 - -# disable test 1112 (#565305), test 1455 (occasionally fails with 'bind failed -# with errno 98: Address already in use' in Koji environment), and test 1801 -# -printf "1112\n1455\n1801\n" >> tests/data/DISABLED - -# disable test 1319 on ppc64 (server times out) -%ifarch ppc64 -echo "1319" >> tests/data/DISABLED -%endif - -# temporarily disable test 582 on s390x (client times out) -%ifarch s390x -echo "582" >> tests/data/DISABLED -%endif - -# temporarily disable tests 702 703 716 on armv7hl (#1829180) -%ifarch armv7hl -printf "702\n703\n716\n" >> tests/data/DISABLED -%endif - -# adapt test 323 for updated OpenSSL -sed -e 's|^35$|35,52|' -i tests/data/test323 - -# use localhost6 instead of ip6-localhost in the curl test-suite -( - # avoid glob expansion in the trace output of `bash -x` - { set +x; } 2>/dev/null - cmd="sed -e 's|ip6-localhost|localhost6|' -i tests/data/test[0-9]*" - printf "+ %s\n" "$cmd" >&2 - eval "$cmd" -) - -# regenerate the configure script and Makefile.in files -autoreconf -fiv - -%build -mkdir build-{full,minimal} -export common_configure_opts=" \ - --cache-file=../config.cache \ - --disable-static \ - --enable-symbol-hiding \ - --enable-ipv6 \ - --enable-threaded-resolver \ - --without-libmetalink \ - --with-gssapi \ - --with-nghttp2 \ - --with-ssl --with-ca-bundle=%{_sysconfdir}/pki/tls/certs/ca-bundle.crt" - -%global _configure ../configure - -# configure minimal build -( - cd build-minimal - %configure $common_configure_opts \ - --disable-ldap \ - --disable-ldaps \ - --disable-manual \ - --without-brotli \ - --without-libidn2 \ - --without-libpsl \ - --without-libssh -) - -# configure full build -( - cd build-full - %configure $common_configure_opts \ - --enable-ldap \ - --enable-ldaps \ - --enable-manual \ - --with-brotli \ - --with-libidn2 \ - --with-libpsl \ - --with-libssh -) - -# avoid using rpath -sed -e 's/^runpath_var=.*/runpath_var=/' \ - -e 's/^hardcode_libdir_flag_spec=".*"$/hardcode_libdir_flag_spec=""/' \ - -i build-{full,minimal}/libtool - -%make_build V=1 -C build-minimal -%make_build V=1 -C build-full - -rm -vf debugsourcefiles.list - -%check -# we have to override LD_LIBRARY_PATH because we eliminated rpath -LD_LIBRARY_PATH="${PWD}/build-full/lib/.libs" -export LD_LIBRARY_PATH - -# compile upstream test-cases -cd build-full/tests -%make_build V=1 - -# relax crypto policy for the test-suite to make it pass again (#1610888) -export OPENSSL_SYSTEM_CIPHERS_OVERRIDE=XXX -export OPENSSL_CONF= - -# run the upstream test-suite -srcdir=../../tests perl -I../../tests ../../tests/runtests.pl -a -p -v '!flaky' - -%install -# install and rename the library that will be packaged as libcurl-minimal -%make_install -C build-minimal/lib -rm -f ${RPM_BUILD_ROOT}%{_libdir}/libcurl.{la,so} -for i in ${RPM_BUILD_ROOT}%{_libdir}/*; do - mv -v $i $i.minimal -done - -# install and rename the executable that will be packaged as curl-minimal -%make_install -C build-minimal/src -mv -v ${RPM_BUILD_ROOT}%{_bindir}/curl{,.minimal} - -# install libcurl.m4 -install -d $RPM_BUILD_ROOT%{_datadir}/aclocal -install -m 644 docs/libcurl/libcurl.m4 $RPM_BUILD_ROOT%{_datadir}/aclocal - -# install the executable and library that will be packaged as curl and libcurl -cd build-full -%make_install - -# install zsh completion for curl -# (we have to override LD_LIBRARY_PATH because we eliminated rpath) -LD_LIBRARY_PATH="$RPM_BUILD_ROOT%{_libdir}:$LD_LIBRARY_PATH" \ - %make_install -C scripts - -# do not install /usr/share/fish/completions/curl.fish which is also installed -# by fish-3.0.2-1.module_f31+3716+57207597 and would trigger a conflict -rm -rf ${RPM_BUILD_ROOT}%{_datadir}/fish - -rm -f ${RPM_BUILD_ROOT}%{_libdir}/libcurl.la - -%ldconfig_scriptlets -n libcurl - -%ldconfig_scriptlets -n libcurl-minimal - -%files -%doc CHANGES -%doc README -%doc docs/BUGS.md -%doc docs/FAQ -%doc docs/FEATURES.md -%doc docs/TODO -%doc docs/TheArtOfHttpScripting.md -%{_bindir}/curl -%{_mandir}/man1/curl.1* -%{_datadir}/zsh - -%files -n libcurl -%license COPYING -%{_libdir}/libcurl.so.4 -%{_libdir}/libcurl.so.4.[0-9].[0-9] - -%files -n libcurl-devel -%doc docs/examples/*.c docs/examples/Makefile.example docs/INTERNALS.md -%doc docs/CONTRIBUTE.md docs/libcurl/ABI.md -%{_bindir}/curl-config* -%{_includedir}/curl -%{_libdir}/*.so -%{_libdir}/pkgconfig/*.pc -%{_mandir}/man1/curl-config.1* -%{_mandir}/man3/* -%{_datadir}/aclocal/libcurl.m4 - -%files -n curl-minimal -%{_bindir}/curl.minimal -%{_mandir}/man1/curl.1* - -%files -n libcurl-minimal -%license COPYING -%{_libdir}/libcurl.so.4.minimal -%{_libdir}/libcurl.so.4.[0-9].[0-9].minimal - -%changelog -* Tue Mar 22 2022 Sandino Araico Sánchez - 7.76.1-13 -- Compile on CentOS 8 - -* Fri Sep 17 2021 Kamil Dudka - 7.76.1-12 -- fix STARTTLS protocol injection via MITM (CVE-2021-22947) -- fix protocol downgrade required TLS bypass (CVE-2021-22946) -- fix use-after-free and double-free in MQTT sending (CVE-2021-22945) - -* Wed Jul 21 2021 Kamil Dudka - 7.76.1-7 -- fix TELNET stack contents disclosure again (CVE-2021-22925) -- fix bad connection reuse due to flawed path name checks (CVE-2021-22924) - -* Wed Jul 21 2021 Kamil Dudka - 7.76.1-5 -- disable metalink support to fix the following vulnerabilities - CVE-2021-22923 - metalink download sends credentials - CVE-2021-22922 - wrong content via metalink not discarded - -* Wed Jun 02 2021 Kamil Dudka - 7.76.1-4 -- fix SIGSEGV upon disconnect of a ldaps:// transfer (#1941925) - -* Wed May 26 2021 Kamil Dudka - 7.76.1-3 -- fix TLS session caching disaster (CVE-2021-22901) -- fix TELNET stack contents disclosure (CVE-2021-22898) - -* Mon May 03 2021 Kamil Dudka - 7.76.1-2 -- http2: fix resource leaks detected by Coverity - -* Wed Apr 14 2021 Kamil Dudka - 7.76.1-1 -- new upstream release - -* Wed Mar 31 2021 Kamil Dudka - 7.76.0-1 -- new upstream release, which fixes the following vulnerabilities - CVE-2021-22890 - TLS 1.3 session ticket proxy host mixup - CVE-2021-22876 - Automatic referer leaks credentials - -* Wed Mar 24 2021 Kamil Dudka - 7.75.0-3 -- fix SIGSEGV upon disconnect of a ldaps:// transfer - -* Tue Feb 23 2021 Kamil Dudka - 7.75.0-2 -- build-require python3-impacket only on Fedora - -* Wed Feb 03 2021 Kamil Dudka - 7.75.0-1 -- new upstream release - -* Tue Jan 26 2021 Kamil Dudka - 7.74.0-4 -- do not use stunnel for tests on s390x builds to avoid spurious failures - -* Tue Jan 26 2021 Fedora Release Engineering - 7.74.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Dec 09 2020 Kamil Dudka - 7.74.0-2 -- do not rewrite shebangs in test-suite to use python3 explicitly - -* Wed Dec 09 2020 Kamil Dudka - 7.74.0-1 -- new upstream release, which fixes the following vulnerabilities - CVE-2020-8286 - curl: Inferior OCSP verification - CVE-2020-8285 - libcurl: FTP wildcard stack overflow - CVE-2020-8284 - curl: trusting FTP PASV responses - -* Wed Oct 14 2020 Kamil Dudka - 7.73.0-2 -- prevent upstream test 1451 from being skipped - -* Wed Oct 14 2020 Kamil Dudka - 7.73.0-1 -- new upstream release - -* Thu Sep 10 2020 Jinoh Kang - 7.72.0-2 -- fix multiarch conflicts in libcurl-minimal (#1877671) - -* Wed Aug 19 2020 Kamil Dudka - 7.72.0-1 -- new upstream release, which fixes the following vulnerability - CVE-2020-8231 - libcurl: wrong connect-only connection - -* Thu Aug 06 2020 Kamil Dudka - 7.71.1-5 -- setopt: unset NOBODY switches to GET if still HEAD - -* Mon Jul 27 2020 Fedora Release Engineering - 7.71.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jul 13 2020 Tom Stellard - 7.71.1-3 -- Use make macros -- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro - -* Fri Jul 03 2020 Kamil Dudka - 7.71.1-2 -- curl: make the --krb option work again (#1833193) - -* Wed Jul 01 2020 Kamil Dudka - 7.71.1-1 -- new upstream release - -* Wed Jun 24 2020 Kamil Dudka - 7.71.0-1 -- new upstream release, which fixes the following vulnerabilities - CVE-2020-8169 - curl: Partial password leak over DNS on HTTP redirect - CVE-2020-8177 - curl: overwrite local file with -J - -* Wed Apr 29 2020 Kamil Dudka - 7.70.0-1 -- new upstream release - -* Mon Apr 20 2020 Kamil Dudka - 7.69.1-3 -- SSH: use new ECDSA key types to check known hosts (#1824926) - -* Fri Apr 17 2020 Tom Stellard - 7.69.1-2 -- Prevent discarding of -g when compiling with clang - -* Wed Mar 11 2020 Kamil Dudka - 7.69.1-1 -- new upstream release - -* Mon Mar 09 2020 Kamil Dudka - 7.69.0-2 -- make Flatpak work again (#1810989) - -* Wed Mar 04 2020 Kamil Dudka - 7.69.0-1 -- new upstream release - -* Tue Jan 28 2020 Fedora Release Engineering - 7.68.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Wed Jan 08 2020 Kamil Dudka - 7.68.0-1 -- new upstream release - -* Thu Nov 14 2019 Kamil Dudka - 7.67.0-2 -- fix infinite loop on upload using a glob (#1771025) - -* Wed Nov 06 2019 Kamil Dudka - 7.67.0-1 -- new upstream release - -* Wed Sep 11 2019 Kamil Dudka - 7.66.0-1 -- new upstream release, which fixes the following vulnerabilities - CVE-2019-5481 - double free due to subsequent call of realloc() - CVE-2019-5482 - heap buffer overflow in function tftp_receive_packet() - -* Tue Aug 27 2019 Kamil Dudka - 7.65.3-4 -- avoid reporting spurious error in the HTTP2 framing layer (#1690971) - -* Thu Aug 01 2019 Kamil Dudka - 7.65.3-3 -- improve handling of gss_init_sec_context() failures - -* Wed Jul 24 2019 Fedora Release Engineering - 7.65.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sat Jul 20 2019 Paul Howarth - 7.65.3-1 -- new upstream release - -* Wed Jul 17 2019 Kamil Dudka - 7.65.2-1 -- new upstream release - -* Wed Jun 05 2019 Kamil Dudka - 7.65.1-1 -- new upstream release - -* Thu May 30 2019 Kamil Dudka - 7.65.0-2 -- fix spurious timeout events with speed-limit (#1714893) - -* Wed May 22 2019 Kamil Dudka - 7.65.0-1 -- new upstream release, which fixes the following vulnerabilities - CVE-2019-5436 - TFTP receive buffer overflow - CVE-2019-5435 - integer overflows in curl_url_set() - -* Thu May 09 2019 Kamil Dudka - 7.64.1-2 -- do not treat failure of gss_init_sec_context() with --negotiate as fatal - -* Wed Mar 27 2019 Kamil Dudka - 7.64.1-1 -- new upstream release - -* Mon Mar 25 2019 Kamil Dudka - 7.64.0-6 -- remove verbose "Expire in" ... messages (#1690971) - -* Thu Mar 21 2019 Kamil Dudka - 7.64.0-5 -- avoid spurious "Could not resolve host: [host name]" error messages - -* Wed Feb 27 2019 Kamil Dudka - 7.64.0-4 -- fix NULL dereference if flushing cookies with no CookieInfo set (#1683676) - -* Mon Feb 25 2019 Kamil Dudka - 7.64.0-3 -- prevent NetworkManager from leaking file descriptors (#1680198) - -* Mon Feb 11 2019 Kamil Dudka - 7.64.0-2 -- make zsh completion work again - -* Wed Feb 06 2019 Kamil Dudka - 7.64.0-1 -- new upstream release, which fixes the following vulnerabilities - CVE-2019-3823 - SMTP end-of-response out-of-bounds read - CVE-2019-3822 - NTLMv2 type-3 header stack buffer overflow - CVE-2018-16890 - NTLM type-2 out-of-bounds buffer read - -* Mon Feb 04 2019 Kamil Dudka - 7.63.0-7 -- prevent valgrind from reporting false positives on x86_64 - -* Thu Jan 31 2019 Fedora Release Engineering - 7.63.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Mon Jan 21 2019 Kamil Dudka - 7.63.0-5 -- xattr: strip credentials from any URL that is stored (CVE-2018-20483) - -* Fri Jan 04 2019 Kamil Dudka - 7.63.0-4 -- replace 0105-curl-7.63.0-libstubgss-ldadd.patch by upstream patch - -* Wed Dec 19 2018 Kamil Dudka - 7.63.0-3 -- curl -J: do not append to the destination file (#1658574) - -* Fri Dec 14 2018 Kamil Dudka - 7.63.0-2 -- revert an upstream commit that broke `fedpkg new-sources` (#1659329) - -* Wed Dec 12 2018 Kamil Dudka - 7.63.0-1 -- new upstream release - -* Wed Oct 31 2018 Kamil Dudka - 7.62.0-1 -- new upstream release, which fixes the following vulnerabilities - CVE-2018-16839 - SASL password overflow via integer overflow - CVE-2018-16840 - use-after-free in handle close - CVE-2018-16842 - warning message out-of-buffer read - -* Thu Oct 11 2018 Kamil Dudka - 7.61.1-3 -- enable TLS 1.3 post-handshake auth in OpenSSL -- update the documentation of --tlsv1.0 in curl(1) man page - -* Thu Oct 04 2018 Kamil Dudka - 7.61.1-2 -- enforce versioned libpsl dependency for libcurl (#1631804) -- test320: update expected output for gnutls-3.6.4 -- drop 0105-curl-7.61.0-tests-ssh-keygen.patch no longer needed (#1622594) - -* Wed Sep 05 2018 Kamil Dudka - 7.61.1-1 -- new upstream release, which fixes the following vulnerability - CVE-2018-14618 - NTLM password overflow via integer overflow - -* Tue Sep 04 2018 Kamil Dudka - 7.61.0-8 -- make the --tls13-ciphers option work - -* Mon Aug 27 2018 Kamil Dudka - 7.61.0-7 -- tests: make ssh-keygen always produce PEM format (#1622594) - -* Wed Aug 15 2018 Kamil Dudka - 7.61.0-6 -- scp/sftp: fix infinite connect loop on invalid private key (#1595135) - -* Thu Aug 09 2018 Kamil Dudka - 7.61.0-5 -- ssl: set engine implicitly when a PKCS#11 URI is provided (#1219544) - -* Tue Aug 07 2018 Kamil Dudka - 7.61.0-4 -- relax crypto policy for the test-suite to make it pass again (#1610888) - -* Tue Jul 31 2018 Kamil Dudka - 7.61.0-3 -- disable flaky test 1900, which covers deprecated HTTP pipelining -- adapt test 323 for updated OpenSSL - -* Thu Jul 12 2018 Fedora Release Engineering - 7.61.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Jul 11 2018 Kamil Dudka - 7.61.0-1 -- new upstream release, which fixes the following vulnerability - CVE-2018-0500 - SMTP send heap buffer overflow - -* Tue Jul 10 2018 Kamil Dudka - 7.60.0-3 -- enable support for brotli compression in libcurl-full - -* Wed Jul 04 2018 Kamil Dudka - 7.60.0-2 -- do not hard-wire path of the Python 3 interpreter - -* Wed May 16 2018 Kamil Dudka - 7.60.0-1 -- new upstream release, which fixes the following vulnerabilities - CVE-2018-1000300 - FTP shutdown response buffer overflow - CVE-2018-1000301 - RTSP bad headers buffer over-read - -* Thu Mar 15 2018 Kamil Dudka - 7.59.0-3 -- make the test-suite use Python 3 - -* Wed Mar 14 2018 Kamil Dudka - 7.59.0-2 -- ftp: fix typo in recursive callback detection for seeking - -* Wed Mar 14 2018 Kamil Dudka - 7.59.0-1 -- new upstream release, which fixes the following vulnerabilities - CVE-2018-1000120 - FTP path trickery leads to NIL byte out of bounds write - CVE-2018-1000121 - LDAP NULL pointer dereference - CVE-2018-1000122 - RTSP RTP buffer over-read - -* Mon Mar 12 2018 Kamil Dudka - 7.58.0-8 -- http2: mark the connection for close on GOAWAY - -* Mon Feb 19 2018 Paul Howarth - 7.58.0-7 -- Add explicity-used build requirements -- Fix libcurl soname version number in %%files list to avoid accidental soname - bumps - -* Thu Feb 15 2018 Paul Howarth - 7.58.0-6 -- switch to %%ldconfig_scriptlets -- drop legacy BuildRoot: and Group: tags -- enforce versioned libssh dependency for libcurl - -* Tue Feb 13 2018 Kamil Dudka - 7.58.0-5 -- drop temporary workaround for #1540549 - -* Wed Feb 07 2018 Fedora Release Engineering - 7.58.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Jan 31 2018 Kamil Dudka - 7.58.0-3 -- temporarily work around internal compiler error on x86_64 (#1540549) -- disable brp-ldconfig to make RemovePathPostfixes work with shared libs again - -* Wed Jan 24 2018 Andreas Schneider - 7.58.0-2 -- use libssh (instead of libssh2) to implement SCP/SFTP in libcurl (#1531483) - -* Wed Jan 24 2018 Kamil Dudka - 7.58.0-1 -- new upstream release, which fixes the following vulnerabilities - CVE-2018-1000005 - curl: HTTP/2 trailer out-of-bounds read - CVE-2018-1000007 - curl: HTTP authentication leak in redirects - -* Wed Nov 29 2017 Kamil Dudka - 7.57.0-1 -- new upstream release, which fixes the following vulnerabilities - CVE-2017-8816 - curl: NTLM buffer overflow via integer overflow - CVE-2017-8817 - curl: FTP wildcard out of bounds read - CVE-2017-8818 - curl: SSL out of buffer access - -* Mon Oct 23 2017 Kamil Dudka - 7.56.1-1 -- new upstream release (fixes CVE-2017-1000257) - -* Wed Oct 04 2017 Kamil Dudka - 7.56.0-1 -- new upstream release (fixes CVE-2017-1000254) - -* Mon Aug 28 2017 Kamil Dudka - 7.55.1-5 -- apply the patch for the previous commit and fix its name (#1485702) - -* Mon Aug 28 2017 Bastien Nocera - 7.55.1-4 -- Fix NetworkManager connectivity check not working (#1485702) - -* Tue Aug 22 2017 Kamil Dudka 7.55.1-3 -- utilize system wide crypto policies for TLS (#1483972) - -* Tue Aug 15 2017 Kamil Dudka 7.55.1-2 -- make zsh completion work again - -* Mon Aug 14 2017 Kamil Dudka 7.55.1-1 -- new upstream release - -* Wed Aug 09 2017 Kamil Dudka 7.55.0-1 -- drop multilib fix for libcurl header files no longer needed -- new upstream release, which fixes the following vulnerabilities - CVE-2017-1000099 - FILE buffer read out of bounds - CVE-2017-1000100 - TFTP sends more than buffer size - CVE-2017-1000101 - URL globbing out of bounds read - -* Wed Aug 02 2017 Fedora Release Engineering - 7.54.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Fri Jul 28 2017 Florian Weimer - 7.54.1-7 -- Rebuild with fixed binutils (#1475636) - -* Fri Jul 28 2017 Igor Gnatenko - 7.54.1-6 -- Enable separate debuginfo back - -* Thu Jul 27 2017 Kamil Dudka 7.54.1-5 -- rebuild to fix broken linkage of cmake on ppc64le - -* Wed Jul 26 2017 Kamil Dudka 7.54.1-4 -- avoid build failure caused broken RPM code that produces debuginfo packages - -* Wed Jul 26 2017 Fedora Release Engineering - 7.54.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Mon Jun 19 2017 Kamil Dudka 7.54.1-2 -- enforce versioned openssl-libs dependency for libcurl (#1462184) - -* Wed Jun 14 2017 Kamil Dudka 7.54.1-1 -- new upstream release - -* Tue May 16 2017 Kamil Dudka 7.54.0-5 -- add *-full provides for curl and libcurl to make them explicitly installable - -* Thu May 04 2017 Kamil Dudka 7.54.0-4 -- make curl-minimal require a new enough version of libcurl - -* Thu Apr 27 2017 Kamil Dudka 7.54.0-3 -- switch the TLS backend back to OpenSSL (#1445153) - -* Tue Apr 25 2017 Kamil Dudka 7.54.0-2 -- nss: use libnssckbi.so as the default source of trust -- nss: do not leak PKCS #11 slot while loading a key (#1444860) - -* Thu Apr 20 2017 Kamil Dudka 7.54.0-1 -- new upstream release (fixes CVE-2017-7468) - -* Thu Apr 13 2017 Paul Howarth 7.53.1-7 -- add %%post and %%postun scriptlets for libcurl-minimal -- libcurl-minimal provides both libcurl and libcurl%%{?_isa} -- remove some legacy spec file cruft - -* Wed Apr 12 2017 Kamil Dudka 7.53.1-6 -- provide (lib)curl-minimal subpackages with lightweight build of (lib)curl - -* Mon Apr 10 2017 Kamil Dudka 7.53.1-5 -- disable upstream test 2033 (flaky test for HTTP/1 pipelining) - -* Fri Apr 07 2017 Kamil Dudka 7.53.1-4 -- fix out of bounds read in curl --write-out (CVE-2017-7407) - -* Mon Mar 06 2017 Kamil Dudka 7.53.1-3 -- make the dependency on nss-pem arch-specific (#1428550) - -* Thu Mar 02 2017 Kamil Dudka 7.53.1-2 -- re-enable valgrind on ix86 because sqlite is fixed (#1428286) - -* Fri Feb 24 2017 Kamil Dudka 7.53.1-1 -- new upstream release - -* Wed Feb 22 2017 Kamil Dudka 7.53.0-1 -- do not use valgrind on ix86 until sqlite is rebuilt by patched GCC (#1423434) -- new upstream release (fixes CVE-2017-2629) - -* Fri Feb 10 2017 Fedora Release Engineering - 7.52.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Dec 23 2016 Kamil Dudka 7.52.1-1 -- new upstream release (fixes CVE-2016-9586) - -* Mon Nov 21 2016 Kamil Dudka 7.51.0-3 -- map CURL_SSLVERSION_DEFAULT to NSS default, add support for TLS 1.3 (#1396719) - -* Tue Nov 15 2016 Kamil Dudka 7.51.0-2 -- stricter host name checking for file:// URLs -- ssh: check md5 fingerprints case insensitively - -* Wed Nov 02 2016 Kamil Dudka 7.51.0-1 -- temporarily disable failing libidn2 test-cases -- new upstream release, which fixes the following vulnerabilities - CVE-2016-8615 - Cookie injection for other servers - CVE-2016-8616 - Case insensitive password comparison - CVE-2016-8617 - Out-of-bounds write via unchecked multiplication - CVE-2016-8618 - Double-free in curl_maprintf - CVE-2016-8619 - Double-free in krb5 code - CVE-2016-8620 - Glob parser write/read out of bounds - CVE-2016-8621 - curl_getdate out-of-bounds read - CVE-2016-8622 - URL unescape heap overflow via integer truncation - CVE-2016-8623 - Use-after-free via shared cookies - CVE-2016-8624 - Invalid URL parsing with '#' - CVE-2016-8625 - IDNA 2003 makes curl use wrong host - -* Thu Oct 20 2016 Kamil Dudka 7.50.3-3 -- drop 0103-curl-7.50.0-stunnel.patch no longer needed - -* Fri Oct 07 2016 Kamil Dudka 7.50.3-2 -- use the just built version of libcurl while generating zsh completion - -* Wed Sep 14 2016 Kamil Dudka 7.50.3-1 -- new upstream release (fixes CVE-2016-7167) - -* Wed Sep 07 2016 Kamil Dudka 7.50.2-1 -- new upstream release - -* Fri Aug 26 2016 Kamil Dudka 7.50.1-2 -- work around race condition in PK11_FindSlotByName() -- fix incorrect use of a previously loaded certificate from file - (related to CVE-2016-5420) - -* Wed Aug 03 2016 Kamil Dudka 7.50.1-1 -- new upstream release (fixes CVE-2016-5419, CVE-2016-5420, and CVE-2016-5421) - -* Tue Jul 26 2016 Kamil Dudka 7.50.0-2 -- run HTTP/2 tests on all architectures (#1360319 now worked around in nghttp2) - -* Thu Jul 21 2016 Kamil Dudka 7.50.0-1 -- run HTTP/2 tests only on Intel for now to work around #1358845 -- require nss-pem because it is no longer included in the nss package (#1347336) -- fix HTTPS and FTPS tests (work around stunnel bug #1358810) -- new upstream release - -* Fri Jun 17 2016 Kamil Dudka 7.49.1-3 -- use multilib-rpm-config to install arch-dependent header files - -* Fri Jun 03 2016 Kamil Dudka 7.49.1-2 -- fix SIGSEGV of the curl tool while parsing URL with too many globs (#1340757) - -* Mon May 30 2016 Kamil Dudka 7.49.1-1 -- new upstream release - -* Wed May 18 2016 Kamil Dudka 7.49.0-1 -- new upstream release - -* Wed Mar 23 2016 Kamil Dudka 7.48.0-1 -- new upstream release - -* Wed Mar 02 2016 Kamil Dudka 7.47.1-4 -- do not refuse cookies for localhost (#1308791) - -* Wed Feb 17 2016 Kamil Dudka 7.47.1-3 -- make SCP and SFTP test-cases work with up2date OpenSSH - -* Wed Feb 10 2016 Kamil Dudka 7.47.1-2 -- enable support for Public Suffix List (#1305701) - -* Mon Feb 08 2016 Kamil Dudka 7.47.1-1 -- new upstream release - -* Wed Feb 03 2016 Fedora Release Engineering - 7.47.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jan 27 2016 Kamil Dudka 7.47.0-1 -- new upstream release (fixes CVE-2016-0755) - -* Fri Dec 4 2015 Kamil Dudka 7.46.0-2 -- own /usr/share/zsh/site-functions instead of requiring zsh (#1288529) - -* Wed Dec 2 2015 Kamil Dudka 7.46.0-1 -- disable silent builds (suggested by Paul Howarth) -- use default port numbers when running the upstream test-suite -- install zsh completion script -- new upstream release - -* Wed Oct 7 2015 Paul Howarth 7.45.0-1 -- new upstream release -- drop %%defattr, redundant since rpm 4.4 - -* Fri Sep 18 2015 Kamil Dudka 7.44.0-2 -- prevent NSS from incorrectly re-using a session (#1104597) - -* Wed Aug 12 2015 Kamil Dudka 7.44.0-1 -- new upstream release - -* Thu Jul 30 2015 Kamil Dudka 7.43.0-3 -- prevent dnf from crashing when using both FTP and HTTP (#1248389) - -* Thu Jul 16 2015 Kamil Dudka 7.43.0-2 -- build support for the HTTP/2 protocol - -* Wed Jun 17 2015 Kamil Dudka 7.43.0-1 -- new upstream release (fixes CVE-2015-3236 and CVE-2015-3237) - -* Wed Jun 17 2015 Fedora Release Engineering - 7.42.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Fri Jun 05 2015 Kamil Dudka 7.42.1-2 -- curl-config --libs now works on x86_64 without libcurl-devel.x86_64 (#1228363) - -* Wed Apr 29 2015 Kamil Dudka 7.42.1-1 -- new upstream release (fixes CVE-2015-3153) - -* Wed Apr 22 2015 Kamil Dudka 7.42.0-1 -- new upstream release (fixes CVE-2015-3143, CVE-2015-3144, CVE-2015-3145, - and CVE-2015-3148) -- implement public key pinning for NSS backend (#1195771) -- do not run flaky test-cases in %%check - -* Wed Feb 25 2015 Kamil Dudka 7.41.0-1 -- new upstream release -- include extern-scan.pl to make test1135 succeed (upstream commit 1514b718) - -* Mon Feb 23 2015 Kamil Dudka 7.40.0-3 -- fix a spurious connect failure on dual-stacked hosts (#1187531) - -* Sat Feb 21 2015 Till Maas - 7.40.0-2 -- Rebuilt for Fedora 23 Change - https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code - -* Thu Jan 08 2015 Kamil Dudka 7.40.0-1 -- new upstream release (fixes CVE-2014-8150) - -* Wed Nov 05 2014 Kamil Dudka 7.39.0-1 -- new upstream release (fixes CVE-2014-3707) - -* Tue Oct 21 2014 Kamil Dudka 7.38.0-2 -- fix a connection failure when FTPS handle is reused - -* Wed Sep 10 2014 Kamil Dudka 7.38.0-1 -- new upstream release (fixes CVE-2014-3613 and CVE-2014-3620) - -* Sat Aug 16 2014 Fedora Release Engineering - 7.37.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Wed Aug 13 2014 Rex Dieter 7.37.1-2 -- include arch'd Requires/Provides - -* Wed Jul 16 2014 Kamil Dudka 7.37.1-1 -- new upstream release -- fix endless loop with GSSAPI proxy auth (patches by David Woodhouse, #1118751) - -* Fri Jul 11 2014 Tom Callaway 7.37.0-4 -- fix license handling - -* Fri Jul 04 2014 Kamil Dudka 7.37.0-3 -- various SSL-related fixes (mainly crash on connection failure) - -* Sat Jun 07 2014 Fedora Release Engineering - 7.37.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Wed May 21 2014 Kamil Dudka 7.37.0-1 -- new upstream release - -* Fri May 09 2014 Kamil Dudka 7.36.0-4 -- auth failure on duplicated 'WWW-Authenticate: Negotiate' header (#1093348) - -* Fri Apr 25 2014 Kamil Dudka 7.36.0-3 -- nss: implement non-blocking SSL handshake - -* Wed Apr 02 2014 Kamil Dudka 7.36.0-2 -- extend URL parser to support IPv6 zone identifiers (#680996) - -* Wed Mar 26 2014 Kamil Dudka 7.36.0-1 -- new upstream release (fixes CVE-2014-0138) - -* Mon Mar 17 2014 Paul Howarth 7.35.0-5 -- add all perl build requirements for the test suite, in a portable way - -* Mon Mar 17 2014 Kamil Dudka 7.35.0-4 -- add BR for perl-Digest-MD5, which is required by the test-suite - -* Wed Mar 05 2014 Kamil Dudka 7.35.0-3 -- avoid spurious failure of test1086 on s390(x) koji builders (#1072273) - -* Tue Feb 25 2014 Kamil Dudka 7.35.0-2 -- refresh expired cookie in test172 from upstream test-suite (#1068967) - -* Wed Jan 29 2014 Kamil Dudka 7.35.0-1 -- new upstream release (fixes CVE-2014-0015) - -* Wed Dec 18 2013 Kamil Dudka 7.34.0-1 -- new upstream release - -* Mon Dec 02 2013 Kamil Dudka 7.33.0-2 -- allow to use TLS > 1.0 if built against recent NSS - -* Mon Oct 14 2013 Kamil Dudka 7.33.0-1 -- new upstream release -- fix missing initialization in NTLM code causing test 906 to fail -- fix missing initialization in SSH code causing test 619 to fail - -* Fri Oct 11 2013 Kamil Dudka 7.32.0-3 -- do not limit the speed of SCP upload on a fast connection - -* Mon Sep 09 2013 Kamil Dudka 7.32.0-2 -- avoid delay if FTP is aborted in CURLOPT_HEADERFUNCTION callback (#1005686) - -* Mon Aug 12 2013 Kamil Dudka 7.32.0-1 -- new upstream release -- make sure that NSS is initialized prior to calling PK11_GenerateRandom() - -* Sat Aug 03 2013 Fedora Release Engineering - 7.31.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Tue Jul 09 2013 Kamil Dudka 7.31.0-4 -- mention all option listed in 'curl --help' in curl.1 man page - -* Tue Jul 02 2013 Kamil Dudka 7.31.0-3 -- restore the functionality of 'curl -u :' - -* Wed Jun 26 2013 Kamil Dudka 7.31.0-2 -- build the curl tool with metalink support - -* Sat Jun 22 2013 Kamil Dudka 7.31.0-1 -- new upstream release (fixes CVE-2013-2174) - -* Fri Apr 26 2013 Kamil Dudka 7.30.0-2 -- prevent an artificial timeout event due to stale speed-check data (#906031) - -* Fri Apr 12 2013 Kamil Dudka 7.30.0-1 -- new upstream release (fixes CVE-2013-1944) -- prevent test-suite failure due to using non-default port ranges in tests - -* Tue Mar 12 2013 Kamil Dudka 7.29.0-4 -- do not ignore poll() failures other than EINTR (#919127) -- curl_global_init() now accepts the CURL_GLOBAL_ACK_EINTR flag (#919127) - -* Wed Mar 06 2013 Kamil Dudka 7.29.0-3 -- switch SSL socket into non-blocking mode after handshake -- drop the hide_selinux.c hack no longer needed in %%check - -* Fri Feb 22 2013 Kamil Dudka 7.29.0-2 -- fix a SIGSEGV when closing an unused multi handle (#914411) - -* Wed Feb 06 2013 Kamil Dudka 7.29.0-1 -- new upstream release (fixes CVE-2013-0249) - -* Tue Jan 15 2013 Kamil Dudka 7.28.1-3 -- require valgrind for build only on i386 and x86_64 (#886891) - -* Tue Jan 15 2013 Kamil Dudka 7.28.1-2 -- prevent NSS from crashing on client auth hook failure -- clear session cache if a client cert from file is used -- fix error messages for CURLE_SSL_{CACERT,CRL}_BADFILE - -* Tue Nov 20 2012 Kamil Dudka 7.28.1-1 -- new upstream release - -* Wed Oct 31 2012 Kamil Dudka 7.28.0-1 -- new upstream release - -* Mon Oct 01 2012 Kamil Dudka 7.27.0-3 -- use the upstream facility to disable problematic tests -- do not crash if MD5 fingerprint is not provided by libssh2 - -* Wed Aug 01 2012 Kamil Dudka 7.27.0-2 -- eliminate unnecessary inotify events on upload via file protocol (#844385) - -* Sat Jul 28 2012 Kamil Dudka 7.27.0-1 -- new upstream release - -* Mon Jul 23 2012 Kamil Dudka 7.26.0-6 -- print reason phrase from HTTP status line on error (#676596) - -* Wed Jul 18 2012 Fedora Release Engineering - 7.26.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jun 09 2012 Kamil Dudka 7.26.0-4 -- fix duplicated SSL handshake with multi interface and proxy (#788526) - -* Wed May 30 2012 Karsten Hopp 7.26.0-3 -- disable test 1319 on ppc64, server times out - -* Mon May 28 2012 Kamil Dudka 7.26.0-2 -- use human-readable error messages provided by NSS (upstream commit 72f4b534) - -* Fri May 25 2012 Kamil Dudka 7.26.0-1 -- new upstream release - -* Wed Apr 25 2012 Karsten Hopp 7.25.0-3 -- valgrind on ppc64 works fine, disable ppc32 only - -* Wed Apr 25 2012 Karsten Hopp 7.25.0-3 -- drop BR valgrind on PPC(64) until bugzilla #810992 gets fixed - -* Fri Apr 13 2012 Kamil Dudka 7.25.0-2 -- use NSS_InitContext() to initialize NSS if available (#738456) -- provide human-readable names for NSS errors (upstream commit a60edcc6) - -* Fri Mar 23 2012 Paul Howarth 7.25.0-1 -- new upstream release (#806264) -- fix character encoding of docs with a patch rather than just iconv -- update debug and multilib patches -- don't use macros for commands -- reduce size of %%prep output for readability - -* Tue Jan 24 2012 Kamil Dudka 7.24.0-1 -- new upstream release (fixes CVE-2012-0036) - -* Thu Jan 05 2012 Paul Howarth 7.23.0-6 -- rebuild for gcc 4.7 - -* Mon Jan 02 2012 Kamil Dudka 7.23.0-5 -- upstream patch that allows to run FTPS tests with nss-3.13 (#760060) - -* Tue Dec 27 2011 Kamil Dudka 7.23.0-4 -- allow to run FTPS tests with nss-3.13 (#760060) - -* Sun Dec 25 2011 Kamil Dudka 7.23.0-3 -- avoid unnecessary timeout event when waiting for 100-continue (#767490) - -* Mon Nov 21 2011 Kamil Dudka 7.23.0-2 -- curl -JO now uses -O name if no C-D header comes (upstream commit c532604) - -* Wed Nov 16 2011 Kamil Dudka 7.23.0-1 -- new upstream release (#754391) - -* Mon Sep 19 2011 Kamil Dudka 7.22.0-2 -- nss: select client certificates by DER (#733657) - -* Tue Sep 13 2011 Kamil Dudka 7.22.0-1 -- new upstream release -- curl-config now provides dummy --static-libs option (#733956) - -* Sun Aug 21 2011 Paul Howarth 7.21.7-4 -- actually fix SIGSEGV of curl -O -J given more than one URL (#723075) - -* Mon Aug 15 2011 Kamil Dudka 7.21.7-3 -- fix SIGSEGV of curl -O -J given more than one URL (#723075) -- introduce the --delegation option of curl (#730444) -- initialize NSS with no database if the selected database is broken (#728562) - -* Wed Aug 03 2011 Kamil Dudka 7.21.7-2 -- add a new option CURLOPT_GSSAPI_DELEGATION (#719939) - -* Thu Jun 23 2011 Kamil Dudka 7.21.7-1 -- new upstream release (fixes CVE-2011-2192) - -* Wed Jun 08 2011 Kamil Dudka 7.21.6-2 -- avoid an invalid timeout event on a reused handle (#679709) - -* Sat Apr 23 2011 Paul Howarth 7.21.6-1 -- new upstream release - -* Mon Apr 18 2011 Kamil Dudka 7.21.5-2 -- fix the output of curl-config --version (upstream commit 82ecc85) - -* Mon Apr 18 2011 Kamil Dudka 7.21.5-1 -- new upstream release - -* Sat Apr 16 2011 Peter Robinson 7.21.4-4 -- no valgrind on ARMv5 arches - -* Sat Mar 05 2011 Dennis Gilmore 7.21.4-3 -- no valgrind on sparc arches - -* Tue Feb 22 2011 Kamil Dudka 7.21.4-2 -- do not ignore failure of SSL handshake (upstream commit 7aa2d10) - -* Fri Feb 18 2011 Kamil Dudka 7.21.4-1 -- new upstream release -- avoid memory leak on SSL connection failure (upstream commit a40f58d) -- work around valgrind bug (#678518) - -* Tue Feb 08 2011 Fedora Release Engineering - 7.21.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Wed Jan 12 2011 Kamil Dudka 7.21.3-2 -- build libcurl with --enable-hidden-symbols - -* Thu Dec 16 2010 Paul Howarth 7.21.3-1 -- update to 7.21.3: - - added --noconfigure switch to testcurl.pl - - added --xattr option - - added CURLOPT_RESOLVE and --resolve - - added CURLAUTH_ONLY - - added version-check.pl to the examples dir - - check for libcurl features for some command line options - - Curl_setopt: disallow CURLOPT_USE_SSL without SSL support - - http_chunks: remove debug output - - URL-parsing: consider ? a divider - - SSH: avoid using the libssh2_ prefix - - SSH: use libssh2_session_handshake() to work on win64 - - ftp: prevent server from hanging on closed data connection when stopping - a transfer before the end of the full transfer (ranges) - - LDAP: detect non-binary attributes properly - - ftp: treat server's response 421 as CURLE_OPERATION_TIMEDOUT - - gnutls->handshake: improved timeout handling - - security: pass the right parameter to init - - krb5: use GSS_ERROR to check for error - - TFTP: resend the correct data - - configure: fix autoconf 2.68 warning: no AC_LANG_SOURCE call detected - - GnuTLS: now detects socket errors on Windows - - symbols-in-versions: updated en masse - - added a couple of examples that were missing from the tarball - - Curl_send/recv_plain: return errno on failure - - Curl_wait_for_resolv (for c-ares): correct timeout - - ossl_connect_common: detect connection re-use - - configure: prevent link errors with --librtmp - - openldap: use remote port in URL passed to ldap_init_fd() - - url: provide dead_connection flag in Curl_handler::disconnect - - lots of compiler warning fixes - - ssh: fix a download resume point calculation - - fix getinfo CURLINFO_LOCAL* for reused connections - - multi: the returned running handles counter could turn negative - - multi: only ever consider pipelining for connections doing HTTP(S) -- drop upstream patches now in tarball -- update bz650255 and disable-test1112 patches to apply against new codebase -- add workaround for false-positive glibc-detected buffer overflow in tftpd - test server with FORTIFY_SOURCE (similar to #515361) - -* Fri Nov 12 2010 Kamil Dudka 7.21.2-5 -- do not send QUIT to a dead FTP control connection (#650255) -- pull back glibc's implementation of str[n]casecmp(), #626470 appears fixed - -* Tue Nov 09 2010 Kamil Dudka 7.21.2-4 -- prevent FTP client from hanging on unrecognized ABOR response (#649347) -- return more appropriate error code in case FTP server session idle - timeout has exceeded (#650255) - -* Fri Oct 29 2010 Kamil Dudka 7.21.2-3 -- prevent FTP server from hanging on closed data connection (#643656) - -* Thu Oct 14 2010 Paul Howarth 7.21.2-2 -- enforce versioned libssh2 dependency for libcurl (#642796) - -* Wed Oct 13 2010 Kamil Dudka 7.21.2-1 -- new upstream release, drop applied patches -- make 0102-curl-7.21.2-debug.patch less intrusive - -* Wed Sep 29 2010 jkeating - 7.21.1-6 -- Rebuilt for gcc bug 634757 - -* Sat Sep 11 2010 Kamil Dudka 7.21.1-5 -- make it possible to run SCP/SFTP tests on x86_64 (#632914) - -* Tue Sep 07 2010 Kamil Dudka 7.21.1-4 -- work around glibc/valgrind problem on x86_64 (#631449) - -* Tue Aug 24 2010 Paul Howarth 7.21.1-3 -- fix up patches so there's no need to run autotools in the rpm build -- drop buildreq automake -- drop dependency on automake for devel package from F-14, where - %%{_datadir}/aclocal is included in the filesystem package -- drop dependency on pkgconfig for devel package from F-11, where - pkgconfig dependencies are auto-generated - -* Mon Aug 23 2010 Kamil Dudka 7.21.1-2 -- re-enable test575 on s390(x), already fixed (upstream commit d63bdba) -- modify system headers to work around gcc bug (#617757) -- curl -T now ignores file size of special files (#622520) -- fix kerberos proxy authentication for https (#625676) -- work around glibc/valgrind problem on x86_64 (#626470) - -* Thu Aug 12 2010 Kamil Dudka 7.21.1-1 -- new upstream release - -* Mon Jul 12 2010 Dan Horák 7.21.0-3 -- disable test 575 on s390(x) - -* Mon Jun 28 2010 Kamil Dudka 7.21.0-2 -- add support for NTLM authentication (#603783) - -* Wed Jun 16 2010 Kamil Dudka 7.21.0-1 -- new upstream release, drop applied patches -- update of %%description -- disable valgrind for certain test-cases (libssh2 problem) - -* Tue May 25 2010 Kamil Dudka 7.20.1-6 -- fix -J/--remote-header-name to strip CR-LF (upstream patch) - -* Wed Apr 28 2010 Kamil Dudka 7.20.1-5 -- CRL support now works again (#581926) -- make it possible to start a testing OpenSSH server when building with SELinux - in the enforcing mode (#521087) - -* Sat Apr 24 2010 Kamil Dudka 7.20.1-4 -- upstream patch preventing failure of test536 with threaded DNS resolver -- upstream patch preventing SSL handshake timeout underflow - -* Thu Apr 22 2010 Paul Howarth 7.20.1-3 -- replace Rawhide s390-sleep patch with a more targeted patch adding a - delay after tests 513 and 514 rather than after all tests - -* Wed Apr 21 2010 Kamil Dudka 7.20.1-2 -- experimentally enabled threaded DNS lookup -- make curl-config multilib ready again (#584107) - -* Mon Apr 19 2010 Kamil Dudka 7.20.1-1 -- new upstream release - -* Tue Mar 23 2010 Kamil Dudka 7.20.0-4 -- add missing quote in libcurl.m4 (#576252) - -* Fri Mar 19 2010 Kamil Dudka 7.20.0-3 -- throw CURLE_SSL_CERTPROBLEM in case peer rejects a certificate (#565972) -- valgrind temporarily disabled (#574889) -- kerberos installation prefix has been changed - -* Wed Feb 24 2010 Kamil Dudka 7.20.0-2 -- exclude test1112 from the test suite (#565305) - -* Thu Feb 11 2010 Kamil Dudka 7.20.0-1 -- new upstream release - added support for IMAP(S), POP3(S), SMTP(S) and RTSP -- dropped patches applied upstream -- dropped curl-7.16.0-privlibs.patch no longer useful -- a new patch forcing -lrt when linking the curl tool and test-cases - -* Fri Jan 29 2010 Kamil Dudka 7.19.7-11 -- upstream patch adding a new option -J/--remote-header-name -- dropped temporary workaround for #545779 - -* Thu Jan 14 2010 Chris Weyl 7.19.7-10 -- bump for libssh2 rebuild - -* Sun Dec 20 2009 Kamil Dudka 7.19.7-9 -- temporary workaround for #548269 - (restored behavior of 7.19.7-4) - -* Wed Dec 09 2009 Kamil Dudka 7.19.7-8 -- replace hard wired port numbers in the test suite - -* Wed Dec 09 2009 Kamil Dudka 7.19.7-7 -- use different port numbers for 32bit and 64bit builds -- temporary workaround for #545779 - -* Tue Dec 08 2009 Kamil Dudka 7.19.7-6 -- make it possible to run test241 -- re-enable SCP/SFTP tests (#539444) - -* Sat Dec 05 2009 Kamil Dudka 7.19.7-5 -- avoid use of uninitialized value in lib/nss.c -- suppress failure of test513 on s390 - -* Tue Dec 01 2009 Kamil Dudka 7.19.7-4 -- do not require valgrind on s390 and s390x -- temporarily disabled SCP/SFTP test-suite (#539444) - -* Thu Nov 12 2009 Kamil Dudka 7.19.7-3 -- fix crash on doubly closed NSPR descriptor, patch contributed - by Kevin Baughman (#534176) -- new version of patch for broken TLS servers (#525496, #527771) - -* Wed Nov 04 2009 Kamil Dudka 7.19.7-2 -- increased release number (CVS problem) - -* Wed Nov 04 2009 Kamil Dudka 7.19.7-1 -- new upstream release, dropped applied patches -- workaround for broken TLS servers (#525496, #527771) - -* Wed Oct 14 2009 Kamil Dudka 7.19.6-13 -- fix timeout issues and gcc warnings within lib/nss.c - -* Tue Oct 06 2009 Kamil Dudka 7.19.6-12 -- upstream patch for NSS support written by Guenter Knauf - -* Wed Sep 30 2009 Kamil Dudka 7.19.6-11 -- build libcurl with c-ares support (#514771) - -* Sun Sep 27 2009 Kamil Dudka 7.19.6-10 -- require libssh2>=1.2 properly (#525002) - -* Sat Sep 26 2009 Kamil Dudka 7.19.6-9 -- let curl test-suite use valgrind -- require libssh2>=1.2 (#525002) - -* Mon Sep 21 2009 Chris Weyl - 7.19.6-8 -- rebuild for libssh2 1.2 - -* Thu Sep 17 2009 Kamil Dudka 7.19.6-7 -- make curl test-suite more verbose - -* Wed Sep 16 2009 Kamil Dudka 7.19.6-6 -- update polling patch to the latest upstream version - -* Thu Sep 03 2009 Kamil Dudka 7.19.6-5 -- cover ssh and stunnel support by the test-suite - -* Wed Sep 02 2009 Kamil Dudka 7.19.6-4 -- use pkg-config to find nss and libssh2 if possible -- better patch (not only) for SCP/SFTP polling -- improve error message for not matching common name (#516056) - -* Fri Aug 21 2009 Kamil Dudka 7.19.6-3 -- avoid tight loop during a sftp upload -- http://permalink.gmane.org/gmane.comp.web.curl.library/24744 - -* Tue Aug 18 2009 Kamil Dudka 7.19.6-2 -- let curl package depend on the same version of libcurl - -* Fri Aug 14 2009 Kamil Dudka 7.19.6-1 -- new upstream release, dropped applied patches -- changed NSS code to not ignore the value of ssl.verifyhost and produce more - verbose error messages (#516056) - -* Wed Aug 12 2009 Ville Skyttä - 7.19.5-10 -- Use lzma compressed upstream tarball. - -* Fri Jul 24 2009 Fedora Release Engineering - 7.19.5-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Jul 22 2009 Kamil Dudka 7.19.5-8 -- do not pre-login to all PKCS11 slots, it causes problems with HW tokens -- try to select client certificate automatically when not specified, thanks - to Claes Jakobsson - -* Fri Jul 10 2009 Kamil Dudka 7.19.5-7 -- fix SIGSEGV when using NSS client certificates, thanks to Claes Jakobsson - -* Sun Jul 05 2009 Kamil Dudka 7.19.5-6 -- force test suite to use the just built libcurl, thanks to Paul Howarth - -* Thu Jul 02 2009 Kamil Dudka 7.19.5-5 -- run test suite after build -- enable built-in manual - -* Wed Jun 24 2009 Kamil Dudka 7.19.5-4 -- fix bug introduced by the last build (#504857) - -* Wed Jun 24 2009 Kamil Dudka 7.19.5-3 -- exclude curlbuild.h content from spec (#504857) - -* Wed Jun 10 2009 Kamil Dudka 7.19.5-2 -- avoid unguarded comparison in the spec file, thanks to R P Herrold (#504857) - -* Tue May 19 2009 Kamil Dudka 7.19.5-1 -- update to 7.19.5, dropped applied patches - -* Mon May 11 2009 Kamil Dudka 7.19.4-11 -- fix infinite loop while loading a private key, thanks to Michael Cronenworth - (#453612) - -* Mon Apr 27 2009 Kamil Dudka 7.19.4-10 -- fix curl/nss memory leaks while using client certificate (#453612, accepted - by upstream) - -* Wed Apr 22 2009 Kamil Dudka 7.19.4-9 -- add missing BuildRequire for autoconf - -* Wed Apr 22 2009 Kamil Dudka 7.19.4-8 -- fix configure.ac to not discard -g in CFLAGS (#496778) - -* Tue Apr 21 2009 Debarshi Ray 7.19.4-7 -- Fixed configure to respect the environment's CFLAGS and CPPFLAGS settings. - -* Tue Apr 14 2009 Kamil Dudka 7.19.4-6 -- upstream patch fixing memory leak in lib/nss.c (#453612) -- remove redundant dependency of libcurl-devel on libssh2-devel - -* Wed Mar 18 2009 Kamil Dudka 7.19.4-5 -- enable 6 additional crypto algorithms by default (#436781, - accepted by upstream) - -* Thu Mar 12 2009 Kamil Dudka 7.19.4-4 -- fix memory leak in src/main.c (accepted by upstream) -- avoid using %%ifarch - -* Wed Mar 11 2009 Kamil Dudka 7.19.4-3 -- make libcurl-devel multilib-ready (bug #488922) - -* Fri Mar 06 2009 Jindrich Novy 7.19.4-2 -- drop .easy-leak patch, causes problems in pycurl (#488791) -- fix libcurl-devel dependencies (#488895) - -* Tue Mar 03 2009 Jindrich Novy 7.19.4-1 -- update to 7.19.4 (fixes CVE-2009-0037) -- fix leak in curl_easy* functions, thanks to Kamil Dudka -- drop nss-fix patch, applied upstream - -* Tue Feb 24 2009 Fedora Release Engineering - 7.19.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Tue Feb 17 2009 Kamil Dudka 7.19.3-1 -- update to 7.19.3, dropped applied nss patches -- add patch fixing 7.19.3 curl/nss bugs - -* Mon Dec 15 2008 Jindrich Novy 7.18.2-9 -- rebuild for f10/rawhide cvs tag clashes - -* Sat Dec 06 2008 Jindrich Novy 7.18.2-8 -- use improved NSS patch, thanks to Rob Crittenden (#472489) - -* Tue Sep 09 2008 Jindrich Novy 7.18.2-7 -- update the thread safety patch, thanks to Rob Crittenden (#462217) - -* Wed Sep 03 2008 Warren Togami 7.18.2-6 -- add thread safety to libcurl NSS cleanup() functions (#459297) - -* Fri Aug 22 2008 Tom "spot" Callaway 7.18.2-5 -- undo mini libcurl.so.3 - -* Mon Aug 11 2008 Tom "spot" Callaway 7.18.2-4 -- make miniature library for libcurl.so.3 - -* Fri Jul 4 2008 Jindrich Novy 7.18.2-3 -- enable support for libssh2 (#453958) - -* Wed Jun 18 2008 Jindrich Novy 7.18.2-2 -- fix curl_multi_perform() over a proxy (#450140), thanks to - Rob Crittenden - -* Wed Jun 4 2008 Jindrich Novy 7.18.2-1 -- update to 7.18.2 - -* Wed May 7 2008 Jindrich Novy 7.18.1-2 -- spec cleanup, thanks to Paul Howarth (#225671) - - drop BR: libtool - - convert CHANGES and README to UTF-8 - - _GNU_SOURCE in CFLAGS is no more needed - - remove bogus rpath - -* Mon Mar 31 2008 Jindrich Novy 7.18.1-1 -- update to curl 7.18.1 (fixes #397911) -- add ABI docs for libcurl -- remove --static-libs from curl-config -- drop curl-config patch, obsoleted by @SSL_ENABLED@ autoconf - substitution (#432667) - -* Fri Feb 15 2008 Jindrich Novy 7.18.0-2 -- define _GNU_SOURCE so that NI_MAXHOST gets defined from glibc - -* Mon Jan 28 2008 Jindrich Novy 7.18.0-1 -- update to curl-7.18.0 -- drop sslgen patch -> applied upstream -- fix typo in description - -* Tue Jan 22 2008 Jindrich Novy 7.17.1-6 -- fix curl-devel obsoletes so that we don't break F8->F9 upgrade - path (#429612) - -* Tue Jan 8 2008 Jindrich Novy 7.17.1-5 -- do not attempt to close a bad socket (#427966), - thanks to Caolan McNamara - -* Tue Dec 4 2007 Jindrich Novy 7.17.1-4 -- rebuild because of the openldap soname bump -- remove old nsspem patch - -* Fri Nov 30 2007 Jindrich Novy 7.17.1-3 -- drop useless ldap library detection since curl doesn't - dlopen()s it but links to it -> BR: openldap-devel -- enable LDAPS support (#225671), thanks to Paul Howarth -- BR: krb5-devel to reenable GSSAPI support -- simplify build process -- update description - -* Wed Nov 21 2007 Jindrich Novy 7.17.1-2 -- update description to contain complete supported servers list (#393861) - -* Sat Nov 17 2007 Jindrich Novy 7.17.1-1 -- update to curl 7.17.1 -- include patch to enable SSL usage in NSS when a socket is opened - nonblocking, thanks to Rob Crittenden (rcritten@redhat.com) - -* Wed Oct 24 2007 Jindrich Novy 7.16.4-10 -- correctly provide/obsolete curl-devel (#130251) - -* Wed Oct 24 2007 Jindrich Novy 7.16.4-9 -- create libcurl and libcurl-devel subpackages (#130251) - -* Thu Oct 11 2007 Jindrich Novy 7.16.4-8 -- list features correctly when curl is compiled against NSS (#316191) - -* Mon Sep 17 2007 Jindrich Novy 7.16.4-7 -- add zlib-devel BR to enable gzip compressed transfers in curl (#292211) - -* Mon Sep 10 2007 Jindrich Novy 7.16.4-6 -- provide webclient (#225671) - -* Thu Sep 6 2007 Jindrich Novy 7.16.4-5 -- add support for the NSS PKCS#11 pem reader so the command-line is the - same for both OpenSSL and NSS by Rob Crittenden (rcritten@redhat.com) -- switch to NSS again - -* Mon Sep 3 2007 Jindrich Novy 7.16.4-4 -- revert back to use OpenSSL (#266021) - -* Mon Aug 27 2007 Jindrich Novy 7.16.4-3 -- don't use openssl, use nss instead - -* Fri Aug 10 2007 Jindrich Novy 7.16.4-2 -- fix anonymous ftp login (#251570), thanks to David Cantrell - -* Wed Jul 11 2007 Jindrich Novy 7.16.4-1 -- update to 7.16.4 - -* Mon Jun 25 2007 Jindrich Novy 7.16.3-1 -- update to 7.16.3 -- drop .print patch, applied upstream -- next series of merge review fixes by Paul Howarth -- remove aclocal stuff, no more needed -- simplify makefile arguments -- don't reference standard library paths in libcurl.pc -- include docs/CONTRIBUTE - -* Mon Jun 18 2007 Jindrich Novy 7.16.2-5 -- don't print like crazy (#236981), backported from upstream CVS - -* Fri Jun 15 2007 Jindrich Novy 7.16.2-4 -- another series of review fixes (#225671), - thanks to Paul Howarth -- check version of ldap library automatically -- don't use %%makeinstall and preserve timestamps -- drop useless patches - -* Fri May 11 2007 Jindrich Novy 7.16.2-3 -- add automake BR to curl-devel to fix aclocal dir. ownership, - thanks to Patrice Dumas - -* Thu May 10 2007 Jindrich Novy 7.16.2-2 -- package libcurl.m4 in curl-devel (#239664), thanks to Quy Tonthat - -* Wed Apr 11 2007 Jindrich Novy 7.16.2-1 -- update to 7.16.2 - -* Mon Feb 19 2007 Jindrich Novy 7.16.1-3 -- don't create/ship static libraries (#225671) - -* Mon Feb 5 2007 Jindrich Novy 7.16.1-2 -- merge review related spec fixes (#225671) - -* Mon Jan 29 2007 Jindrich Novy 7.16.1-1 -- update to 7.16.1 - -* Tue Jan 16 2007 Jindrich Novy 7.16.0-5 -- don't package generated makefiles for docs/examples to avoid - multilib conflicts - -* Mon Dec 18 2006 Jindrich Novy 7.16.0-4 -- convert spec to UTF-8 -- don't delete BuildRoot in %%prep phase -- rpmlint fixes - -* Thu Nov 16 2006 Jindrich Novy -7.16.0-3 -- prevent curl from dlopen()ing missing ldap libraries so that - ldap:// requests work (#215928) - -* Tue Oct 31 2006 Jindrich Novy - 7.16.0-2 -- fix BuildRoot -- add Requires: pkgconfig for curl-devel -- move LDFLAGS and LIBS to Libs.private in libcurl.pc.in (#213278) - -* Mon Oct 30 2006 Jindrich Novy - 7.16.0-1 -- update to curl-7.16.0 - -* Thu Aug 24 2006 Jindrich Novy - 7.15.5-1.fc6 -- update to curl-7.15.5 -- use %%{?dist} - -* Fri Jun 30 2006 Ivana Varekova - 7.15.4-1 -- update to 7.15.4 - -* Mon Mar 20 2006 Ivana Varekova - 7.15.3-1 -- fix multilib problem using pkg-config -- update to 7.15.3 - -* Thu Feb 23 2006 Ivana Varekova - 7.15.1-2 -- fix multilib problem - #181290 - - curl-devel.i386 not installable together with curl-devel.x86-64 - -* Fri Feb 10 2006 Jesse Keating - 7.15.1-1.2.1 -- bump again for double-long bug on ppc(64) - -* Tue Feb 07 2006 Jesse Keating - 7.15.1-1.2 -- rebuilt for new gcc4.1 snapshot and glibc changes - -* Fri Dec 09 2005 Jesse Keating -- rebuilt - -* Thu Dec 8 2005 Ivana Varekova 7.15.1-1 -- update to 7.15.1 (bug 175191) - -* Wed Nov 30 2005 Ivana Varekova 7.15.0-3 -- fix curl-config bug 174556 - missing vernum value - -* Wed Nov 9 2005 Ivana Varekova 7.15.0-2 -- rebuilt - -* Tue Oct 18 2005 Ivana Varekova 7.15.0-1 -- update to 7.15.0 - -* Thu Oct 13 2005 Ivana Varekova 7.14.1-1 -- update to 7.14.1 - -* Thu Jun 16 2005 Ivana Varekova 7.14.0-1 -- rebuild new version - -* Tue May 03 2005 Ivana Varekova 7.13.1-3 -- fix bug 150768 - curl-7.12.3-2 breaks basic authentication - used Daniel Stenberg patch - -* Mon Apr 25 2005 Joe Orton 7.13.1-2 -- update to use ca-bundle in /etc/pki -- mark License as MIT not MPL - -* Wed Mar 9 2005 Ivana Varekova 7.13.1-1 -- rebuilt (7.13.1) - -* Tue Mar 1 2005 Tomas Mraz 7.13.0-2 -- rebuild with openssl-0.9.7e - -* Sun Feb 13 2005 Florian La Roche -- 7.13.0 - -* Wed Feb 9 2005 Joe Orton 7.12.3-3 -- don't pass /usr to --with-libidn to remove "-L/usr/lib" from - 'curl-config --libs' output on x86_64. - -* Fri Jan 28 2005 Adrian Havill 7.12.3-1 -- Upgrade to 7.12.3, which uses poll() for FDSETSIZE limit (#134794) -- require libidn-devel for devel subpkg (#141341) -- remove proftpd kludge; included upstream - -* Wed Oct 06 2004 Adrian Havill 7.12.1-1 -- upgrade to 7.12.1 -- enable GSSAPI auth (#129353) -- enable I18N domain names (#134595) -- workaround for broken ProFTPD SSL auth (#134133). Thanks to - Aleksandar Milivojevic - -* Wed Sep 29 2004 Adrian Havill 7.12.0-4 -- move new docs position so defattr gets applied - -* Mon Sep 27 2004 Warren Togami 7.12.0-3 -- remove INSTALL, move libcurl docs to -devel - -* Mon Jul 26 2004 Jindrich Novy -- updated to 7.12.0 -- updated nousr patch - -* Tue Jun 15 2004 Elliot Lee -- rebuilt - -* Wed Apr 07 2004 Adrian Havill 7.11.1-1 -- upgraded; updated nousr patch -- added COPYING (#115956) -- - -* Tue Mar 02 2004 Elliot Lee -- rebuilt - -* Fri Feb 13 2004 Elliot Lee -- rebuilt - -* Sat Jan 31 2004 Florian La Roche -- update to 7.10.8 -- remove patch2, already upstream - -* Wed Oct 15 2003 Adrian Havill 7.10.6-7 -- aclocal before libtoolize -- move OpenLDAP license so it's present as a doc file, present in - both the source and binary as per conditions - -* Mon Oct 13 2003 Adrian Havill 7.10.6-6 -- add OpenLDAP copyright notice for usage of code, add OpenLDAP - license for this code - -* Tue Oct 07 2003 Adrian Havill 7.10.6-5 -- match serverAltName certs with SSL (#106168) - -* Tue Sep 16 2003 Adrian Havill 7.10.6-4.1 -- bump n-v-r for RHEL - -* Tue Sep 16 2003 Adrian Havill 7.10.6-4 -- restore ca cert bundle (#104400) -- require openssl, we want to use its ca-cert bundle - -* Sun Sep 7 2003 Joe Orton 7.10.6-3 -- rebuild - -* Fri Sep 5 2003 Joe Orton 7.10.6-2.2 -- fix to include libcurl.so - -* Mon Aug 25 2003 Adrian Havill 7.10.6-2.1 -- bump n-v-r for RHEL - -* Mon Aug 25 2003 Adrian Havill 7.10.6-2 -- devel subpkg needs openssl-devel as a Require (#102963) - -* Mon Jul 28 2003 Adrian Havill 7.10.6-1 -- bumped version - -* Tue Jul 01 2003 Adrian Havill 7.10.5-1 -- bumped version - -* Wed Jun 04 2003 Elliot Lee -- rebuilt - -* Sat Apr 12 2003 Florian La Roche -- update to 7.10.4 -- adapt nousr patch - -* Wed Jan 22 2003 Tim Powers -- rebuilt - -* Tue Jan 21 2003 Joe Orton 7.9.8-4 -- don't add -L/usr/lib to 'curl-config --libs' output - -* Tue Jan 7 2003 Nalin Dahyabhai 7.9.8-3 -- rebuild - -* Wed Nov 6 2002 Joe Orton 7.9.8-2 -- fix `curl-config --libs` output for libdir!=/usr/lib -- remove docs/LIBCURL from docs list; remove unpackaged libcurl.la -- libtoolize and reconf - -* Mon Jul 22 2002 Trond Eivind Glomsrød 7.9.8-1 -- 7.9.8 (# 69473) - -* Fri Jun 21 2002 Tim Powers -- automated rebuild - -* Sun May 26 2002 Tim Powers -- automated rebuild - -* Thu May 16 2002 Trond Eivind Glomsrød 7.9.7-1 -- 7.9.7 - -* Wed Apr 24 2002 Trond Eivind Glomsrød 7.9.6-1 -- 7.9.6 - -* Thu Mar 21 2002 Trond Eivind Glomsrød 7.9.5-2 -- Stop the curl-config script from printing -I/usr/include - and -L/usr/lib (#59497) - -* Fri Mar 8 2002 Trond Eivind Glomsrød 7.9.5-1 -- 7.9.5 - -* Tue Feb 26 2002 Trond Eivind Glomsrød 7.9.3-2 -- Rebuild - -* Wed Jan 23 2002 Nalin Dahyabhai 7.9.3-1 -- update to 7.9.3 - -* Wed Jan 09 2002 Tim Powers 7.9.2-2 -- automated rebuild - -* Wed Jan 9 2002 Trond Eivind Glomsrød 7.9.2-1 -- 7.9.2 - -* Fri Aug 17 2001 Nalin Dahyabhai -- include curl-config in curl-devel -- update to 7.8 to fix memory leak and strlcat() symbol pollution from libcurl - -* Wed Jul 18 2001 Crutcher Dunnavant -- added openssl-devel build req - -* Mon May 21 2001 Tim Powers -- built for the distro - -* Tue Apr 24 2001 Jeff Johnson -- upgrade to curl-7.7.2. -- enable IPv6. - -* Fri Mar 2 2001 Tim Powers -- rebuilt against openssl-0.9.6-1 - -* Thu Jan 4 2001 Tim Powers -- fixed mising ldconfigs -- updated to 7.5.2, bug fixes - -* Mon Dec 11 2000 Tim Powers -- updated to 7.5.1 - -* Mon Nov 6 2000 Tim Powers -- update to 7.4.1 to fix bug #20337, problems with curl -c -- not using patch anymore, it's included in the new source. Keeping - for reference - -* Fri Oct 20 2000 Nalin Dahyabhai -- fix bogus req in -devel package - -* Fri Oct 20 2000 Tim Powers -- devel package needed defattr so that root owns the files - -* Mon Oct 16 2000 Nalin Dahyabhai -- update to 7.3 -- apply vsprintf/vsnprintf patch from Colin Phipps via Debian - -* Mon Aug 21 2000 Nalin Dahyabhai -- enable SSL support -- fix packager tag -- move buildroot to %%{_tmppath} - -* Tue Aug 1 2000 Tim Powers -- fixed vendor tag for bug #15028 - -* Mon Jul 24 2000 Prospector -- rebuilt - -* Tue Jul 11 2000 Tim Powers -- workaround alpha build problems with optimizations - -* Mon Jul 10 2000 Tim Powers -- rebuilt - -* Mon Jun 5 2000 Tim Powers -- put man pages in correct place -- use %%makeinstall - -* Mon Apr 24 2000 Tim Powers -- updated to 6.5.2 - -* Wed Nov 3 1999 Tim Powers -- updated sources to 6.2 -- gzip man page - -* Mon Aug 30 1999 Tim Powers -- changed group - -* Thu Aug 26 1999 Tim Powers -- changelog started -- general cleanups, changed prefix to /usr, added manpage to files section -- including in Powertools diff --git a/CentOS-8/SPECS/libabw.spec b/CentOS-8/SPECS/libabw.spec deleted file mode 100644 index 3e2b8d5..0000000 --- a/CentOS-8/SPECS/libabw.spec +++ /dev/null @@ -1,176 +0,0 @@ -%global apiversion 0.1 - -Name: libabw -Version: 0.1.2 -Release: 2%{?dist} -Summary: A library for import of AbiWord files - -License: MPLv2.0 -URL: https://wiki.documentfoundation.org/DLP/Libraries/libabw -Source: http://dev-www.libreoffice.org/src/%{name}/%{name}-%{version}.tar.xz - -BuildRequires: boost-devel -BuildRequires: doxygen -BuildRequires: gperf -BuildRequires: help2man -BuildRequires: perl-interpreter -BuildRequires: pkgconfig(librevenge-0.0) -BuildRequires: pkgconfig(librevenge-generators-0.0) -BuildRequires: pkgconfig(librevenge-stream-0.0) -BuildRequires: pkgconfig(libxml-2.0) -BuildRequires: pkgconfig(zlib) - -%description -%{name} is a library for import of AbiWord files. - -%package devel -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}. - -%package doc -Summary: Documentation of %{name} API -BuildArch: noarch - -%description doc -The %{name}-doc package contains documentation files for %{name}. - -%package tools -Summary: Tools to transform AbiWord files into other formats -Requires: %{name}%{?_isa} = %{version}-%{release} - -%description tools -Tools to transform AbiWord files into other formats. Currently -supported: XHTML, raw, text. - -%prep -%autosetup -p1 - -%build -%configure --disable-silent-rules --disable-static --disable-werror -sed -i \ - -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \ - -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \ - libtool -make %{?_smp_mflags} - -%install -make install DESTDIR=%{buildroot} -rm -f %{buildroot}/%{_libdir}/*.la -# we install API docs directly from build -rm -rf %{buildroot}/%{_docdir}/%{name} - -# generate and install man pages - export LD_LIBRARY_PATH=%{buildroot}%{_libdir}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} - for tool in abw2html abw2raw abw2text; do - help2man -N -S '%{name} %{version}' -o ${tool}.1 %{buildroot}%{_bindir}/${tool} - done -install -m 0755 -d %{buildroot}/%{_mandir}/man1 -install -m 0644 abw2*.1 %{buildroot}/%{_mandir}/man1 - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - -%files -%doc CREDITS README -%license COPYING.MPL -%{_libdir}/%{name}-%{apiversion}.so.* - -%files devel -%doc ChangeLog -%{_includedir}/%{name}-%{apiversion} -%{_libdir}/%{name}-%{apiversion}.so -%{_libdir}/pkgconfig/%{name}-%{apiversion}.pc - -%files doc -%license COPYING.MPL -%doc docs/doxygen/html - -%files tools -%{_bindir}/abw2raw -%{_bindir}/abw2text -%{_bindir}/abw2html -%{_mandir}/man1/abw2raw.1* -%{_mandir}/man1/abw2text.1* -%{_mandir}/man1/abw2html.1* - -%changelog -* Wed Feb 07 2018 Fedora Release Engineering - 0.1.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Tue Jan 02 2018 David Tardon - 0.1.2-1 -- new upstream release - -* Thu Aug 03 2017 Fedora Release Engineering - 0.1.1-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 0.1.1-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Mon Jul 03 2017 Jonathan Wakely - 0.1.1-14 -- Rebuilt for Boost 1.64 - -* Fri Feb 10 2017 Fedora Release Engineering - 0.1.1-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Jan 27 2017 Jonathan Wakely - 0.1.1-12 -- Rebuilt for Boost 1.63 - -* Thu Feb 04 2016 Fedora Release Engineering - 0.1.1-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jan 15 2016 Jonathan Wakely - 0.1.1-10 -- Rebuilt for Boost 1.60 - -* Sun Aug 30 2015 Jonathan Wakely - 0.1.1-9 -- Rebuilt for Boost 1.59 - -* Sun Aug 30 2015 David Tardon - 0.1.1-8 -- Resolves: rhbz#1258125 fix build with boost 1.59 - -* Wed Jul 29 2015 Fedora Release Engineering - 0.1.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 - -* Wed Jul 22 2015 David Tardon - 0.1.1-6 -- rebuild for Boost 1.58 - -* Wed Jun 17 2015 Fedora Release Engineering - 0.1.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon May 04 2015 David Tardon - 0.1.1-4 -- fix two potential crashes - -* Sat May 02 2015 Kalev Lember - 0.1.1-3 -- Rebuilt for GCC 5 C++11 ABI change - -* Mon Jan 26 2015 Petr Machata - 0.1.1-2 -- Rebuild for boost 1.57.0 - -* Sat Dec 20 2014 David Tardon - 0.1.1-1 -- new upstream release - -* Sun Aug 17 2014 Fedora Release Engineering - 0.1.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 0.1.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Mon May 26 2014 David Tardon - 0.1.0-1 -- new upstream release - -* Thu May 22 2014 Petr Machata - 0.0.2-2 -- Rebuild for boost 1.55.0 - -* Mon Feb 10 2014 David Tardon - 0.0.2-1 -- new upstream release 0.0.2 -- generate man pages for the tools - -* Wed Jan 15 2014 David Tardon - 0.0.1-1 -- new upstream release - -* Mon Jan 13 2014 David Tardon - 0.0.0-1 -- initial import diff --git a/CentOS-8/SPECS/libcdr.spec b/CentOS-8/SPECS/libcdr.spec deleted file mode 100644 index ac45391..0000000 --- a/CentOS-8/SPECS/libcdr.spec +++ /dev/null @@ -1,268 +0,0 @@ -%global apiversion 0.1 - -Name: libcdr -Version: 0.1.4 -Release: 4%{?dist} -Summary: A library for import of CorelDRAW drawings - -# the only Public Domain source is src/lib/CDRColorProfiles.h -License: MPLv2.0 and Public Domain -URL: http://wiki.documentfoundation.org/DLP/Libraries/libcdr -Source: http://dev-www.libreoffice.org/src/%{name}/%{name}-%{version}.tar.xz - -BuildRequires: boost-devel -BuildRequires: doxygen -BuildRequires: help2man -BuildRequires: pkgconfig(cppunit) -BuildRequires: pkgconfig(icu-i18n) -BuildRequires: pkgconfig(lcms2) -BuildRequires: pkgconfig(librevenge-0.0) -BuildRequires: pkgconfig(zlib) - -%description -Libcdr is library providing ability to interpret and import CorelDRAW -drawings into various applications. You can find it being used in -libreoffice. - -%package devel -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}. - -%package doc -Summary: Documentation of %{name} API -BuildArch: noarch - -%description doc -The %{name}-doc package contains documentation files for %{name}. - -%package tools -Summary: Tools to transform CorelDRAW drawings into other formats -Requires: %{name}%{?_isa} = %{version}-%{release} - -%description tools -Tools to transform CorelDRAW drawings into other formats. -Currently supported: XHTML, text, raw. - -%prep -%setup -q - -%build -%configure --disable-silent-rules --disable-static --disable-werror -sed -i \ - -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \ - -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \ - libtool -make %{?_smp_mflags} - -%install -make install DESTDIR=%{buildroot} -rm -f %{buildroot}/%{_libdir}/*.la -# rhbz#1001251 we install API docs directly from build -rm -rf %{buildroot}/%{_docdir}/%{name} - -# generate and install man pages -export LD_LIBRARY_PATH=%{buildroot}%{_libdir}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} -for tool in cdr2raw cmx2raw cdr2xhtml cmx2xhtml cdr2text cmx2text; do - help2man -N -S '%{name} %{version}' -o ${tool}.1 %{buildroot}%{_bindir}/${tool} -done -mkdir -p %{buildroot}/%{_mandir}/man1 -install -m 0644 cdr2*.1 cmx2*.1 %{buildroot}/%{_mandir}/man1 - -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig - -%check -export LD_LIBRARY_PATH=%{buildroot}%{_libdir}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} -make %{?_smp_mflags} check - -%files -%doc AUTHORS ChangeLog README -%license COPYING.MPL -%{_libdir}/%{name}-%{apiversion}.so.* - -%files devel -%doc ChangeLog -%{_includedir}/%{name}-%{apiversion} -%{_libdir}/%{name}-%{apiversion}.so -%{_libdir}/pkgconfig/%{name}-%{apiversion}.pc - -%files doc -%license COPYING.MPL -%doc docs/doxygen/html - -%files tools -%{_bindir}/cdr2raw -%{_bindir}/cdr2text -%{_bindir}/cdr2xhtml -%{_bindir}/cmx2raw -%{_bindir}/cmx2text -%{_bindir}/cmx2xhtml -%{_mandir}/man1/cdr2raw.1* -%{_mandir}/man1/cdr2text.1* -%{_mandir}/man1/cdr2xhtml.1* -%{_mandir}/man1/cmx2raw.1* -%{_mandir}/man1/cmx2text.1* -%{_mandir}/man1/cmx2xhtml.1* - -%changelog -* Wed Feb 07 2018 Fedora Release Engineering - 0.1.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Tue Jan 23 2018 Jonathan Wakely - 0.1.4-3 -- Rebuilt for Boost 1.66 - -* Thu Nov 30 2017 Pete Walter - 0.1.4-2 -- Rebuild for ICU 60.1 - -* Fri Sep 15 2017 David Tardon - 0.1.4-1 -- new upstream release - -* Thu Aug 03 2017 Fedora Release Engineering - 0.1.3-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 0.1.3-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Mon Jul 03 2017 Jonathan Wakely - 0.1.3-5 -- Rebuilt for Boost 1.64 - -* Mon May 15 2017 Fedora Release Engineering - 0.1.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 0.1.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Jan 27 2017 Jonathan Wakely - 0.1.3-2 -- Rebuilt for Boost 1.63 - -* Thu Jul 21 2016 David Tardon - 0.1.3-1 -- new upstream release - -* Fri Apr 15 2016 David Tardon - 0.1.2-4 -- rebuild for ICU 57.1 - -* Thu Feb 04 2016 Fedora Release Engineering - 0.1.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jan 15 2016 Jonathan Wakely - 0.1.2-2 -- Rebuilt for Boost 1.60 - -* Sun Dec 27 2015 David Tardon - 0.1.2-1 -- new upstream release - -* Wed Oct 28 2015 David Tardon - 0.1.1-9 -- rebuild for ICU 56.1 - -* Sun Aug 30 2015 Jonathan Wakely - 0.1.1-8 -- Rebuilt for Boost 1.59 - -* Sun Aug 30 2015 David Tardon - 0.1.1-7 -- Resolves: rhbz#1258127 fix build with boost 1.59 - -* Wed Jul 29 2015 Fedora Release Engineering - 0.1.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 - -* Wed Jul 22 2015 David Tardon - 0.1.1-5 -- rebuild for Boost 1.58 - -* Wed Jun 17 2015 Fedora Release Engineering - 0.1.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat May 02 2015 Kalev Lember - 0.1.1-3 -- Rebuilt for GCC 5 C++11 ABI change - -* Mon Jan 26 2015 Petr Machata - 0.1.1-2 -- Rebuild for boost 1.57.0 - -* Tue Nov 25 2014 David Tardon - 0.1.1-1 -- new upstream release - -* Tue Aug 26 2014 David Tardon - 0.1.0-4 -- rebuild for ICU 53.1 - -* Sun Aug 17 2014 Fedora Release Engineering - 0.1.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 0.1.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Mon May 26 2014 David Tardon - 0.1.0-1 -- new upstream release - -* Fri May 23 2014 Petr Machata - 0.0.16-2 -- Rebuild for boost 1.55.0 - -* Thu Apr 10 2014 David Tardon - 0.0.16-1 -- new upstream release - -* Wed Apr 09 2014 David Tardon - 0.0.15-2 -- generate man pages - -* Sat Apr 05 2014 David Tardon - 0.0.15-1 -- new upstream release - -* Thu Feb 13 2014 David Tardon - 0.0.14-6 -- rebuild for new ICU - -* Fri Aug 30 2013 David Tardon - 0.0.14-5 -- Resolves: rhbz#1001251 duplicate documentation files / potentially conflicting - -* Sat Aug 03 2013 Fedora Release Engineering - 0.0.14-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Tue Jul 30 2013 Petr Machata - 0.0.14-3 -- Rebuild for boost 1.54.0 - -* Tue May 21 2013 David Tardon - 0.0.14-2 -- add public domain to licenses - -* Fri May 17 2013 David Tardon - 0.0.14-1 -- new release - -* Tue Apr 23 2013 David Tardon - 0.0.13-1 -- new relese - -* Mon Apr 08 2013 David Tardon - 0.0.12-1 -- new release - -* Sat Mar 02 2013 David Tardon - 0.0.11-1 -- new release - -* Thu Jan 31 2013 David Tardon - 0.0.10-2 -- rebuild for ICU change - -* Mon Jan 28 2013 David Tardon - 0.0.10-1 -- new release - -* Tue Jan 08 2013 David Tardon - 0.0.9-2 -- Resolves: rhbz#891082 libreoffice Impress constantly crashes - -* Mon Oct 08 2012 David Tardon - 0.0.9-1 -- new upstream release - -* Thu Jul 19 2012 Fedora Release Engineering - 0.0.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Mon Jun 11 2012 David Tardon 0.0.8-1 -- new upstream release -- adds basic initial primitive uncomplete text support - -* Thu Apr 26 2012 David Tardon 0.0.7-1 -- new upstream release - -* Tue Apr 03 2012 David Tardon 0.0.6-1 -- new upstream release - -* Mon Mar 19 2012 David Tardon 0.0.5-1 -- new upstream release -- fix license - -* Sat Mar 10 2012 David Tardon 0.0.3-2 -- remove Requires: of main package from -doc subpackage - -* Thu Mar 01 2012 David Tardon 0.0.3-1 -- initial import diff --git a/CentOS-8/SPECS/libcmis.spec b/CentOS-8/SPECS/libcmis.spec deleted file mode 100644 index c33e0d1..0000000 --- a/CentOS-8/SPECS/libcmis.spec +++ /dev/null @@ -1,250 +0,0 @@ -%global apiversion 0.5 - -Name: libcmis -Version: 0.5.2 -Release: 1%{?dist} -Summary: A C/C++ client library for CM interfaces - -License: GPLv2+ or LGPLv2+ or MPLv1.1 -URL: https://github.com/tdf/libcmis -Source: https://github.com/tdf/libcmis/releases/download/v%{version}/%{name}-%{version}.tar.xz - -BuildRequires: boost-devel -BuildRequires: gcc-c++ -BuildRequires: pkgconfig(cppunit) -BuildRequires: pkgconfig(libcurl) -BuildRequires: pkgconfig(libxml-2.0) -BuildRequires: xmlto - -%description -LibCMIS is a C/C++ client library for working with CM (content management) -interfaces. The primary supported interface (which gave the library its -name) is CMIS, which allows applications to connect to any ECM behaving -as a CMIS server (Alfresco or Nuxeo are examples of open source ones). -Another supported interface is Google Drive. - -%package devel -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}. - -%package tools -Summary: Command line tool to access CMIS -Requires: %{name}%{?_isa} = %{version}-%{release} - -%description tools -The %{name}-tools package contains a tool for accessing CMIS from the -command line. - -%prep -%autosetup -p1 - -%build -%configure --disable-silent-rules --disable-static --disable-werror \ - DOCBOOK2MAN='xmlto man' -sed -i \ - -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \ - -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \ - libtool -make %{?_smp_mflags} - -%install -make install DESTDIR=%{buildroot} -rm -f %{buildroot}/%{_libdir}/*.la - -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig - -%check -export LD_LIBRARY_PATH=%{buildroot}/%{_libdir}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} -make %{?_smp_mflags} check - -%files -%doc AUTHORS NEWS -%license COPYING.* -%{_libdir}/%{name}-%{apiversion}.so.* -%{_libdir}/%{name}-c-%{apiversion}.so.* - -%files devel -%doc ChangeLog -%{_includedir}/%{name}-%{apiversion} -%{_includedir}/%{name}-c-%{apiversion} -%{_libdir}/%{name}-%{apiversion}.so -%{_libdir}/%{name}-c-%{apiversion}.so -%{_libdir}/pkgconfig/%{name}-%{apiversion}.pc -%{_libdir}/pkgconfig/%{name}-c-%{apiversion}.pc - -%files tools -%{_bindir}/cmis-client -%{_mandir}/man1/cmis-client.1* - -%changelog -* Fri Mar 13 2020 Caolán McNamara - 0.5.2-1 -- Related: rhbz#1796893 update to 0.5.2 - -* Wed Nov 07 2018 Stephan Bergmann - 0.5.1-13 -- Resolves: rhbz#1647470 fix Google Drive login - -* Thu Aug 02 2018 Caolán McNamara - 0.5.1-12 -- Related: rhbz#1611082 rebuild i686 - -* Wed Feb 07 2018 Fedora Release Engineering - 0.5.1-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Tue Jan 23 2018 Jonathan Wakely - 0.5.1-10 -- Rebuilt for Boost 1.66 - -* Thu Aug 03 2017 Fedora Release Engineering - 0.5.1-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 0.5.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Mon Jul 03 2017 Jonathan Wakely - 0.5.1-7 -- Rebuilt for Boost 1.64 - -* Mon May 15 2017 Fedora Release Engineering - 0.5.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild - -* Mon Feb 27 2017 David Tardon - 0.5.1-5 -- Resolves: rhbz#1410197 work around infinite redirection loop - -* Fri Feb 10 2017 Fedora Release Engineering - 0.5.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Jan 27 2017 Jonathan Wakely - 0.5.1-3 -- Rebuilt for Boost 1.63 - -* Wed May 04 2016 David Tardon - 0.5.1-2 -- fix Google Drive login - -* Fri Mar 04 2016 David Tardon - 0.5.1-1 -- new upstream release - -* Wed Mar 02 2016 David Tardon - 0.5.0-12 -- add a bunch of fixes for problems found by coverity - -* Thu Feb 04 2016 Fedora Release Engineering - 0.5.0-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jan 15 2016 Jonathan Wakely - 0.5.0-10 -- Rebuilt for Boost 1.60 - -* Wed Sep 02 2015 Jonathan Wakely 0.5.0-9 -- Patched and rebuilt for Boost 1.59 - -* Wed Jul 29 2015 Fedora Release Engineering - 0.5.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 - -* Fri Jul 24 2015 Adam Williamson - 0.5.0-7 -- rebuild for Boost 1.58 (for f23, for real this time) - -* Wed Jul 22 2015 David Tardon - 0.5.0-6 -- rebuild for Boost 1.58 - -* Wed Jun 17 2015 Fedora Release Engineering - 0.5.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sun Apr 12 2015 David Tardon - 0.5.0-4 -- rebuild for yet another C++ ABI break - -* Fri Feb 20 2015 David Tardon - 0.5.0-3 -- rebuild for C++ stdlib ABI change in gcc5 - -* Tue Jan 27 2015 Petr Machata - 0.5.0-2 -- Rebuild for boost 1.57.0 - -* Sun Dec 21 2014 David Tardon - 0.5.0-1 -- new upstream release - -* Fri Sep 05 2014 David Tardon - 0.4.1-8 -- coverity: fix mismatching exceptions - -* Thu Sep 04 2014 David Tardon - 0.4.1-7 -- a few use-after-free fixes for the C wrapper - -* Sun Aug 17 2014 Fedora Release Engineering - 0.4.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 0.4.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri May 23 2014 Petr Machata - 0.4.1-4 -- Rebuild for boost 1.55.0 - -* Fri Feb 28 2014 David Tardon - 0.4.1-3 -- Resolves: rhbz#1070691 test failing on big endians - -* Thu Nov 21 2013 David Tardon - 0.4.1-2 -- disable tests on arm - -* Wed Nov 06 2013 David Tardon - 0.4.1-1 -- new upstream release - -* Fri Aug 30 2013 David Tardon - 0.3.1-8 -- Resolves: rhbz#1000819 pkgconfig file for libcmis-c is broken - -* Sat Aug 03 2013 Fedora Release Engineering - 0.3.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Sat Jul 27 2013 pmachata@redhat.com - 0.3.1-6 -- Rebuild for boost 1.54.0 - -* Wed Apr 24 2013 David Tardon - 0.3.1-5 -- Resolves: rhbz#918079 libcmis::sha1() can return digests with fewer - than 40 hexadecimal digits -- Resolves: rhbz#918080 restrict redirection protocols - -* Mon Apr 08 2013 David Tardon - 0.3.1-4 -- Resolves: rhbz#918044 memory leaks on exception path in C wrapper - -* Sun Feb 10 2013 Denis Arnaud - 0.3.1-3 -- Rebuild for Boost-1.53.0 - -* Sat Feb 09 2013 Denis Arnaud - 0.3.1-2 -- Rebuild for Boost-1.53.0 - -* Mon Feb 04 2013 David Tardon - 0.3.1-1 -- new release - -* Wed Dec 19 2012 David Tardon - 0.3.0-6 -- use xmlto for generating man page - -* Sat Dec 08 2012 David Tardon - 0.3.0-5 -- another pointless bump - -* Fri Dec 07 2012 David Tardon - 0.3.0-4 -- another pointless rebuild - -* Fri Dec 07 2012 David Tardon - 0.3.0-3 -- pointless rebuild - -* Fri Dec 07 2012 David Tardon - 0.3.0-2 -- force rebuild - -* Thu Dec 06 2012 David Tardon - 0.3.0-1 -- new upstream release - -* Tue Nov 06 2012 Caolán McNamara - 0.2.3-4 -- clarify license - -* Fri Jul 27 2012 David Tardon - 0.2.3-3 -- rebuilt for boost 1.50 - -* Thu Jul 19 2012 Fedora Release Engineering - 0.2.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Thu Jun 28 2012 David Tardon - 0.2.3-1 -- new upstream version - -* Wed Jun 20 2012 David Tardon - 0.2.2-1 -- latest upstream version - -* Tue Feb 28 2012 Fedora Release Engineering - 0.1.0-2 -- Rebuilt for c++ ABI breakage - -* Wed Dec 21 2011 David Tardon 0.1.0-1 -- initial import diff --git a/CentOS-8/SPECS/libe-book.spec b/CentOS-8/SPECS/libe-book.spec deleted file mode 100644 index 44e1624..0000000 --- a/CentOS-8/SPECS/libe-book.spec +++ /dev/null @@ -1,266 +0,0 @@ -%global apiversion 0.1 - -Name: libe-book -Version: 0.1.3 -Release: 19%{?dist} -Summary: A library for import of reflowable e-book formats - -License: MPLv2.0 -URL: https://sourceforge.net/projects/libebook/ -Source: http://downloads.sourceforge.net/libebook/%{name}-%{version}.tar.xz - -BuildRequires: boost-devel -BuildRequires: doxygen -BuildRequires: gcc-c++ -BuildRequires: gperf -BuildRequires: help2man -BuildRequires: make -BuildRequires: pkgconfig(cppunit) -BuildRequires: pkgconfig(icu-i18n) -BuildRequires: pkgconfig(liblangtag) -BuildRequires: pkgconfig(librevenge-0.0) -BuildRequires: pkgconfig(librevenge-generators-0.0) -BuildRequires: pkgconfig(librevenge-stream-0.0) -BuildRequires: pkgconfig(libxml-2.0) -BuildRequires: pkgconfig(zlib) - -Patch0: 0001-fix-build-with-ICU-68.patch - -%description -%{name} is a library for import of reflowable e-book formats. -Currently supported are PalmDoc, TealDoc, Plucker eBook, eReader eBook, -FictionBook v.2, TCR, zTXT and Broad Band eBook (LRF). - -%package devel -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}. - -%package doc -Summary: Documentation of %{name} API -BuildArch: noarch - -%description doc -The %{name}-doc package contains documentation files for %{name}. - -%package tools -Summary: Tools to transform e-books into other formats -Requires: %{name}%{?_isa} = %{version}-%{release} - -%description tools -Tools to transform e-books into other formats. -Currently supported: XHTML, raw, text. - -%prep -%autosetup -p1 - -%build -%configure --disable-silent-rules --disable-static -sed -i \ - -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \ - -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \ - libtool -%make_build - -%install -%make_install -rm -f %{buildroot}/%{_libdir}/*.la -# we install API docs directly from build -rm -rf %{buildroot}/%{_docdir}/%{name} - -# generate and install man pages -export LD_LIBRARY_PATH=%{buildroot}/%{_libdir}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} -for tool in ebook2html ebook2raw ebook2text; do - help2man -N -S '%{name} %{version}' -o ${tool}.1 %{buildroot}%{_bindir}/${tool} -done -install -m 0755 -d %{buildroot}/%{_mandir}/man1 -install -m 0644 ebook2*.1 %{buildroot}/%{_mandir}/man1 - -%ldconfig_scriptlets - -%check -export LD_LIBRARY_PATH=%{buildroot}/%{_libdir}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} -%make_build check - -%files -%doc AUTHORS NEWS README -%license COPYING -%{_libdir}/%{name}-%{apiversion}.so.* - -%files devel -%doc ChangeLog -%{_includedir}/%{name}-%{apiversion} -%{_libdir}/%{name}-%{apiversion}.so -%{_libdir}/pkgconfig/%{name}-%{apiversion}.pc - -%files doc -%license COPYING -%doc docs/doxygen/html - -%files tools -%{_bindir}/ebook2raw -%{_bindir}/ebook2text -%{_bindir}/ebook2html -%{_mandir}/man1/ebook2html.1* -%{_mandir}/man1/ebook2raw.1* -%{_mandir}/man1/ebook2text.1* - -%changelog -* Thu Jan 20 2022 Fedora Release Engineering - 0.1.3-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Jul 22 2021 Fedora Release Engineering - 0.1.3-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Thu May 20 2021 Pete Walter - 0.1.3-17 -- Rebuild for ICU 69 - -* Tue Jan 26 2021 Fedora Release Engineering - 0.1.3-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Jul 28 2020 Fedora Release Engineering - 0.1.3-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jul 14 2020 Tom Stellard - 0.1.3-14 -- Use make macros -- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro - -* Sat May 16 2020 Pete Walter - 0.1.3-13 -- Rebuild for ICU 67 - -* Wed Jan 29 2020 Fedora Release Engineering - 0.1.3-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Nov 01 2019 Pete Walter - 0.1.3-11 -- Rebuild for ICU 65 - -* Thu Jul 25 2019 Fedora Release Engineering - 0.1.3-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Feb 01 2019 Fedora Release Engineering - 0.1.3-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jan 25 2019 Jonathan Wakely - 0.1.3-8 -- Rebuilt for Boost 1.69 - -* Wed Jan 23 2019 Pete Walter - 0.1.3-7 -- Rebuild for ICU 63 - -* Fri Jul 13 2018 Fedora Release Engineering - 0.1.3-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Jul 10 2018 Pete Walter - 0.1.3-5 -- Rebuild for ICU 62 - -* Mon Apr 30 2018 Pete Walter - 0.1.3-4 -- Rebuild for ICU 61.1 - -* Wed Feb 07 2018 Fedora Release Engineering - 0.1.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Tue Jan 23 2018 Jonathan Wakely - 0.1.3-2 -- Rebuilt for Boost 1.66 - -* Tue Jan 02 2018 David Tardon - 0.1.3-1 -- new upstream release - -* Thu Nov 30 2017 Pete Walter - 0.1.2-19 -- Rebuild for ICU 60.1 - -* Thu Aug 03 2017 Fedora Release Engineering - 0.1.2-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 0.1.2-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Mon Jul 03 2017 Jonathan Wakely - 0.1.2-16 -- Rebuilt for Boost 1.64 - -* Fri Feb 10 2017 Fedora Release Engineering - 0.1.2-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Jan 27 2017 Jonathan Wakely - 0.1.2-14 -- Rebuilt for Boost 1.63 - -* Fri Jan 27 2017 Jonathan Wakely - 0.1.2-13 -- Rebuilt for Boost 1.63 - -* Fri Apr 15 2016 David Tardon - 0.1.2-12 -- rebuild for ICU 57.1 - -* Thu Feb 04 2016 Fedora Release Engineering - 0.1.2-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jan 15 2016 Jonathan Wakely - 0.1.2-10 -- Rebuilt for Boost 1.60 - -* Wed Oct 28 2015 David Tardon - 0.1.2-9 -- rebuild for ICU 56.1 - -* Sun Aug 30 2015 Jonathan Wakely 0.1.2-8 -- Rebuilt for Boost 1.59 - -* Sun Aug 30 2015 David Tardon - 0.1.2-7 -- fix build with boost 1.59 - -* Wed Jul 29 2015 Fedora Release Engineering - 0.1.2-6 -- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 - -* Wed Jul 22 2015 David Tardon - 0.1.2-5 -- rebuild for Boost 1.58 - -* Wed Jun 17 2015 Fedora Release Engineering - 0.1.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat May 02 2015 Kalev Lember - 0.1.2-3 -- Rebuilt for GCC 5 C++11 ABI change - -* Mon Jan 26 2015 Petr Machata - 0.1.2-2 -- Rebuild for boost 1.57.0 - -* Mon Jan 05 2015 David Tardon - 0.1.2-1 -- new upstream release - -* Tue Aug 26 2014 David Tardon - 0.1.1-4 -- rebuild for ICU 53.1 - -* Sun Aug 17 2014 Fedora Release Engineering - 0.1.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 0.1.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Tue Jun 03 2014 David Tardon - 0.1.1-1 -- new upstream release - -* Thu May 29 2014 David Tardon - 0.1.0-2 -- detect and parse zipped FictionBook 2 files again - -* Mon May 26 2014 David Tardon - 0.1.0-1 -- new upstream release 0.1.0 - -* Fri May 23 2014 Petr Machata - 0.0.3-4 -- Rebuild for boost 1.55.0 - -* Fri May 23 2014 David Tardon - 0.0.3-3 -- rebuild for boost 1.55.0 - -* Thu Feb 13 2014 David Tardon - 0.0.3-2 -- rebuild for new ICU - -* Mon Feb 10 2014 David Tardon - 0.0.3-1 -- new upstream release 0.0.3 -- generate man pages for the conversion tools - -* Sat Nov 16 2013 David Tardon - 0.0.2-1 -- new release - -* Mon Nov 11 2013 David Tardon - 0.0.1-2 -- install all public headers -- fix library name in .pc - -* Sun Nov 10 2013 David Tardon - 0.0.1-1 -- initial import diff --git a/CentOS-8/SPECS/libeot.spec b/CentOS-8/SPECS/libeot.spec deleted file mode 100644 index 6ec570f..0000000 --- a/CentOS-8/SPECS/libeot.spec +++ /dev/null @@ -1,90 +0,0 @@ -Name: libeot -Version: 0.01 -Release: 9%{?dist} -Summary: A library for parsing Embedded OpenType font files - -Group: System Environment/Libraries -License: MPLv2.0 -URL: https://github.com/umanwizard/libeot -Source: http://dev-www.libreoffice.org/src/%{name}-%{version}.tar.bz2 - -%description -%{name} is a library for parsing Embedded OpenType files (Microsoft -embedded font "standard") and converting them to other formats. - -%package devel -Summary: Development files for %{name} -Group: Development/Libraries -Requires: %{name}%{?_isa} = %{version}-%{release} - -%description devel -The %{name}-devel package contains libraries and header files for -developing applications that use %{name}. - -%package tools -Summary: Tools to transform EOT font files into other formats -Group: Applications/Publishing -Requires: %{name}%{?_isa} = %{version}-%{release} - -%description tools -Tools to transform EOT font files into other formats. Only TTF is -supported currently. - -%prep -%setup -q - -%build -%configure --disable-silent-rules --disable-static -sed -i \ - -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \ - -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \ - libtool -make %{?_smp_mflags} - -%install -make install DESTDIR=%{buildroot} INSTALL='install -p' -rm -f %{buildroot}/%{_libdir}/*.la - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - -%files -%doc LICENSE PATENTS -%{_libdir}/%{name}.so.* - -%files devel -%{_includedir}/%{name} -%{_libdir}/%{name}.so -%{_libdir}/pkgconfig/%{name}.pc - -%files tools -%{_bindir}/eot2ttf - -%changelog -* Wed Feb 07 2018 Fedora Release Engineering - 0.01-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 0.01-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 0.01-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 0.01-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu Feb 04 2016 Fedora Release Engineering - 0.01-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 0.01-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sun Aug 17 2014 Fedora Release Engineering - 0.01-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 0.01-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Wed Dec 04 2013 David Tardon - 0.01-1 -- initial import diff --git a/CentOS-8/SPECS/libexttextcat.spec b/CentOS-8/SPECS/libexttextcat.spec deleted file mode 100644 index 22dc898..0000000 --- a/CentOS-8/SPECS/libexttextcat.spec +++ /dev/null @@ -1,134 +0,0 @@ -Name: libexttextcat -Version: 3.4.5 -Release: 2%{?dist} -Summary: Text categorization library - -Group: System Environment/Libraries -License: BSD -URL: https://wiki.documentfoundation.org/Libexttextcat -Source: http://dev-www.libreoffice.org/src/libexttextcat/%{name}-%{version}.tar.xz - -Obsoletes: libtextcat < 3.2.0 -Provides: libtextcat = %{version} - -%description -%{name} is an N-Gram-Based Text Categorization library primarily -intended for language guessing. - -%package devel -Summary: Development files for %{name} -Group: Development/Libraries -Requires: %{name}%{?_isa} = %{version}-%{release} -Obsoletes: libtextcat-devel < 3.2.0 -Provides: libtextcat-devel = %{version} - -%description devel -The %{name}-devel package contains libraries and header files for -developing applications that use %{name}. - -%package tools -Summary: Tool for creating custom document fingerprints -Group: Applications/Publishing -Requires: %{name}%{?_isa} = %{version}-%{release} - -%description tools -The %{name}-tools package contains the createfp program that allows -you to easily create your own document fingerprints. - - -%prep -%setup -q - - -%build -%configure --disable-silent-rules --disable-static --disable-werror -make %{?_smp_mflags} - - -%install -make install DESTDIR=%{buildroot} -rm -f %{buildroot}/%{_libdir}/*.la - - -%check -make check - - -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig - - -%files -%doc ChangeLog LICENSE README* -%{_libdir}/%{name}*.so.* -%{_datadir}/%{name} - - -%files devel -%{_includedir}/%{name} -%{_libdir}/%{name}*.so -%{_libdir}/pkgconfig/%{name}.pc -%{_datadir}/vala/vapi/libexttextcat.vapi - - -%files tools -%{_bindir}/createfp - - -%changelog -* Wed Feb 07 2018 Fedora Release Engineering - 3.4.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Sep 20 2017 Caolán McNamara 3.4.5-1 -- latest version - -* Thu Aug 03 2017 Fedora Release Engineering - 3.4.4-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 3.4.4-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 3.4.4-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu Feb 04 2016 Fedora Release Engineering - 3.4.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 3.4.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sun Aug 17 2014 Fedora Release Engineering - 3.4.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Fri Jun 27 2014 Caolán McNamara 3.4.4-1 -- latest version - -* Sat Jun 07 2014 Fedora Release Engineering - 3.4.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sat Aug 03 2013 Fedora Release Engineering - 3.4.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri Jul 05 2013 Caolán McNamara 3.4.3-1 -- latest version - -* Thu May 30 2013 David Tardon - 3.4.1-1 -- new release - -* Thu Feb 14 2013 Fedora Release Engineering - 3.4.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Mon Nov 05 2012 Caolán McNamara 3.4.0-1 -- latest import - -* Thu Jul 19 2012 Fedora Release Engineering - 3.3.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Thu Jul 12 2012 David Tardon 3.3.1-1 -- latest import - -* Fri May 25 2012 Caolán McNamara 3.3.0-1 -- latest version - -* Tue Jan 24 2012 David Tardon 3.2.0-1 -- initial import diff --git a/CentOS-8/SPECS/libfreehand.spec b/CentOS-8/SPECS/libfreehand.spec deleted file mode 100644 index 6e8be05..0000000 --- a/CentOS-8/SPECS/libfreehand.spec +++ /dev/null @@ -1,157 +0,0 @@ -%global apiversion 0.1 - -Name: libfreehand -Version: 0.1.2 -Release: 2%{?dist} -Summary: A library for import of Macromedia/Adobe FreeHand documents - -License: MPLv2.0 -URL: http://wiki.documentfoundation.org/DLP/Libraries/libfreehand -Source: http://dev-www.libreoffice.org/src/%{name}/%{name}-%{version}.tar.xz - -BuildRequires: boost-devel -BuildRequires: doxygen -BuildRequires: gperf -BuildRequires: help2man -BuildRequires: perl-interpreter -BuildRequires: pkgconfig(cppunit) -BuildRequires: pkgconfig(icu-uc) -BuildRequires: pkgconfig(librevenge-0.0) -BuildRequires: pkgconfig(lcms2) -BuildRequires: pkgconfig(zlib) - -%description -libfreehand is library providing ability to interpret and import -Macromedia/Adobe FreeHand documents into various applications. - -%package devel -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}. - -%package doc -Summary: Documentation of %{name} API -BuildArch: noarch - -%description doc -The %{name}-doc package contains documentation files for %{name}. - -%package tools -Summary: Tools to transform Macromedia/Adobe FreeHand documents into other formats -Requires: %{name}%{?_isa} = %{version}-%{release} - -%description tools -Tools to transform Macromedia/Adobe FreeHand documents into other formats. -Currently supported: SVG, raw, text. - -%prep -%autosetup -p1 - -%build -%configure --disable-silent-rules --disable-static --disable-werror -sed -i \ - -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \ - -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \ - libtool -make %{?_smp_mflags} - - -%install -make install DESTDIR=%{buildroot} -rm -f %{buildroot}/%{_libdir}/*.la -# we install API docs directly from build -rm -rf %{buildroot}/%{_docdir}/%{name} - -# generate and install man pages -export LD_LIBRARY_PATH=%{buildroot}%{_libdir}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} -for tool in fh2raw fh2svg fh2text; do - help2man -N -S '%{name} %{version}' -o ${tool}.1 %{buildroot}%{_bindir}/${tool} -done -install -m 0755 -d %{buildroot}/%{_mandir}/man1 -install -m 0644 fh2*.1 %{buildroot}/%{_mandir}/man1 - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - -%check -export LD_LIBRARY_PATH=%{buildroot}%{_libdir}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} -make %{?_smp_mflags} check - -%files -%doc AUTHORS -%license COPYING -%{_libdir}/%{name}-%{apiversion}.so.* - -%files devel -%doc ChangeLog -%{_includedir}/%{name}-%{apiversion} -%{_libdir}/%{name}-%{apiversion}.so -%{_libdir}/pkgconfig/%{name}-%{apiversion}.pc - -%files doc -%license COPYING -%doc docs/doxygen/html - -%files tools -%{_bindir}/fh2raw -%{_bindir}/fh2svg -%{_bindir}/fh2text -%{_mandir}/man1/fh2raw.1* -%{_mandir}/man1/fh2svg.1* -%{_mandir}/man1/fh2text.1* - -%changelog -* Wed Feb 07 2018 Fedora Release Engineering - 0.1.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Sat Sep 16 2017 David Tardon - 0.1.2-1 -- new upstream release - -* Thu Aug 03 2017 Fedora Release Engineering - 0.1.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 0.1.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Mon May 15 2017 Fedora Release Engineering - 0.1.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 0.1.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu Feb 04 2016 Fedora Release Engineering - 0.1.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 0.1.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Thu Jun 11 2015 David Tardon - 0.1.1-1 -- new upstream release - -* Sat May 02 2015 Kalev Lember - 0.1.0-4 -- Rebuilt for GCC 5 C++11 ABI change - -* Sun Aug 17 2014 Fedora Release Engineering - 0.1.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 0.1.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Mon May 26 2014 David Tardon - 0.1.0-1 -- new upstream release - -* Wed Apr 09 2014 David Tardon - 0.0.0-4 -- generate man pages - -* Mon Nov 04 2013 David Tardon - 0.0.0-3 -- fix memory leak - -* Thu Oct 31 2013 David Tardon 0.0.0-2 -- add gperf to BuildRequires - -* Thu Oct 31 2013 David Tardon 0.0.0-1 -- initial import diff --git a/CentOS-8/SPECS/libixion.spec b/CentOS-8/SPECS/libixion.spec deleted file mode 100644 index f86eb97..0000000 --- a/CentOS-8/SPECS/libixion.spec +++ /dev/null @@ -1,278 +0,0 @@ -%global apiversion 0.16 - -Name: libixion -Version: 0.16.1 -Release: 4%{?dist} -Summary: A general purpose formula parser & interpreter library - -License: MPLv2.0 -URL: https://gitlab.com/ixion/ixion -Source0: https://kohei.us/files/ixion/src/%{name}-%{version}.tar.xz - -BuildRequires: boost-devel -BuildRequires: gcc-c++ -BuildRequires: help2man -BuildRequires: automake -BuildRequires: pkgconfig(mdds-1.5) -BuildRequires: pkgconfig(python3) -BuildRequires: pkgconfig(spdlog) -BuildRequires: make - -%description -Ixion is a general purpose formula parser & interpreter that can calculate -multiple named targets, or "cells". - -The goal of this project is to create a library for calculating the results of -formula expressions stored in multiple named targets, or “cells”. The cells can -be referenced from each other, and the library takes care of resolving their -dependencies automatically upon calculation. The caller can run the calculation -routine either in a single-threaded mode, or a multi-threaded mode. The library -also supports re-calculations where the contents of one or more cells have been -modified since the last calculation, and a partial calculation of only the -affected cells need to be calculated. - -Supported features: -- Each calculation session is defined in a plain text file, which is parsed and - interpreted by the Ixion parser. -- Fully threaded calculation. -- Name resolution using A1-style references. -- Support 2D cell references and named expressions. -- Support range references. -- Dependency tracking during both full calculation and partial re-calculation. -- Inline strings. -- Volatile functions. The framework for volatile functions is implemented. We - just need to implement more functions. - -%package devel -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}. - -%package tools -Summary: Testing tools for libixion -Requires: %{name}%{?_isa} = %{version}-%{release} - -%description tools -Testing tools for %{name}. - -%package python3 -Summary: Python 3 bindings for libixion -Requires: %{name}%{?_isa} = %{version}-%{release} -Obsoletes: %{name}-python < 0.9.1-1 -Suggests: %{name}-doc = %{version}-%{release} - -%description python3 -Python 3 bindings for %{name}. - -%package doc -Summary: API documentation for %{name} -BuildArch: noarch - -%description doc -API documentation for %{name}. - -%prep -%autosetup -p1 - -%build -autoreconf -%configure --disable-silent-rules --disable-static -sed -i \ - -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \ - -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \ - libtool -make %{?_smp_mflags} - -%install -make install DESTDIR=%{buildroot} -rm -f %{buildroot}%{_libdir}/*.la %{buildroot}%{python3_sitearch}/*.la - -# create and install man pages -export LD_LIBRARY_PATH=%{buildroot}%{_libdir}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} -help2man -S '%{name} %{version}' -N -n 'formula tokenizer' -o ixion-formula-tokenizer.1 ./src/ixion-formula-tokenizer -help2man -S '%{name} %{version}' -N -n 'parser' -o ixion-parser.1 ./src/ixion-parser -help2man -S '%{name} %{version}' -N -n 'sorter' -o ixion-sorter.1 ./src/ixion-sorter -install -m 0755 -d %{buildroot}/%{_mandir}/man1 -install -m 0644 ixion-*.1 %{buildroot}/%{_mandir}/man1 - -# generate docs -# make doc - -%ldconfig_scriptlets - -%check -export LD_LIBRARY_PATH=%{buildroot}%{_libdir}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} -make %{?_smp_mflags} check - -%files -%doc AUTHORS -%license LICENSE -%{_libdir}/%{name}-%{apiversion}.so.* - -%files devel -%{_includedir}/%{name}-%{apiversion} -%{_libdir}/%{name}-%{apiversion}.so -%{_libdir}/pkgconfig/%{name}-%{apiversion}.pc - -%files tools -%{_bindir}/ixion-formula-tokenizer -%{_bindir}/ixion-parser -%{_bindir}/ixion-sorter -%{_mandir}/man1/ixion-formula-tokenizer.1* -%{_mandir}/man1/ixion-parser.1* -%{_mandir}/man1/ixion-sorter.1* - -%files python3 -%{python3_sitearch}/ixion.so - -%files doc -%license LICENSE -%doc doc/python - -%changelog -* Tue Mar 30 2021 Jonathan Wakely - 0.16.1-4 -- Rebuilt for removed libstdc++ symbol (#1937698) - -* Tue Jan 26 2021 Fedora Release Engineering - 0.16.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Fri Jan 22 2021 Jonathan Wakely - 0.16.1-2 -- Rebuilt for Boost 1.75 - -* Tue Sep 29 2020 Caolán McNamara - 0.16.1-1 -- new upstream release - -* Thu Sep 24 2020 Caolán McNamara - 0.16.0-1 -- new upstream release - -* Tue Jul 28 2020 Fedora Release Engineering - 0.15.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Thu May 28 2020 Jonathan Wakely - 0.15.0-4 -- Rebuilt for Boost 1.73 - -* Tue May 26 2020 Miro Hrončok - 0.15.0-3 -- Rebuilt for Python 3.9 - -* Wed Jan 29 2020 Fedora Release Engineering - 0.15.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Tue Aug 20 2019 Caolán McNamara - 0.15.0-1 -- new upstream release - -* Mon Aug 19 2019 Miro Hrončok - 0.14.1-5 -- Rebuilt for Python 3.8 - -* Thu Jul 25 2019 Fedora Release Engineering - 0.14.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Feb 01 2019 Fedora Release Engineering - 0.14.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jan 25 2019 Jonathan Wakely - 0.14.1-2 -- Rebuilt for Boost 1.69 - -* Fri Oct 26 2018 David Tardon - 0.14.1-1 -- new upstream release - -* Sun Sep 02 2018 David Tardon - 0.14.0-1 -- new upstream release - -* Fri Jul 13 2018 Fedora Release Engineering - 0.13.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Mon Jul 02 2018 Miro Hrončok - 0.13.0-4 -- Rebuilt for Python 3.7 - -* Wed Feb 07 2018 Fedora Release Engineering - 0.13.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Tue Jan 23 2018 Jonathan Wakely - 0.13.0-2 -- Rebuilt for Boost 1.66 - -* Wed Oct 11 2017 David Tardon - 0.13.0-1 -- new upstream release - -* Thu Aug 03 2017 Fedora Release Engineering - 0.12.2-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 0.12.2-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Mon Jul 03 2017 Jonathan Wakely - 0.12.2-5 -- Rebuilt for Boost 1.64 - -* Fri Feb 10 2017 Fedora Release Engineering - 0.12.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Jan 27 2017 Jonathan Wakely - 0.12.2-3 -- Rebuilt for Boost 1.63 - -* Mon Dec 19 2016 Miro Hrončok - 0.12.2-2 -- Rebuild for Python 3.6 - -* Thu Dec 15 2016 David Tardon - 0.12.2-1 -- new upstream release - -* Mon Sep 26 2016 David Tardon - 0.12.1-1 -- new upstream release - -* Wed Jul 20 2016 David Tardon - 0.12.0-1 -- new upstream release - -* Tue Jul 19 2016 Fedora Release Engineering - 0.11.1-2 -- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages - -* Thu May 12 2016 David Tardon - 0.11.1-1 -- new upstream release - -* Fri Mar 11 2016 David Tardon - 0.11.0-2 -- build python documentation - -* Sun Feb 14 2016 David Tardon - 0.11.0-1 -- new upstream release - -* Thu Feb 04 2016 Fedora Release Engineering - 0.9.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jan 15 2016 Jonathan Wakely - 0.9.1-7 -- Rebuilt for Boost 1.60 - -* Thu Aug 27 2015 Jonathan Wakely - 0.9.1-6 -- Rebuilt for Boost 1.59 - -* Wed Jul 29 2015 Fedora Release Engineering - 0.9.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 - -* Wed Jul 22 2015 David Tardon - 0.9.1-4 -- rebuild for Boost 1.58 - -* Wed Jun 17 2015 Fedora Release Engineering - 0.9.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Apr 13 2015 David Tardon - 0.9.1-2 -- rebuild for yet another C++ ABI break - -* Sun Apr 05 2015 David Tardon - 0.9.1-1 -- new upstream release - -* Thu Mar 05 2015 David Tardon - 0.9.0-2 -- fix python bindings on i386 - -* Wed Feb 18 2015 David Tardon - 0.9.0-1 -- new upstream release - -* Tue Jan 27 2015 Petr Machata - 0.7.0-4 -- Rebuild for boost 1.57.0 - -* Sun Aug 17 2014 Fedora Release Engineering - 0.7.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 0.7.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Thu May 22 2014 David Tardon - 0.7.0-1 -- initial import diff --git a/CentOS-8/SPECS/libmspub.spec b/CentOS-8/SPECS/libmspub.spec deleted file mode 100644 index 3b81963..0000000 --- a/CentOS-8/SPECS/libmspub.spec +++ /dev/null @@ -1,227 +0,0 @@ -%global apiversion 0.1 - -Name: libmspub -Version: 0.1.4 -Release: 1%{?dist} -Summary: A library for import of Microsoft Publisher documents - -License: MPLv2.0 -URL: http://wiki.documentfoundation.org/DLP/Libraries/libmspub -Source: http://dev-www.libreoffice.org/src/%{name}/%{name}-%{version}.tar.xz - -BuildRequires: boost-devel -BuildRequires: doxygen -BuildRequires: gcc-c++ -BuildRequires: help2man -BuildRequires: pkgconfig(icu-i18n) -BuildRequires: pkgconfig(librevenge-0.0) -BuildRequires: pkgconfig(librevenge-generators-0.0) -BuildRequires: pkgconfig(librevenge-stream-0.0) -BuildRequires: pkgconfig(zlib) - -%description -Libmspub is library providing ability to interpret and import Microsoft -Publisher content into various applications. You can find it being used -in libreoffice. - -%package devel -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}. - -%package doc -Summary: Documentation of %{name} API -BuildArch: noarch - -%description doc -The %{name}-doc package contains documentation files for %{name}. - -%package tools -Summary: Tools to transform Microsoft Publisher documents into other formats -Requires: %{name}%{?_isa} = %{version}-%{release} - -%description tools -Tools to transform Microsoft Publisher documents into other formats. -Currently supported: XHTML, raw. - -%prep -%autosetup -p1 - -%build -%configure --disable-static --disable-silent-rules -sed -i \ - -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \ - -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \ - libtool -make %{?_smp_mflags} - -%install -make install DESTDIR=%{buildroot} -rm -f %{buildroot}/%{_libdir}/*.la -# rhbz#1001245 we install API docs directly from build -rm -rf %{buildroot}/%{_docdir}/%{name} - -# generate and install man pages - export LD_LIBRARY_PATH=%{buildroot}%{_libdir}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} - for tool in pub2raw pub2xhtml; do - help2man -N -S '%{name} %{version}' -o ${tool}.1 %{buildroot}%{_bindir}/${tool} - done -install -m 0755 -d %{buildroot}/%{_mandir}/man1 -install -m 0644 pub2*.1 %{buildroot}/%{_mandir}/man1 - -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig - -%files -%doc AUTHORS NEWS README -%license COPYING.MPL -%{_libdir}/%{name}-%{apiversion}.so.* - -%files devel -%doc ChangeLog -%{_includedir}/%{name}-%{apiversion} -%{_libdir}/%{name}-%{apiversion}.so -%{_libdir}/pkgconfig/%{name}-%{apiversion}.pc - -%files doc -%license COPYING.MPL -%doc docs/doxygen/html - -%files tools -%{_bindir}/pub2raw -%{_bindir}/pub2xhtml -%{_mandir}/man1/pub2raw.1* -%{_mandir}/man1/pub2xhtml.1* - -%changelog -* Wed Feb 28 2018 David Tardon - 0.1.4-1 -- new upstream release - -* Wed Feb 07 2018 Fedora Release Engineering - 0.1.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Tue Jan 23 2018 Jonathan Wakely - 0.1.3-2 -- Rebuilt for Boost 1.66 - -* Tue Jan 02 2018 David Tardon - 0.1.3-1 -- new upstream release - -* Thu Nov 30 2017 Pete Walter - 0.1.2-19 -- Rebuild for ICU 60.1 - -* Thu Aug 03 2017 Fedora Release Engineering - 0.1.2-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 0.1.2-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Mon Jul 03 2017 Jonathan Wakely - 0.1.2-16 -- Rebuilt for Boost 1.64 - -* Mon May 15 2017 Fedora Release Engineering - 0.1.2-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 0.1.2-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Jan 27 2017 Jonathan Wakely - 0.1.2-13 -- Rebuilt for Boost 1.63 - -* Fri Jan 27 2017 Jonathan Wakely - 0.1.2-12 -- Rebuilt for Boost 1.63 - -* Fri Apr 15 2016 David Tardon - 0.1.2-11 -- rebuild for ICU 57.1 - -* Thu Feb 04 2016 Fedora Release Engineering - 0.1.2-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jan 15 2016 Jonathan Wakely - 0.1.2-9 -- Rebuilt for Boost 1.60 - -* Wed Oct 28 2015 David Tardon - 0.1.2-8 -- rebuild for ICU 56.1 - -* Thu Aug 27 2015 Jonathan Wakely - 0.1.2-7 -- Rebuilt for Boost 1.59 - -* Wed Jul 29 2015 Fedora Release Engineering - 0.1.2-6 -- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 - -* Wed Jul 22 2015 David Tardon - 0.1.2-5 -- rebuild for Boost 1.58 - -* Wed Jun 17 2015 Fedora Release Engineering - 0.1.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat May 02 2015 Kalev Lember - 0.1.2-3 -- Rebuilt for GCC 5 C++11 ABI change - -* Tue Jan 27 2015 Petr Machata - 0.1.2-2 -- Rebuild for boost 1.57.0 - -* Tue Dec 30 2014 David Tardon - 0.1.2-1 -- new upstream release - -* Tue Aug 26 2014 David Tardon - 0.1.1-3 -- rebuild for ICU 53.1 - -* Sun Aug 17 2014 Fedora Release Engineering - 0.1.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Tue Jul 01 2014 David Tardon - 0.1.0-1 -- new upstream release - -* Sat Jun 07 2014 Fedora Release Engineering - 0.1.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Mon May 26 2014 David Tardon - 0.1.0-1 -- new upstream release - -* Fri May 23 2014 Petr Machata - 0.0.6-7 -- Rebuild for boost 1.55.0 - -* Wed Apr 09 2014 David Tardon - 0.0.6-6 -- generate man pages - -* Thu Feb 13 2014 David Tardon - 0.0.6-5 -- rebuild for new ICU - -* Fri Aug 30 2013 David Tardon - 0.0.6-4 -- Resolves: rhbz#1001245 duplicate documentation files / potentially conflicting - -* Sat Aug 03 2013 Fedora Release Engineering - 0.0.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Tue Jul 30 2013 Petr Machata - 0.0.6-2 -- Rebuild for boost 1.54.0 - -* Tue May 14 2013 David Tardon - 0.0.6-1 -- new release - -* Wed Feb 20 2013 David Tardon - 0.0.5-1 -- new release - -* Wed Jan 30 2013 David Tardon - 0.0.4-1 -- new release - -* Fri Aug 24 2012 David Tardon - 0.0.3-1 -- new release - -* Fri Jul 27 2012 David Tardon - 0.0.2-3 -- rebuilt for boost 1.50 - -* Thu Jul 19 2012 Fedora Release Engineering - 0.0.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Mon Jul 16 2012 David Tardon - 0.0.2-1 -- Resolves: rhbz#840445 new release - -* Thu Jul 12 2012 David Tardon 0.0.1-1 -- new release - -* Thu Jun 07 2012 David Tardon 0.0.0-1 -- initial import diff --git a/CentOS-8/SPECS/libmwaw.spec b/CentOS-8/SPECS/libmwaw.spec deleted file mode 100644 index af2e27b..0000000 --- a/CentOS-8/SPECS/libmwaw.spec +++ /dev/null @@ -1,242 +0,0 @@ -%global apiversion 0.3 - -Name: libmwaw -Version: 0.3.14 -Release: 1%{?dist} -Summary: A library for import of many old Mac document formats - -License: LGPLv2+ or MPLv2.0 -URL: http://sourceforge.net/projects/libmwaw/ -Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz - -BuildRequires: doxygen -BuildRequires: gcc-c++ -BuildRequires: help2man -BuildRequires: pkgconfig(librevenge-0.0) -BuildRequires: pkgconfig(librevenge-generators-0.0) -BuildRequires: pkgconfig(librevenge-stream-0.0) - -%description -%{name} is a library for import of old Mac documents. It supports many -kinds of text documents, spreadsheets, databases, vector and bitmap -images. Supported are, for example, documents created by BeagleWorks, -ClarisWorks, MacPaint, MacWrite or Microsoft Word for Mac. A full list -of supported formats is available at -https://sourceforge.net/p/libmwaw/wiki/Home/ . - -%package devel -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}. - -%package doc -Summary: Documentation of %{name} API -BuildArch: noarch - -%description doc -The %{name}-doc package contains documentation files for %{name}. - -%package tools -Summary: Tools to transform the supported formats into other formats -Requires: %{name}%{?_isa} = %{version}-%{release} - -%description tools -Tools to transform the supported document formats into other formats. -Supported output formats are CSV, HTML, SVG, plain text and raw. - -%prep -%autosetup -p1 - -%build -%configure --disable-static --disable-werror --disable-zip --enable-docs --with-sharedptr=c++11 -sed -i \ - -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \ - -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \ - libtool -make %{?_smp_mflags} V=1 - -export LD_LIBRARY_PATH=`pwd`/src/lib/.libs${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} -help2man -N -n 'convert Mac spreadsheet into CSV' -o mwaw2csv.1 ./src/conv/csv/.libs/mwaw2csv -help2man -N -n 'debug the conversion library' -o mwaw2raw.1 ./src/conv/raw/.libs/mwaw2raw -help2man -N -n 'convert Mac text document into HTML' -o mwaw2html.1 ./src/conv/html/.libs/mwaw2html -help2man -N -n 'convert Mac drawing into SVG' -o mwaw2svg.1 ./src/conv/svg/.libs/mwaw2svg -help2man -N -n 'convert Mac text document into plain text' -o mwaw2text.1 ./src/conv/text/.libs/mwaw2text - -%install -make install DESTDIR=%{buildroot} -rm -f %{buildroot}/%{_libdir}/*.la -# it seems this tool is only useful on MacOS -rm -f %{buildroot}/%{_bindir}/mwawFile -# rhbz#1001297 we install API docs directly from build -rm -rf %{buildroot}/%{_docdir}/%{name} - -install -m 0755 -d %{buildroot}/%{_mandir}/man1 -install -m 0644 mwaw2*.1 %{buildroot}/%{_mandir}/man1 - -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig - -%files -%doc CHANGES README -%license COPYING.* -%{_libdir}/%{name}-%{apiversion}.so.* - -%files devel -%doc HACKING -%{_includedir}/%{name}-%{apiversion} -%{_libdir}/%{name}-%{apiversion}.so -%{_libdir}/pkgconfig/%{name}-%{apiversion}.pc - -%files doc -%license COPYING.* -%doc docs/doxygen/html - -%files tools -%{_bindir}/mwaw2csv -%{_bindir}/mwaw2html -%{_bindir}/mwaw2raw -%{_bindir}/mwaw2svg -%{_bindir}/mwaw2text -%{_mandir}/man1/mwaw2csv.1* -%{_mandir}/man1/mwaw2html.1* -%{_mandir}/man1/mwaw2raw.1* -%{_mandir}/man1/mwaw2svg.1* -%{_mandir}/man1/mwaw2text.1* - -%changelog -* Tue Apr 24 2018 David Tardon - 0.3.14-1 -- new upstream release - -* Wed Feb 07 2018 Fedora Release Engineering - 0.3.13-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Tue Nov 14 2017 David Tardon - 0.3.13-1 -- new upstream release - -* Thu Aug 03 2017 Fedora Release Engineering - 0.3.12-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 0.3.12-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Jul 15 2017 David Tardon - 0.3.12-1 -- new upstream release - -* Thu Jun 15 2017 David Tardon - 0.3.11-3 -- Resolves: rhbz#1461763 CVE-2017-9433 Out-of-bounds write in the - MsWrd1Parser::readFootnoteCorrespondence function - -* Mon May 15 2017 Fedora Release Engineering - 0.3.11-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild - -* Fri Mar 31 2017 David Tardon - 0.3.11-1 -- new upstream release - -* Fri Feb 10 2017 Fedora Release Engineering - 0.3.10-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Mon Jan 30 2017 David Tardon - 0.3.10-1 -- new upstream release - -* Tue Nov 22 2016 David Tardon - 0.3.9-1 -- new upstream release - -* Thu Jun 16 2016 David Tardon - 0.3.8-1 -- new upstream release - -* Thu Feb 04 2016 Fedora Release Engineering - 0.3.7-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jan 15 2016 Jonathan Wakely - 0.3.7-2 -- Rebuilt for Boost 1.60 - -* Thu Nov 26 2015 David Tardon - 0.3.7-1 -- new upstream release - -* Thu Aug 27 2015 Jonathan Wakely - 0.3.6-2 -- Rebuilt for Boost 1.59 - -* Mon Aug 24 2015 David Tardon - 0.3.6-1 -- new upstream release - -* Wed Jul 29 2015 Fedora Release Engineering - 0.3.5-4 -- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 - -* Wed Jul 22 2015 David Tardon - 0.3.5-3 -- rebuild for Boost 1.58 - -* Wed Jun 17 2015 Fedora Release Engineering - 0.3.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat May 16 2015 David Tardon - 0.3.5-1 -- new upstream release - -* Sat May 02 2015 Kalev Lember - 0.3.4-4 -- Rebuilt for GCC 5 C++11 ABI change - -* Tue Jan 27 2015 Petr Machata - 0.3.4-3 -- Rebuild for boost 1.57.0 - -* Wed Jan 07 2015 David Tardon - 0.3.4-2 -- Resolves: fdo#88098 ClarisWorks: import empty starting lines/columns - -* Sun Jan 04 2015 David Tardon - 0.3.4-1 -- new upstream release - -* Tue Oct 14 2014 David Tardon - 0.3.3-1 -- new upstream release - -* Sun Aug 17 2014 Fedora Release Engineering - 0.3.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Wed Aug 13 2014 David Tardon - 0.3.2-1 -- new upstream release - -* Sat Jun 07 2014 Fedora Release Engineering - 0.3.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Mon May 26 2014 David Tardon - 0.3.1-1 -- new upstream release - -* Fri May 23 2014 David Tardon - 0.2.0-5 -- rebuild for boost 1.55.0 - -* Thu Apr 24 2014 David Tardon - 0.2.0-4 -- avoid out-of-bounds access -- ... and other fixes from upstream 0.2 branch - -* Wed Apr 09 2014 David Tardon - 0.2.0-3 -- generate man pages - -* Wed Jan 22 2014 David Tardon - 0.2.0-2 -- update licenses to current (simpler) state - -* Sat Nov 02 2013 David Tardon - 0.2.0-1 -- new release - -* Mon Sep 09 2013 David Tardon - 0.1.11-1 -- new upstream release - -* Fri Aug 30 2013 David Tardon - 0.1.10-3 -- Resolves: rhbz#1001297 duplicate documentation files / potentially conflicting - -* Sat Aug 03 2013 Fedora Release Engineering - 0.1.10-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu Jun 27 2013 David Tardon - 0.1.10-1 -- new release - -* Tue May 14 2013 David Tardon - 0.1.9-1 -- new release - -* Tue Apr 30 2013 David Tardon - 0.1.8-1 -- new upstream release - -* Sat Apr 27 2013 David Tardon - 0.1.7-2 -- minor fixes - -* Tue Mar 19 2013 David Tardon 0.1.7-1 -- initial import diff --git a/CentOS-8/SPECS/libnumbertext.spec b/CentOS-8/SPECS/libnumbertext.spec deleted file mode 100644 index 82433fe..0000000 --- a/CentOS-8/SPECS/libnumbertext.spec +++ /dev/null @@ -1,97 +0,0 @@ -Name: libnumbertext -Version: 1.0.6 -Release: 2%{?dist} -Summary: Number to number name and money text conversion library - -#The entire source code is dual license LGPLv3+ or BSD, except for -#the data files hr.sor, sr.sor and sh.sor which are tri license -#CC-BY-SA or LGPLv3+ or BSD -License: (LGPLv3+ or BSD) and (LGPLv3+ or BSD or CC-BY-SA) -URL: https://github.com/Numbertext/libnumbertext -Source: https://github.com/Numbertext/libnumbertext/releases/download/%{version}/libnumbertext-%{version}.tar.xz - -BuildRequires: autoconf, automake, libtool, gcc-c++ - -%description -Language-neutral NUMBERTEXT and MONEYTEXT functions for LibreOffice Calc - -%package devel -Requires: libnumbertext = %{version}-%{release} -Summary: Files for developing with libnumbertext - -%description devel -Includes and definitions for developing with libnumbertext - -%prep -%autosetup -p1 - -%build -autoreconf -v --install --force -%configure --disable-silent-rules --disable-static --disable-werror --with-pic -%make_build - -%check -make check - -%install -rm -rf $RPM_BUILD_ROOT -%make_install -rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la - -%ldconfig_scriptlets - -%files -%doc AUTHORS ChangeLog NEWS THANKS -%license COPYING -%{_bindir}/spellout -%{_libdir}/*.so.* -%{_datadir}/libnumbertext - -%files devel -%{_includedir}/libnumbertext -%{_libdir}/pkgconfig/libnumbertext.pc -%{_libdir}/*.so - -%changelog -* Fri Oct 16 2020 Tomas Pelka - 1.0.6-2 -- rebuild to properly trigger gating - -* Sat Aug 08 2020 Caolán McNamara - 1.0.6-1 -- latest version - -* Tue Jul 28 2020 Fedora Release Engineering - 1.0.5-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jul 14 2020 Tom Stellard - 1.0.5-5 -- Use make macros -- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro - -* Wed Jan 29 2020 Fedora Release Engineering - 1.0.5-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Jul 25 2019 Fedora Release Engineering - 1.0.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Feb 01 2019 Fedora Release Engineering - 1.0.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Tue Oct 16 2018 Caolán McNamara - 1.0.5-1 -- latest version - -* Thu Aug 16 2018 Caolán McNamara - 1.0.3-1 -- latest version - -* Fri Jul 13 2018 Fedora Release Engineering - 1.0.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Jun 12 2018 Caolán McNamara - 1.0.2-3 -- fix changelog order -- remove clean section -- set COPYING as license -- use LT_INIT - -* Mon Jun 11 2018 Caolán McNamara - 1.0.2-2 -- clarify extra license option of the sh/sr/hr data files - -* Mon Jun 11 2018 Caolán McNamara - 1.0.2-1 -- initial version diff --git a/CentOS-8/SPECS/liborcus.spec b/CentOS-8/SPECS/liborcus.spec deleted file mode 100644 index 0fb9b36..0000000 --- a/CentOS-8/SPECS/liborcus.spec +++ /dev/null @@ -1,441 +0,0 @@ -%global apiversion 0.17 - -%if 0%{?rhel} - -# build conversion tools -%bcond_with convtools -# build python3 bindings -%bcond_with python - -%else -# build conversion tools -%bcond_without convtools -# build python3 bindings -%bcond_without python - -%endif - -Name: liborcus -Version: 0.17.2 -Release: 1%{?dist} -Summary: Standalone file import filter library for spreadsheet documents - -License: MPLv2.0 -URL: https://gitlab.com/orcus/orcus -Source0: https://kohei.us/files/orcus/src/%{name}-%{version}.tar.xz -Patch0: liborcus-noexamples.patch - -BuildRequires: make -BuildRequires: boost-devel -BuildRequires: doxygen -BuildRequires: gcc-c++ -BuildRequires: automake -%if %{with convtools} -BuildRequires: help2man -BuildRequires: pkgconfig(libixion-0.17) -%endif -BuildRequires: pkgconfig(mdds-2.0) -%if %{with python} -BuildRequires: pkgconfig(python3) -%if 0%{?rhel} -BuildRequires: python3 -%endif -%endif -BuildRequires: pkgconfig(zlib) - -%description -%{name} is a standalone file import filter library for spreadsheet -documents. Currently under development are ODS, XLSX and CSV import -filters. - -%if %{with convtools} -%package model -Summary: Spreadsheet model for %{name} conversion tools -Requires: %{name}%{?_isa} = %{version}-%{release} - -%description model -The %{name}-model package contains a spreadsheet model used by the -conversion tools. -%endif - -%package devel -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}. - -%package tools -Summary: Tools for working with %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} - -%description tools -Helper tools for %{name} and converters of various file formats to HTML -and text. - -%if %{with python} -%package python3 -Summary: Python 3 bindings for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} - -%description python3 -Python 3 bindings for %{name}. -%endif - -%package doc -Summary: API documentation for %{name} -BuildArch: noarch - -%description doc -API documentation for %{name}. - -%prep -%autosetup -p1 - -%if %{without convtools} -%global condopts %{?condopts} --disable-spreadsheet-model -%endif -%if %{without python} -%global condopts %{?condopts} --disable-python -%endif - -%build -autoreconf -%configure --disable-debug --disable-silent-rules --disable-static \ - --disable-werror --with-pic %{?condopts} -sed -i \ - -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \ - -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \ - libtool -%make_build - -%install -%make_install -rm -f %{buildroot}%{_libdir}/*.la %{buildroot}%{python3_sitearch}/*.la - -%if %{with convtools} -# create and install man pages -export LD_LIBRARY_PATH=%{buildroot}%{_libdir}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} -help2man -N -S '%{name} %{version}' -n 'convert a CSV file' -o orcus-csv.1 %{buildroot}%{_bindir}/orcus-csv -help2man -N -S '%{name} %{version}' -n 'convert a Gnumeric file' -o orcus-gnumeric.1 %{buildroot}%{_bindir}/orcus-gnumeric -help2man -N -S '%{name} %{version}' -n 'convert an ODF spreadsheet' -o orcus-ods.1 %{buildroot}%{_bindir}/orcus-ods -help2man -N -S '%{name} %{version}' -n 'transform an XML file' -o orcus-xls-xml.1 %{buildroot}%{_bindir}/orcus-xls-xml -help2man -N -S '%{name} %{version}' -n 'convert a OpenXML spreadsheet' -o orcus-xlsx.1 %{buildroot}%{_bindir}/orcus-xlsx -help2man -N -S '%{name} %{version}' -n 'convert an XML file' -o orcus-xml.1 %{buildroot}%{_bindir}/orcus-xml -install -m 0755 -d %{buildroot}/%{_mandir}/man1 -install -p -m 0644 orcus-*.1 %{buildroot}/%{_mandir}/man1 -%endif - -# build documentation -make doc-doxygen - -%check -export LD_LIBRARY_PATH=%{buildroot}%{_libdir}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} -make check %{?_smp_mflags} - -%ldconfig_scriptlets - -%if %{with convtools} -%ldconfig_scriptlets model -%endif - -%files -%doc AUTHORS CHANGELOG -%license LICENSE -%{_libdir}/%{name}-%{apiversion}.so.* -%{_libdir}/%{name}-mso-%{apiversion}.so.* -%{_libdir}/%{name}-parser-%{apiversion}.so.* - -%if %{with convtools} -%files model -%{_libdir}/%{name}-spreadsheet-model-%{apiversion}.so.* -%endif - -%files devel -%{_includedir}/%{name}-%{apiversion} -%{_libdir}/%{name}-%{apiversion}.so -%{_libdir}/%{name}-mso-%{apiversion}.so -%{_libdir}/%{name}-parser-%{apiversion}.so -%{_libdir}/pkgconfig/%{name}-%{apiversion}.pc -%if %{with convtools} -%{_libdir}/%{name}-spreadsheet-model-%{apiversion}.so -%{_libdir}/pkgconfig/%{name}-spreadsheet-model-%{apiversion}.pc -%endif - -%files tools -%{_bindir}/orcus-css-dump -%{_bindir}/orcus-detect -%{_bindir}/orcus-json -%{_bindir}/orcus-mso-encryption -%{_bindir}/orcus-zip-dump -%{_bindir}/orcus-yaml -%if %{with convtools} -%{_bindir}/orcus-csv -%{_bindir}/orcus-gnumeric -%{_bindir}/orcus-ods -%{_bindir}/orcus-styles-ods -%{_bindir}/orcus-xls-xml -%{_bindir}/orcus-xlsx -%{_bindir}/orcus-xml -%{_mandir}/man1/orcus-csv.1* -%{_mandir}/man1/orcus-gnumeric.1* -%{_mandir}/man1/orcus-ods.1* -%{_mandir}/man1/orcus-xls-xml.1* -%{_mandir}/man1/orcus-xlsx.1* -%{_mandir}/man1/orcus-xml.1* -%endif - -%if %{with python} -%files python3 -%{python3_sitearch}/_orcus.so -%{python3_sitearch}/_orcus_json.so -%{python3_sitelib}/orcus -%endif - -%files doc -%license LICENSE -%doc doc/_doxygen/html - -%changelog -* Wed Feb 02 2022 Caolán McNamara - 0.17.2-1 -- Resolves: rhbz#2018620 Update to 0.17.2 - -* Thu Jan 20 2022 Fedora Release Engineering - 0.16.1-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Sat Aug 07 2021 Jonathan Wakely - 0.16.1-9 -- Rebuilt for Boost 1.76 - -* Thu Jul 22 2021 Fedora Release Engineering - 0.16.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Fri Jun 04 2021 Python Maint - 0.16.1-7 -- Rebuilt for Python 3.10 - -* Tue Jan 26 2021 Fedora Release Engineering - 0.16.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Fri Jan 22 2021 Jonathan Wakely - 0.16.1-5 -- Rebuilt for Boost 1.75 - -* Tue Dec 08 2020 Caolán McNamara - 0.16.1-4 -- fix build without libixion under rhel - -* Wed Dec 02 2020 Caolán McNamara - 0.16.1-3 -- build without libixion under rhel - -* Mon Oct 19 2020 Jeff Law - 0.16.1-2 -- Fix missing headers for gcc-11 - -* Tue Sep 29 2020 Caolán McNamara - 0.16.1-1 -- latest release - -* Fri Sep 25 2020 Caolán McNamara - 0.16.0-3 -- reenable make check - -* Fri Sep 25 2020 Caolán McNamara - 0.16.0-2 -- replace -DSIZEOF_VOID_P=4 with upstream solution - -* Thu Sep 24 2020 Caolán McNamara - 0.16.0-1 -- latest release - -* Tue Jul 28 2020 Fedora Release Engineering - 0.15.3-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jul 14 2020 Tom Stellard - 0.15.3-5 -- Use make macros -- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro - -* Thu May 28 2020 Jonathan Wakely - 0.15.3-4 -- Rebuilt for Boost 1.73 - -* Tue May 26 2020 Miro Hrončok - 0.15.3-3 -- Rebuilt for Python 3.9 - -* Wed Jan 29 2020 Fedora Release Engineering - 0.15.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Nov 02 2019 David Tardon - 0.15.3-1 -- new upstream release - -* Thu Oct 03 2019 Miro Hrončok - 0.15.2-2 -- Rebuilt for Python 3.8.0rc1 (#1748018) - -* Thu Aug 29 2019 Caolán McNamara - 0.15.2-1 -- new upstream release - -* Tue Aug 20 2019 Caolán McNamara - 0.15.0-1 -- new upstream release - -* Mon Aug 19 2019 Miro Hrončok - 0.14.1-6 -- Rebuilt for Python 3.8 - -* Thu Jul 25 2019 Fedora Release Engineering - 0.14.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Apr 05 2019 Stephan Bergmann - 0.14.1-4 -- Replace hard-coded /usr/bin with _bindir macro for flatpak build - -* Fri Feb 01 2019 Fedora Release Engineering - 0.14.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jan 25 2019 Jonathan Wakely - 0.14.1-2 -- Rebuilt for Boost 1.69 - -* Fri Oct 26 2018 David Tardon - 0.14.1-1 -- new upstream release - -* Sun Sep 02 2018 David Tardon - 0.14.0-1 -- new upstream release - -* Fri Jul 13 2018 Fedora Release Engineering - 0.13.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Mon Jul 02 2018 Miro Hrončok - 0.13.4-2 -- Rebuilt for Python 3.7 - -* Wed Feb 28 2018 David Tardon - 0.13.4-1 -- new upstream release - -* Sat Feb 17 2018 David Tardon - 0.13.3-1 -- new upstream release - -* Wed Feb 07 2018 Fedora Release Engineering - 0.13.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Jan 31 2018 David Tardon - 0.13.2-1 -- new upstream release - -* Tue Jan 23 2018 Jonathan Wakely - 0.13.1-2 -- Rebuilt for Boost 1.66 - -* Mon Nov 20 2017 David Tardon - 0.13.1-1 -- new upstream release - -* Thu Aug 03 2017 Fedora Release Engineering - 0.12.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 0.12.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Jul 21 2017 Kalev Lember - 0.12.1-5 -- Rebuilt for Boost 1.64 - -* Wed Feb 15 2017 Igor Gnatenko - 0.12.1-4 -- Rebuild for brp-python-bytecompile - -* Tue Feb 07 2017 Björn Esser - 0.12.1-3 -- Rebuilt for Boost 1.63 -- Fix build and directory ownership - -* Mon Dec 19 2016 Miro Hrončok - 0.12.1-2 -- Rebuild for Python 3.6 - -* Thu Sep 29 2016 David Tardon - 0.12.1-1 -- new upstream release - -* Wed Jul 20 2016 David Tardon - 0.11.2-2 -- rebuild for libixion 0.12 - -* Tue Jul 19 2016 Fedora Release Engineering - 0.11.2-1 -- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages - -* Mon Mar 14 2016 David Tardon - 0.11.1-1 -- new upstream release - -* Tue Mar 08 2016 David Tardon - 0.11.0-1 -- new upstream release - -* Sun Feb 14 2016 David Tardon - 0.9.2-4 -- switch to new mdds and libixion - -* Thu Feb 04 2016 Fedora Release Engineering - 0.9.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Sat Jan 16 2016 Jonathan Wakely - 0.9.2-2 -- Rebuilt for Boost 1.60 - -* Mon Oct 19 2015 David Tardon - 0.9.2-1 -- rebase to the 0.9.x line - -* Thu Aug 27 2015 Jonathan Wakely - 0.7.1-7 -- Rebuilt for Boost 1.59 - -* Wed Jul 29 2015 Fedora Release Engineering - 0.7.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 - -* Fri Jul 24 2015 Adam Williamson - 0.7.1-5 -- rebuild for Boost 1.58 (for f23, for real this time) - -* Wed Jul 22 2015 David Tardon - 0.7.1-4 -- rebuild for Boost 1.58 - -* Wed Jun 17 2015 Fedora Release Engineering - 0.7.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Tue Apr 14 2015 David Tardon - 0.7.1-2 -- rebuild for yet another C++ ABI break - -* Wed Feb 25 2015 David Tardon - 0.7.1-1 -- new upstream release - -* Tue Jan 27 2015 Petr Machata - 0.7.0-7 -- include in string_pool_test (liborcus-0.7.0-iostream.patch) - -* Tue Jan 27 2015 Petr Machata - 0.7.0-6 -- Rebuild for boost 1.57.0 - -* Sun Aug 17 2014 Fedora Release Engineering - 0.7.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 0.7.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Thu May 29 2014 David Tardon - 0.7.0-3 -- enable conversion tools - -* Fri May 23 2014 Petr Machata - 0.7.0-2 -- Rebuild for boost 1.55.0 - -* Thu May 22 2014 David Tardon - 0.7.0-1 -- new upstream release - -* Mon May 05 2014 Jaromir Capik - 0.5.1-7 -- add support for ppc64le - -* Wed Jan 22 2014 David Tardon - 0.5.1-6 -- add support for aarch64 - -* Sat Aug 03 2013 Fedora Release Engineering - 0.5.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Sat Jul 27 2013 pmachata@redhat.com - 0.5.1-4 -- Rebuild for boost 1.54.0 - -* Mon Jun 10 2013 David Tardon - 0.5.1-3 -- trivial changes - -* Tue May 28 2013 David Tardon - 0.5.1-2 -- build orcus-zip-dump too - -* Mon May 06 2013 David Tardon - 0.5.1-1 -- new release - -* Fri Feb 15 2013 Stephan Bergmannn - 0.3.0-5 -- missing boost include - -* Sun Feb 10 2013 Denis Arnaud - 0.3.0-4 -- Rebuild for Boost-1.53.0 - -* Sat Feb 09 2013 Denis Arnaud - 0.3.0-3 -- Rebuild for Boost-1.53.0 - -* Sat Dec 08 2012 David Tardon - 0.3.0-2 -- a pointless release bump - -* Fri Dec 07 2012 David Tardon - 0.3.0-1 -- new release - -* Sun Sep 09 2012 David Tardon - 0.1.0-1 -- initial import diff --git a/CentOS-8/SPECS/libpagemaker.spec b/CentOS-8/SPECS/libpagemaker.spec deleted file mode 100644 index 96bafa6..0000000 --- a/CentOS-8/SPECS/libpagemaker.spec +++ /dev/null @@ -1,162 +0,0 @@ -%global apiversion 0.0 - -Name: libpagemaker -Version: 0.0.4 -Release: 3%{?dist} -Summary: A library for import of Adobe PageMaker documents - -License: MPLv2.0 -URL: http://wiki.documentfoundation.org/DLP/Libraries/libpagemaker -Source: http://dev-www.libreoffice.org/src/%{name}/%{name}-%{version}.tar.xz - -BuildRequires: boost-devel -BuildRequires: doxygen -BuildRequires: help2man -BuildRequires: pkgconfig(librevenge-0.0) -BuildRequires: pkgconfig(librevenge-generators-0.0) -BuildRequires: pkgconfig(librevenge-stream-0.0) - -%description -libpagemaker is library providing ability to interpret and import -Adobe PageMaker documents into various applications. - -%package devel -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}. - -%package doc -Summary: Documentation of %{name} API -BuildArch: noarch - -%description doc -The %{name}-doc package contains documentation files for %{name}. - -%package tools -Summary: Tools to transform Adobe PageMaker documents into other formats -Requires: %{name}%{?_isa} = %{version}-%{release} - -%description tools -Tools to transform Adobe PageMaker documents into other formats. -Currently supported: SVG, plain text, raw. - -%prep -%autosetup -p1 - -%build -%configure --disable-silent-rules --disable-static --disable-werror -sed -i \ - -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \ - -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \ - libtool -make %{?_smp_mflags} - -%install -make install DESTDIR=%{buildroot} -rm -f %{buildroot}/%{_libdir}/*.la -# we install API docs directly from build -rm -rf %{buildroot}/%{_docdir}/%{name} - -# generate and install man pages -export LD_LIBRARY_PATH=%{buildroot}/%{_libdir}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} -for tool in pmd2raw pmd2svg pmd2text; do - help2man -N -S '%{name} %{version}' -o ${tool}.1 %{buildroot}%{_bindir}/${tool} -done -install -m 0755 -d %{buildroot}/%{_mandir}/man1 -install -m 0644 pmd2*.1 %{buildroot}/%{_mandir}/man1 - -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig - -%files -%doc AUTHORS NEWS -%license COPYING -%{_libdir}/%{name}-%{apiversion}.so.* - -%files devel -%doc ChangeLog -%{_includedir}/%{name}-%{apiversion} -%{_libdir}/%{name}-%{apiversion}.so -%{_libdir}/pkgconfig/%{name}-%{apiversion}.pc - -%files doc -%license COPYING -%doc docs/doxygen/html - -%files tools -%{_bindir}/pmd2raw -%{_bindir}/pmd2svg -%{_bindir}/pmd2text -%{_mandir}/man1/pmd2raw.1* -%{_mandir}/man1/pmd2svg.1* -%{_mandir}/man1/pmd2text.1* - -%changelog -* Wed Feb 07 2018 Fedora Release Engineering - 0.0.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Tue Jan 23 2018 Jonathan Wakely - 0.0.4-2 -- Rebuilt for Boost 1.66 - -* Tue Jan 09 2018 David Tardon - 0.0.4-1 -- new upstream release - -* Thu Aug 03 2017 Fedora Release Engineering - 0.0.3-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 0.0.3-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Mon Jul 03 2017 Jonathan Wakely - 0.0.3-5 -- Rebuilt for Boost 1.64 - -* Mon May 15 2017 Fedora Release Engineering - 0.0.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 0.0.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Jan 27 2017 Jonathan Wakely - 0.0.3-2 -- Rebuilt for Boost 1.63 - -* Thu Mar 03 2016 David Tardon - 0.0.3-1 -- new upstream release - -* Thu Feb 04 2016 Fedora Release Engineering - 0.0.2-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jan 15 2016 Jonathan Wakely - 0.0.2-8 -- Rebuilt for Boost 1.60 - -* Thu Aug 27 2015 Jonathan Wakely - 0.0.2-7 -- Rebuilt for Boost 1.59 - -* Wed Jul 29 2015 Fedora Release Engineering - 0.0.2-6 -- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 - -* Wed Jul 22 2015 David Tardon - 0.0.2-5 -- rebuild for Boost 1.58 - -* Wed Jun 17 2015 Fedora Release Engineering - 0.0.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat May 02 2015 Kalev Lember - 0.0.2-3 -- Rebuilt for GCC 5 C++11 ABI change - -* Tue Jan 27 2015 Petr Machata - 0.0.2-2 -- Rebuild for boost 1.57.0 - -* Fri Dec 05 2014 David Tardon - 0.0.2-1 -- new upstream release - -* Thu Aug 21 2014 David Tardon - 0.0.1-1 -- new upstream release - -* Sun Aug 17 2014 Fedora Release Engineering - 0.0.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Thu Jun 26 2014 David Tardon 0.0.0-1 -- initial import diff --git a/CentOS-8/SPECS/libqxp.spec b/CentOS-8/SPECS/libqxp.spec deleted file mode 100644 index dfe5bec..0000000 --- a/CentOS-8/SPECS/libqxp.spec +++ /dev/null @@ -1,116 +0,0 @@ -%global apiversion 0.0 - -Name: libqxp -Version: 0.0.1 -Release: 2%{?dist} -Summary: Library for import of QuarkXPress documents - -License: MPLv2.0 -URL: http://wiki.documentfoundation.org/DLP/Libraries/libqxp -Source: http://dev-www.libreoffice.org/src/%{name}/%{name}-%{version}.tar.xz - -BuildRequires: boost-devel -BuildRequires: doxygen -BuildRequires: help2man -BuildRequires: pkgconfig(cppunit) -BuildRequires: pkgconfig(icu-uc) -BuildRequires: pkgconfig(librevenge-0.0) -BuildRequires: pkgconfig(librevenge-generators-0.0) -BuildRequires: pkgconfig(librevenge-stream-0.0) - -%description -libqxp is library providing ability to interpret and import QuarkXPress -document formats into various applications. Currently it only supports -QuarkXPress 3.1-4.1. - -%package devel -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}. - -%package doc -Summary: Documentation of %{name} API -BuildArch: noarch - -%description doc -The %{name}-doc package contains documentation files for %{name}. - -%package tools -Summary: Tools to transform QuarkXPress documents into other formats -Requires: %{name}%{?_isa} = %{version}-%{release} - -%description tools -Tools to transform QuarkXPress documents into other formats. -Currently supported: SVG, plain text, raw. - -%prep -%autosetup -p1 - -%build -%configure --disable-silent-rules --disable-static -sed -i \ - -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \ - -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \ - libtool -make %{?_smp_mflags} - -%install -make install DESTDIR=%{buildroot} -rm -f %{buildroot}/%{_libdir}/*.la -# we install API docs directly from build -rm -rf %{buildroot}/%{_docdir}/%{name} - -# generate and install man pages -export LD_LIBRARY_PATH=%{buildroot}/%{_libdir}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} -for tool in qxp2raw qxp2svg qxp2text; do - help2man -N -S '%{name} %{version}' -o ${tool}.1 %{buildroot}%{_bindir}/${tool} -done -install -m 0755 -d %{buildroot}/%{_mandir}/man1 -install -m 0644 qxp2*.1 %{buildroot}/%{_mandir}/man1 - -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig - -%check -export LD_LIBRARY_PATH=%{buildroot}/%{_libdir}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} -make %{?_smp_mflags} check - -%files -%doc AUTHORS NEWS README -%license COPYING -%{_libdir}/%{name}-%{apiversion}.so.* - -%files devel -%doc ChangeLog -%{_includedir}/%{name}-%{apiversion} -%{_libdir}/%{name}-%{apiversion}.so -%{_libdir}/pkgconfig/%{name}-%{apiversion}.pc - -%files doc -%license COPYING -%doc docs/doxygen/html - -%files tools -%{_bindir}/qxp2raw -%{_bindir}/qxp2svg -%{_bindir}/qxp2text -%{_mandir}/man1/qxp2raw.1* -%{_mandir}/man1/qxp2svg.1* -%{_mandir}/man1/qxp2text.1* - -%changelog -* Wed Feb 07 2018 Fedora Release Engineering - 0.0.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Tue Jan 02 2018 David Tardon - 0.0.1-1 -- new upstream release - -* Thu Nov 30 2017 Pete Walter - 0.0.0-2 -- Rebuild for ICU 60.1 - -* Sun Aug 27 2017 David Tardon - 0.0.0-1 -- initial import - diff --git a/CentOS-8/SPECS/libstaroffice.spec b/CentOS-8/SPECS/libstaroffice.spec deleted file mode 100644 index 394219a..0000000 --- a/CentOS-8/SPECS/libstaroffice.spec +++ /dev/null @@ -1,138 +0,0 @@ -%global apiversion 0.0 - -Name: libstaroffice -Version: 0.0.6 -Release: 1%{?dist} -Summary: A library for import of binary StarOffice documents - -License: MPLv2.0 or LGPLv2+ -URL: https://github.com/fosnola/libstaroffice/wiki -Source: https://github.com/fosnola/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz - -BuildRequires: doxygen -BuildRequires: gcc-c++ -BuildRequires: help2man -BuildRequires: pkgconfig(librevenge-0.0) -BuildRequires: pkgconfig(librevenge-generators-0.0) -BuildRequires: pkgconfig(librevenge-stream-0.0) -BuildRequires: pkgconfig(zlib) - -%description -%{name} is a library for import of binary StarOffice documents. - -%package devel -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}. - -%package doc -Summary: Documentation of %{name} API -BuildArch: noarch - -%description doc -The %{name}-doc package contains documentation files for %{name}. - -%package tools -Summary: Tools to transform StarOffice documents into other formats -Requires: %{name}%{?_isa} = %{version}-%{release} - -%description tools -Tools to transform StarOffice documents into other formats. Currently -supported: CSV, HTML, plain text, SVG, raw. - -%prep -%autosetup -p1 - -%build -%configure --disable-static --disable-werror --disable-silent-rules \ - --enable-zip -sed -i \ - -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \ - -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \ - libtool -make %{?_smp_mflags} - -%install -%make_install -rm -f %{buildroot}/%{_libdir}/*.la -# rhbz#1001245 we install API docs directly from build -rm -rf %{buildroot}/%{_docdir}/%{name} - -# generate and install man pages -export LD_LIBRARY_PATH=%{buildroot}/%{_libdir}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} -for tool in sd2raw sd2svg sd2text sdc2csv sdw2html; do - help2man -N -S '%{name} %{version}' -o ${tool}.1 %{buildroot}%{_bindir}/${tool} -done -install -m 0755 -d %{buildroot}/%{_mandir}/man1 -install -m 0644 sd2*.1 sd?2*.1 %{buildroot}/%{_mandir}/man1 - -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig - -%files -%doc CREDITS NEWS README -%license COPYING.LGPL COPYING.MPL -%{_libdir}/%{name}-%{apiversion}.so.* - -%files devel -%doc ChangeLog -%{_includedir}/%{name}-%{apiversion} -%{_libdir}/%{name}-%{apiversion}.so -%{_libdir}/pkgconfig/%{name}-%{apiversion}.pc - -%files doc -%license COPYING.LGPL COPYING.MPL -%doc docs/doxygen/html - -%files tools -%{_bindir}/sdw2html -%{_bindir}/sd2raw -%{_bindir}/sd2svg -%{_bindir}/sd2text -%{_bindir}/sdc2csv -%{_mandir}/man1/sdw2html.1* -%{_mandir}/man1/sd2raw.1* -%{_mandir}/man1/sd2svg.1* -%{_mandir}/man1/sd2text.1* -%{_mandir}/man1/sdc2csv.1* - -%changelog -* Thu Apr 26 2018 David Tardon - 0.0.6-1 -- new upstream release - -* Wed Feb 07 2018 Fedora Release Engineering - 0.0.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Tue Nov 07 2017 David Tardon - 0.0.5-1 -- new upstream release - -* Thu Aug 03 2017 Fedora Release Engineering - 0.0.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 0.0.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sun Jul 16 2017 David Tardon - 0.0.4-1 -- new upstream release - -* Tue Jun 06 2017 David Tardon - 0.0.3-3 -- Resolves: rhbz#1458800 CVE-2017-9432 Stack-buffer overflow in the - StarWriterStruct::DatabaseName::read - -* Mon May 15 2017 Fedora Release Engineering - 0.0.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild - -* Wed Feb 22 2017 David Tardon - 0.0.3-1 -- new upstream release - -* Fri Feb 10 2017 Fedora Release Engineering - 0.0.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu Aug 11 2016 David Tardon - 0.0.2-1 -- new upstream release - -* Thu Feb 11 2016 David Tardon - 0.0.1-1 -- initial import diff --git a/CentOS-8/SPECS/libzmf.spec b/CentOS-8/SPECS/libzmf.spec deleted file mode 100644 index ef5d6fe..0000000 --- a/CentOS-8/SPECS/libzmf.spec +++ /dev/null @@ -1,127 +0,0 @@ -%global apiversion 0.0 - -Name: libzmf -Version: 0.0.2 -Release: 3%{?dist} -Summary: A library for import of Zoner document formats - -License: MPLv2.0 -URL: http://wiki.documentfoundation.org/DLP/Libraries/libzmf -Source: http://dev-www.libreoffice.org/src/%{name}/%{name}-%{version}.tar.xz - -BuildRequires: boost-devel -BuildRequires: doxygen -BuildRequires: help2man -BuildRequires: pkgconfig(cppunit) -BuildRequires: pkgconfig(icu-uc) -BuildRequires: pkgconfig(librevenge-0.0) -BuildRequires: pkgconfig(libpng) -BuildRequires: pkgconfig(zlib) - -%description -libzmf is library providing ability to interpret and import Zoner -document formats into various applications. Currently it only supports -Zoner Callisto/Draw v 4-5. - -%package devel -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}. - -%package doc -Summary: Documentation of %{name} API -BuildArch: noarch - -%description doc -The %{name}-doc package contains documentation files for %{name}. - -%package tools -Summary: Tools to transform Zoner documents into other formats -Requires: %{name}%{?_isa} = %{version}-%{release} - -%description tools -Tools to transform Zoner documents into other formats. -Currently supported: SVG, raw. - -%prep -%autosetup -p1 - -%build -%configure --disable-silent-rules --disable-static --disable-werror -sed -i \ - -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \ - -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \ - libtool -make %{?_smp_mflags} - -%install -make install DESTDIR=%{buildroot} -rm -f %{buildroot}/%{_libdir}/*.la -# we install API docs directly from build -rm -rf %{buildroot}/%{_docdir}/%{name} - -# generate and install man pages -export LD_LIBRARY_PATH=%{buildroot}/%{_libdir}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} -for tool in zmf2raw zmf2svg; do - help2man -N -S '%{name} %{version}' -o ${tool}.1 %{buildroot}%{_bindir}/${tool} -done -install -m 0755 -d %{buildroot}/%{_mandir}/man1 -install -m 0644 zmf2*.1 %{buildroot}/%{_mandir}/man1 - -%ldconfig_scriptlets - -%check -export LD_LIBRARY_PATH=%{buildroot}/%{_libdir}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} -make %{?_smp_mflags} check - -%files -%doc AUTHORS NEWS -%license COPYING -%{_libdir}/%{name}-%{apiversion}.so.* - -%files devel -%doc ChangeLog -%{_includedir}/%{name}-%{apiversion} -%{_libdir}/%{name}-%{apiversion}.so -%{_libdir}/pkgconfig/%{name}-%{apiversion}.pc - -%files doc -%license COPYING -%doc docs/doxygen/html - -%files tools -%{_bindir}/zmf2raw -%{_bindir}/zmf2svg -%{_mandir}/man1/zmf2raw.1* -%{_mandir}/man1/zmf2svg.1* - -%changelog -* Sat Feb 03 2018 Igor Gnatenko - 0.0.2-3 -- Switch to %%ldconfig_scriptlets - -* Thu Nov 30 2017 Pete Walter - 0.0.2-2 -- Rebuild for ICU 60.1 - -* Thu Sep 14 2017 David Tardon - 0.0.2-1 -- new upstream release - -* Thu Aug 03 2017 Fedora Release Engineering - 0.0.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 0.0.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Mon May 15 2017 Fedora Release Engineering - 0.0.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 0.0.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Sep 07 2016 David Tardon - 0.0.1-1 -- new upstream release - -* Thu Jun 23 2016 David Tardon 0.0.0-1 -- initial import diff --git a/CentOS-8/SPECS/mdds.spec b/CentOS-8/SPECS/mdds.spec deleted file mode 100644 index 63625c6..0000000 --- a/CentOS-8/SPECS/mdds.spec +++ /dev/null @@ -1,294 +0,0 @@ -# header-only library -%global debug_package %{nil} - -%global apiversion 2.0 - -Name: mdds -Version: 2.0.1 -Release: 1%{?dist} -Summary: A collection of multi-dimensional data structures and indexing algorithms - -License: MIT -URL: https://gitlab.com/mdds/mdds -Source0: http://kohei.us/files/%{name}/src/%{name}-%{version}.tar.bz2 - -BuildRequires: make -BuildRequires: boost-devel -BuildRequires: gcc-c++ -BuildRequires: autoconf - -%description -%{name} is a collection of multi-dimensional data structures and -indexing algorithms. - -%package devel -Summary: Headers for %{name} -BuildArch: noarch -Requires: boost-devel -Provides: %{name}-static = %{version}-%{release} - -%description devel -%{name} is a collection of multi-dimensional data structures and -indexing algorithms. - -It implements the following data structures: -* segment tree -* flat segment tree -* rectangle set -* point quad tree -* multi type matrix -* multi type vector - -See README.md for a brief description of the structures. - -%prep -%autosetup -p1 - -%build -autoconf -%configure - -%install -%make_install -rm -rf %{buildroot}%{_docdir}/%{name} - -%check -make check %{?_smp_mflags} - -%files devel -%{_includedir}/%{name}-%{apiversion} -%{_datadir}/pkgconfig/%{name}-%{apiversion}.pc -%doc AUTHORS README.md -%license LICENSE - -%changelog -* Wed Feb 02 2022 Caolán McNamara - 2.0.1-1 -- new upstream release needed for libreoffice 7.3 - -* Thu Jan 20 2022 Fedora Release Engineering - 1.7.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Jul 22 2021 Fedora Release Engineering - 1.7.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jan 26 2021 Fedora Release Engineering - 1.7.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Sep 21 2020 Caolán McNamara - 1.7.0-1 -- new upstream release - -* Tue Jul 28 2020 Fedora Release Engineering - 1.5.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jan 29 2020 Fedora Release Engineering - 1.5.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Aug 15 2019 Caolán McNamara - 1.5.0-1 -- new upstream release - -* Thu Jul 25 2019 Fedora Release Engineering - 1.4.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Feb 01 2019 Fedora Release Engineering - 1.4.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jan 25 2019 Jonathan Wakely - 1.4.3-2 -- Rebuilt for Boost 1.69 - -* Wed Oct 31 2018 Caolán McNamara - 1.4.3-1 -- new upstream release - -* Wed Sep 19 2018 Caolán McNamara - 1.4.2-1 -- new upstream release - -* Tue Aug 28 2018 Caolán McNamara - 1.4.1-1 -- new upstream release - -* Fri Jul 13 2018 Fedora Release Engineering - 1.3.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu Feb 08 2018 Fedora Release Engineering - 1.3.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Tue Jan 23 2018 Jonathan Wakely - 1.3.0-2 -- Rebuilt for Boost 1.66 - -* Wed Nov 01 2017 David Tardon - 1.3.0-1 -- new upstream release - -* Thu Aug 03 2017 Fedora Release Engineering - 1.2.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 1.2.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Mon Jul 03 2017 Jonathan Wakely - 1.2.3-2 -- Rebuilt for Boost 1.64 - -* Thu May 25 2017 David Tardon - 1.2.3-1 -- new upstream release - -* Fri Feb 10 2017 Fedora Release Engineering - 1.2.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Jan 27 2017 Jonathan Wakely - 1.2.2-2 -- Rebuilt for Boost 1.63 - -* Mon Sep 12 2016 David Tardon - 1.2.2-1 -- new upstream release - -* Mon Jun 27 2016 David Tardon - 1.2.1-1 -- new upstream release - -* Wed Jun 22 2016 David Tardon - 1.2.0-2 -- fix double delete in mtv::swap - -* Thu May 12 2016 David Tardon - 1.2.0-1 -- new upstream release - -* Fri Feb 12 2016 David Tardon - 1.1.0-1 -- new upstream release - -* Thu Feb 04 2016 Fedora Release Engineering - 0.12.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jan 15 2016 Jonathan Wakely - 0.12.1-6 -- Rebuilt for Boost 1.60 - -* Thu Aug 27 2015 Jonathan Wakely - 0.12.1-5 -- Rebuilt for Boost 1.59 - -* Wed Jul 29 2015 Fedora Release Engineering - 0.12.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 - -* Wed Jul 22 2015 David Tardon - 0.12.1-3 -- rebuild for Boost 1.58 - -* Wed Jun 17 2015 Fedora Release Engineering - 0.12.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Fri Jun 12 2015 David Tardon - 0.12.1-1 -- new upstream release - -* Thu Mar 05 2015 David Tardon - 0.12.0-2 -- add missing includes - -* Tue Feb 17 2015 David Tardon - 0.12.0-1 -- new upstream release - -* Thu Jan 29 2015 David Tardon - 0.11.2-3 -- fix includes in header file - -* Tue Jan 27 2015 Petr Machata - 0.11.2-2 -- Rebuild for boost 1.57.0 - -* Sun Dec 21 2014 David Tardon - 0.11.2-1 -- new upstream release - -* Fri Oct 03 2014 David Tardon - 0.11.1-1 -- new bugfix release - -* Mon Sep 22 2014 David Tardon - 0.11.0-1 -- new upstream release - -* Sun Aug 17 2014 Fedora Release Engineering - 0.10.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 0.10.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri May 23 2014 Petr Machata - 0.10.3-2 -- Rebuild for boost 1.55.0 - -* Thu Apr 24 2014 David Tardon - 0.10.3-1 -- new upstream release - -* Thu Feb 13 2014 David Tardon - 0.10.2-1 -- new bugfix release - -* Thu Jan 09 2014 David Tardon - 0.10.1-1 -- new upstream release - -* Tue Jan 07 2014 David Tardon - 0.10.0-1 -- new upstream release - -* Wed Nov 06 2013 David Tardon - 0.9.1-1 -- new upstream release - -* Wed Sep 04 2013 David Tardon - 0.8.1-5 -- run tests on all platforms - -* Sat Aug 03 2013 Fedora Release Engineering - 0.8.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Tue Jul 30 2013 Petr Machata - 0.8.1-3 -- Rebuild for boost 1.54.0 - -* Mon Jun 10 2013 David Tardon - 0.8.1-2 -- trivial changes - -* Tue May 21 2013 David Tardon - 0.8.1-1 -- new release - -* Tue May 14 2013 David Tardon - 0.8.0-1 -- new release - -* Mon Mar 18 2013 David Tardon - 0.7.1-1 -- new release - -* Thu Feb 28 2013 David Tardon - 0.7.0-1 -- new release - -* Sun Feb 10 2013 Denis Arnaud - 0.6.1-3 -- Rebuild for Boost-1.53.0 - -* Sat Feb 09 2013 Denis Arnaud - 0.6.1-2 -- Rebuild for Boost-1.53.0 - -* Tue Sep 18 2012 David Tardon - 0.6.1-1 -- new version - -* Sat Jul 28 2012 David Tardon - 0.6.0-2 -- rebuilt for boost 1.50 - -* Mon Jul 23 2012 David Tardon - 0.6.0-1 -- new version - -* Thu Jul 19 2012 Fedora Release Engineering - 0.5.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Fri Jan 13 2012 Fedora Release Engineering - 0.5.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Fri Nov 18 2011 David Tardon - 0.5.4-1 -- new version - -* Thu Jul 14 2011 David Tardon - 0.5.3-1 -- new version - -* Wed Mar 30 2011 David Tardon - 0.5.2-2 -- install license - -* Tue Mar 29 2011 David Tardon - 0.5.2-1 -- new version - -* Thu Mar 24 2011 David Tardon - 0.5.1-3 -- Resolves: rhbz#680766 fix a crash and two other bugs - -* Tue Feb 08 2011 Fedora Release Engineering - 0.5.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Sat Jan 08 2011 David Tardon - 0.5.1-1 -- new version - -* Tue Dec 21 2010 David Tardon - 0.4.0-1 -- new version - -* Tue Nov 16 2010 David Tardon - 0.3.1-1 -- new version - -* Wed Jul 07 2010 Caolán McNamara - 0.3.0-2 -- rpmlint warnings - -* Wed Jun 30 2010 David Tardon - 0.3.0-1 -- initial import diff --git a/CentOS-8/SPECS/neon.spec b/CentOS-8/SPECS/neon.spec deleted file mode 100644 index c330b3b..0000000 --- a/CentOS-8/SPECS/neon.spec +++ /dev/null @@ -1,444 +0,0 @@ -%bcond_without tests -%if 0%{?fedora} -%bcond_without pkcs11 -%else -%bcond_with pkcs11 -%endif -%if 0%{?fedora} -%bcond_without libproxy -%else -%bcond_with libproxy -%endif - -Summary: An HTTP and WebDAV client library -Name: neon -Version: 0.32.2 -Release: 1%{?dist} -License: LGPLv2+ -URL: https://notroj.github.io/neon/ -Source0: https://notroj.github.io/neon/neon-%{version}.tar.gz -Patch0: neon-0.27.0-multilib.patch -BuildRequires: expat-devel, openssl-devel, zlib-devel, krb5-devel -BuildRequires: pkgconfig, make, gcc, xmlto -%if %{with pkcs11} -BuildRequires: pakchois-devel -%endif -%if %{with libproxy} -BuildRequires: libproxy-devel -%endif -%if %{with tests} -# SSL tests require openssl binary, PKCS#11 testing need certutil -BuildRequires: /usr/bin/perl, /usr/bin/openssl, /usr/bin/certutil -%endif - -%description -neon is an HTTP and WebDAV client library, with a C interface; -providing a high-level interface to HTTP and WebDAV methods along -with a low-level interface for HTTP request handling. neon -supports persistent connections, proxy servers, basic, digest and -Kerberos authentication, and has complete SSL support. - -%package devel -Summary: Development libraries and C header files for the neon library -Requires: neon = %{version}-%{release}, openssl-devel, zlib-devel, expat-devel -Requires: pkgconfig -# Documentation is GPLv2+ -License: LGPLv2+ and GPLv2+ - -%description devel -The development library for the C language HTTP and WebDAV client library. - -%prep -%setup -q -%patch0 -p1 -b .multilib - -# prevent installation of HTML docs -sed -i '/^install-docs/s/install-html//' Makefile.in - -%build -%configure --with-expat --enable-shared --disable-static \ - --enable-warnings \ - --with-ssl=openssl --enable-threadsafe-ssl=posix \ -%if %{with libproxy} - --with-libproxy -%else - --without-libproxy -%endif -%make_build - -%install -rm -rf $RPM_BUILD_ROOT -%make_install - -sed -ri "/^dependency_libs/{s,-l[^ ']*,,g}" \ - $RPM_BUILD_ROOT%{_libdir}/libneon.la - -%find_lang %{name} - -%if %{with tests} -%check -export TEST_QUIET=0 -make %{?_smp_mflags} check -%endif - -%ldconfig_scriptlets - -%files -f %{name}.lang -%doc AUTHORS BUGS TODO src/COPYING.LIB NEWS README* THANKS -%{_libdir}/*.so.* - -%files devel -%{_bindir}/* -%{_includedir}/* -%{_libdir}/pkgconfig/neon.pc -%{_mandir}/man1/* -%{_mandir}/man3/* -%{_libdir}/*.*a -%{_libdir}/*.so - -%changelog -* Thu Jan 13 2022 Joe Orton - 0.32.2-1 -- update to 0.32.2 - -* Tue Sep 21 2021 Joe Orton - 0.32.1-1 -- update to 0.32.1 -- add bcond for libproxy support - -* Mon Sep 20 2021 Joe Orton - 0.32.0-1 -- update to 0.32.0 - -* Tue Sep 14 2021 Sahana Prasad - 0.31.2-8 -- Rebuilt with OpenSSL 3.0.0 - -* Thu Jul 22 2021 Fedora Release Engineering - 0.31.2-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Thu Feb 4 2021 Joe Orton - 0.31.2-6 -- add bcond for PKCS#11 support -- use make macros - -* Tue Jan 26 2021 Fedora Release Engineering - 0.31.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Aug 26 2020 Joe Orton - 0.31.2-4 -- fix tests with current OpenSSL (#1863681) - -* Sat Aug 01 2020 Fedora Release Engineering - 0.31.2-3 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jul 28 2020 Fedora Release Engineering - 0.31.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jun 24 2020 Joe Orton - 0.31.2-1 -- update to 0.31.2 - -* Fri Apr 17 2020 Joe Orton - 0.31.1-1 -- update to 0.31.1 - -* Tue Mar 24 2020 Joe Orton - 0.31.0-1 -- update to 0.31.0 - -* Mon Feb 10 2020 Joe Orton - 0.30.2-14 -- fix FTBFS (#1799679) - -* Mon Feb 03 2020 Kalev Lember - 0.30.2-13 -- Avoid using bindir macro in buildrequires - -* Wed Jan 29 2020 Fedora Release Engineering - 0.30.2-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Jul 25 2019 Fedora Release Engineering - 0.30.2-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Apr 5 2019 Joe Orton - 0.30.2-10 -- updates for OpenSSL 1.1 (#1675444) - -* Fri Feb 01 2019 Fedora Release Engineering - 0.30.2-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jul 13 2018 Fedora Release Engineering - 0.30.2-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu Jun 28 2018 Joe Orton - 0.30.2-7 -- fix gcc warnings in test suite build - -* Thu Jun 28 2018 Joe Orton - 0.30.2-6 -- fix implicit writev declaration (Mattias Ellert, #1572180) -- add build conditional for tests -- use ldconfig_scriptlets macro - -* Thu Feb 08 2018 Fedora Release Engineering - 0.30.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 0.30.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 0.30.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 0.30.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Sep 30 2016 Joe Orton - 0.30.2-1 -- update to 0.30.2 - -* Thu Feb 04 2016 Fedora Release Engineering - 0.30.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 0.30.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Tue Sep 23 2014 Joe Orton - 0.30.1-2 -- switch to OpenSSL - -* Tue Sep 23 2014 Joe Orton - 0.30.1-1 -- update to 0.30.1 - -* Sun Aug 17 2014 Fedora Release Engineering - 0.30.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 0.30.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Wed Jul 31 2013 Joe Orton - 0.30.0-2 -- prevent installation of HTML docs - -* Wed Jul 31 2013 Joe Orton - 0.30.0-1 -- update to 0.30.0 (#983563, #926212) - -* Mon Mar 18 2013 Joe Orton - 0.29.6-6 -- fix strict-aliasing warning (upstream r1896) - -* Mon Feb 25 2013 Tomáš Mráz - 0.29.6-5 -- fix build with gnutls3 - patch by Bartosz Brachaczek - -* Thu Feb 14 2013 Fedora Release Engineering - 0.29.6-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Fri Jul 20 2012 Fedora Release Engineering - 0.29.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Fri Jan 13 2012 Fedora Release Engineering - 0.29.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue May 3 2011 Joe Orton - 0.29.6-1 -- update to 0.29.6 -- correct -devel License; drop old Conflicts - -* Tue Feb 08 2011 Fedora Release Engineering - 0.29.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Thu Oct 14 2010 Joe Orton - 0.29.5-1 -- update to 0.29.5 - -* Fri Oct 1 2010 Joe Orton - 0.29.4-1 -- update to 0.29.4 - -* Thu Mar 25 2010 Joe Orton - 0.29.3-1 -- update to 0.29.3 - -* Fri Jan 8 2010 Joe Orton - 0.29.2-1 -- update to 0.29.2 - -* Tue Dec 15 2009 Joe Orton - 0.29.1-1 -- update to 0.29.1 - -* Sun Sep 13 2009 Joe Orton 0.29.0-3 -- enable libproxy support - -* Sun Sep 13 2009 Joe Orton 0.29.0-1 -- update to 0.29.0 - -* Wed Aug 19 2009 Joe Orton 0.28.6-1 -- update to 0.28.6 - -* Sat Jul 25 2009 Fedora Release Engineering - 0.28.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Thu Jul 9 2009 Joe Orton 0.28.5-1 -- update to 0.28.5 - -* Fri Mar 6 2009 Joe Orton 0.28.4-1 -- update to 0.28.4 - -* Wed Feb 25 2009 Fedora Release Engineering - 0.28.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Mon Jan 19 2009 Joe Orton 0.28.3-3 -- use install-p in "make install" (Robert Scheck, #226189) - -* Thu Aug 28 2008 Joe Orton 0.28.3-2 -- update to 0.28.3 - -* Wed Jun 25 2008 Joe Orton 0.28.2-4 -- rebuild for new GnuTLS - -* Mon Jun 2 2008 Joe Orton 0.28.2-3 -- require ca-certificates package - -* Thu Apr 3 2008 Joe Orton 0.28.2-2 -- update to 0.28.2 - -* Wed Apr 2 2008 Joe Orton 0.28.1-3 -- use the OpenSSL CA bundle - -* Mon Mar 10 2008 Joe Orton 0.28.1-2 -- update to 0.28.1 - -* Tue Feb 26 2008 Joe Orton 0.28.0-3 -- rebuild against pakchois - -* Wed Dec 5 2007 Joe Orton 0.27.2-4 -- trim dependency_libs in .la file - -* Tue Dec 4 2007 Joe Orton 0.27.2-3 -- rebuild against GnuTLS -- drop static library - -* Tue Sep 25 2007 Joe Orton 0.27.2-2 -- update to 0.27.2 - -* Thu Sep 20 2007 Joe Orton 0.27.0-3 -- fix Negotiate response verification - -* Thu Aug 30 2007 Joe Orton 0.27.0-2 -- enable OpenSSL thread-safety hooks - -* Wed Aug 22 2007 Joe Orton 0.27.0-1 -- update to 0.27.0 (#243638) - -* Mon Aug 20 2007 Joe Orton 0.25.5-7 -- fix License - -* Mon Feb 5 2007 Joe Orton 0.25.5-6 -- remove trailing dot in -devel Summary -- use standard BuildRoot -- change Group to System Environment/Libraries -- drop Prefix - -* Wed Jul 12 2006 Jesse Keating - 0.25.5-5.1 -- rebuild - -* Thu Jun 1 2006 Joe Orton 0.25.5-5 -- have -devel require pkgconfig (#193355) - -* Wed May 24 2006 Joe Orton 0.25.5-4 -- add multilib fixes for neon-config (#192734) - -* Wed May 17 2006 Joe Orton 0.25.5-3 -- rebuild - -* Mon Feb 27 2006 Joe Orton 0.25.5-2 -- don't trim exported libraries (#182997) - -* Fri Feb 10 2006 Jesse Keating - 0.25.5-1.2 -- bump again for double-long bug on ppc(64) - -* Tue Feb 07 2006 Jesse Keating - 0.25.5-1.1 -- rebuilt for new gcc4.1 snapshot and glibc changes - -* Tue Jan 31 2006 Joe Orton 0.25.5-1 -- update to 0.25.5 - -* Fri Dec 09 2005 Jesse Keating -- rebuilt - -* Wed Dec 7 2005 Joe Orton 0.24.7-10 -- strip unnecessary exports from .la file/neon-config - -* Tue Nov 8 2005 Tomas Mraz 0.24.7-9 -- rebuilt with new openssl - -* Fri Sep 23 2005 Joe Orton 0.24.7-8 -- restore static libs for rpm - -* Mon Sep 19 2005 Joe Orton 0.24.7-7 -- drop static libs, doc/html from devel docdir - -* Wed Mar 2 2005 Joe Orton 0.24.7-6 -- rebuild - -* Thu Feb 10 2005 Joe Orton 0.24.7-5 -- don't define min() in ne_utils.h (Caolan McNamara, #147228) - -* Tue Oct 12 2004 Joe Orton 0.24.7-4 -- update to GSSAPI code from trunk - -* Fri Jul 23 2004 Joe Orton 0.24.7-3 -- rebuild - -* Tue Jul 20 2004 Joe Orton 0.24.7-2.1 -- rebuild - -* Tue Jul 6 2004 Joe Orton 0.24.7-2 -- devel requires neon of same release, expat-devel (#127330) - -* Mon Jul 5 2004 Joe Orton 0.24.7-1 -- update to 0.24.7 - -* Tue Jun 15 2004 Elliot Lee -- rebuilt - -* Wed May 19 2004 Joe Orton 0.24.6-1 -- update to 0.24.6 - -* Wed Apr 14 2004 Joe Orton 0.24.5-2 -- rebuild - -* Wed Apr 14 2004 Joe Orton 0.24.5-1 -- update to 0.24.5 for CVE CAN-2004-0179 fix - -* Thu Mar 25 2004 Joe Orton 0.24.4-4 -- implement the Negotate auth scheme, and only over SSL - -* Tue Mar 02 2004 Elliot Lee -- rebuilt - -* Wed Feb 25 2004 Joe Orton 0.24.4-3 -- use BuildRequires not BuildPrereq, drop autoconf, libtool; - -devel requires {openssl,zlib}-devel (#116744) - -* Fri Feb 13 2004 Elliot Lee 0.24.4-2 -- rebuilt - -* Mon Feb 9 2004 Joe Orton 0.24.4-1 -- update to 0.24.4 - -* Thu Oct 9 2003 Joe Orton 0.24.3-1 -- update to 0.24.3 - -* Wed Sep 24 2003 Joe Orton 0.24.2-1 -- update to 0.24.2 - -* Tue Jul 22 2003 Nalin Dahyabhai 0.23.9-7 -- rebuild - -* Tue Jun 24 2003 Joe Orton 0.23.9-6 -- never print libdir in --libs output - -* Wed Jun 04 2003 Elliot Lee -- rebuilt - -* Tue Jun 3 2003 Joe Orton 0.23.9-4 -- don't regenerate docs; limit conflict with subversion - -* Wed May 28 2003 Jeff Johnson 0.23.9-3 -- build. - -* Sat May 24 2003 Florian La Roche -- add ldconfig to post/postun - -* Tue May 20 2003 Jeff Johnson 0.23.9-2 -- force expat, include neon-config, for subversion build. -- do "make check" (but ignore failure for now) - -* Mon May 19 2003 Jeff Johnson 0.23.9-1 -- upgrade to 0.23.9. -- avoid xmlto breakage generating man pages for now. - -* Mon Nov 11 2002 Jeff Johnson 0.23.5-2 -- avoid subversion-devel until libxml2 vs. expat is resolved. - -* Sat Nov 9 2002 Jeff Johnson 0.23.5-1 -- Create. diff --git a/CentOS-8/SPECS/pakchois.spec b/CentOS-8/SPECS/pakchois.spec deleted file mode 100644 index 010aab5..0000000 --- a/CentOS-8/SPECS/pakchois.spec +++ /dev/null @@ -1,123 +0,0 @@ -Summary: A wrapper library for PKCS#11 -Name: pakchois -Version: 0.4 -Release: 23%{?dist} -License: LGPLv2+ -URL: http://www.manyfish.co.uk/pakchois/ -Source0: http://www.manyfish.co.uk/pakchois/pakchois-%{version}.tar.gz -BuildRequires: make -BuildRequires: gcc -BuildRequires: gettext - -%description -pakchois is just another PKCS#11 wrapper library. pakchois aims to -provide a thin wrapper over the PKCS#11 interface; offering a -modern object-oriented C interface which does not hide any of the -underlying interface, and avoids dependencies on any cryptography -toolkit. - -%package devel -Summary: Development library and C header files for the pakchois library -Requires: pkgconfig, pakchois = %{version}-%{release} - -%description devel -The development library for the pakchois PKCS#11 wrapper library. - -%prep -%setup -q - -%build -# The module path used here will pick up opensc, coolkey, and -# gnome-keyring, if they are also installed. (the path is not -# checked at build time, so those packages do not need to be BRed) -%define pkcs11_path %{_libdir}/pkcs11:%{_libdir}/gnome-keyring:%{_libdir} -%configure --disable-static \ - --enable-module-path=%{pkcs11_path} -make %{?_smp_mflags} - -%install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT -rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la - -%ldconfig_scriptlets - -%files -%doc AUTHORS NEWS README -%{_libdir}/*.so.* - -%files devel -%dir %{_includedir}/%{name} -%{_includedir}/%{name}/*.h -%{_libdir}/pkgconfig/*.pc -%{_libdir}/*.so - -%changelog -* Tue Jan 26 2021 Fedora Release Engineering - 0.4-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Jul 28 2020 Fedora Release Engineering - 0.4-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jan 29 2020 Fedora Release Engineering - 0.4-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Jul 25 2019 Fedora Release Engineering - 0.4-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Feb 01 2019 Fedora Release Engineering - 0.4-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jul 13 2018 Fedora Release Engineering - 0.4-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu Feb 08 2018 Fedora Release Engineering - 0.4-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 0.4-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 0.4-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 0.4-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu Feb 04 2016 Fedora Release Engineering - 0.4-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Thu Jun 18 2015 Fedora Release Engineering - 0.4-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sun Aug 17 2014 Fedora Release Engineering - 0.4-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Fri Jun 06 2014 Fedora Release Engineering - 0.4-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sat Aug 03 2013 Fedora Release Engineering - 0.4-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu Feb 14 2013 Fedora Release Engineering - 0.4-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Fri Jan 18 2013 Joe Orton - 0.4-7 -- rebuild with dist tag - -* Fri Jul 20 2012 Fedora Release Engineering - 0.4-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Fri Jan 13 2012 Fedora Release Engineering - 0.4-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Feb 08 2011 Fedora Release Engineering - 0.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Sat Jul 25 2009 Fedora Release Engineering - 0.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Thu Feb 26 2009 Fedora Release Engineering - 0.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Wed Feb 13 2008 Joe Orton 0.4-1 -- initial packaging. diff --git a/CentOS-8/SPECS/poco.spec b/CentOS-8/SPECS/poco.spec deleted file mode 100644 index 1f7c40b..0000000 --- a/CentOS-8/SPECS/poco.spec +++ /dev/null @@ -1,726 +0,0 @@ -%global cmake_build_dir cmake-build -%global cmake_debug_dir cmake-debug - -# build without tests on s390 (runs out of memory during linking due the 2 GB address space) -%ifnarch s390 -%bcond_without tests -%endif - -%bcond_without samples - -# mongodb still available only on little endian arches -%ifarch aarch64 %{arm} %{ix86} x86_64 ppc64le -%bcond_without mongodb -%endif - -%if 0%{?fedora} > 27 -%global mysql_devel_pkg mariadb-connector-c-devel -%global mysql_lib_dir %{_libdir}/mariadb -%else -%global mysql_devel_pkg mariadb-devel -%global mysql_lib_dir %{_libdir}/mysql -%endif - -Name: poco -Version: 1.10.1 -Release: 7%{?dist} -Summary: C++ class libraries for network-centric applications - -License: Boost -URL: https://pocoproject.org - -Source0: https://github.com/pocoproject/%{name}/archive/%{name}-%{version}-release.tar.gz#/%{name}-%{version}.tar.gz - -# Disable the tests that will fail under Koji (mostly network) -Patch0: disable-tests.patch -# Generated a new test certificate (the old one uses a weak algorithm which -# is rejected by current OpenSSL) using: -# openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -days 3650 -Patch1: fix-old-test-cert.patch - -BuildRequires: make -BuildRequires: cmake -BuildRequires: gcc-c++ -BuildRequires: openssl-devel -BuildRequires: libiodbc-devel -BuildRequires: %{mysql_devel_pkg} -BuildRequires: libpq-devel -BuildRequires: zlib-devel -BuildRequires: pcre-devel -BuildRequires: sqlite-devel -BuildRequires: expat-devel -BuildRequires: libtool-ltdl-devel - -# We build poco to unbundle as much as possible, but unfortunately, it uses -# some internal functions of pcre so there are a few files from pcre that are -# still bundled. See https://github.com/pocoproject/poco/issues/120. -Provides: bundled(pcre) = 8.35 - -%description -The POCO C++ Libraries (POCO stands for POrtable COmponents) -are open source C++ class libraries that simplify and accelerate the -development of network-centric, portable applications in C++. The -POCO C++ Libraries are built strictly on standard ANSI/ISO C++, -including the standard library. - -%prep -%autosetup -p1 -n %{name}-%{name}-%{version}-release - -/bin/sed -i.orig -e 's|$(INSTALLDIR)/lib\b|$(INSTALLDIR)/%{_lib}|g' Makefile -/bin/sed -i.orig -e 's|ODBCLIBDIR = /usr/lib\b|ODBCLIBDIR = %{_libdir}|g' Data/ODBC/Makefile Data/ODBC/testsuite/Makefile -/bin/sed -i.orig -e 's|flags=""|flags="%{optflags}"|g' configure -/bin/sed -i.orig -e 's|SHAREDOPT_LINK = -Wl,-rpath,$(LIBPATH)|SHAREDOPT_LINK =|g' build/config/Linux -/bin/sed -i.orig -e 's|"Poco/zlib.h"||g' Zip/src/ZipStream.cpp -/bin/sed -i.orig -e 's|PDF|Data/SQLite PDF|' travis/runtests.sh -/bin/sed -i.orig -e 's|#endif|#define POCO_UNBUNDLED 1\n\n#endif|g' Foundation/include/Poco/Config.h - -rm -f Foundation/src/MSG00001.bin -rm -f Foundation/include/Poco/zconf.h -rm -f Foundation/include/Poco/zlib.h -rm -f Foundation/src/adler32.c -rm -f Foundation/src/compress.c -rm -f Foundation/src/crc32.c -rm -f Foundation/src/crc32.h -rm -f Foundation/src/deflate.c -rm -f Foundation/src/deflate.h -rm -f Foundation/src/gzguts.h -rm -f Foundation/src/gzio.c -rm -f Foundation/src/infback.c -rm -f Foundation/src/inffast.c -rm -f Foundation/src/inffast.h -rm -f Foundation/src/inffixed.h -rm -f Foundation/src/inflate.c -rm -f Foundation/src/inflate.h -rm -f Foundation/src/inftrees.c -rm -f Foundation/src/inftrees.h -rm -f Foundation/src/trees.c -rm -f Foundation/src/trees.h -rm -f Foundation/src/zconf.h -rm -f Foundation/src/zlib.h -rm -f Foundation/src/zutil.c -rm -f Foundation/src/zutil.h -# PCRE files that can't be removed due to still being bundled: -# pcre.h pcre_config.h pcre_internal.h pcre_tables.c pcre_ucd.c -rm -f Foundation/src/pcre_byte_order.c -rm -f Foundation/src/pcre_chartables.c -rm -f Foundation/src/pcre_compile.c -rm -f Foundation/src/pcre_config.c -rm -f Foundation/src/pcre_dfa_exec.c -rm -f Foundation/src/pcre_exec.c -rm -f Foundation/src/pcre_fullinfo.c -rm -f Foundation/src/pcre_get.c -rm -f Foundation/src/pcre_globals.c -rm -f Foundation/src/pcre_jit_compile.c -rm -f Foundation/src/pcre_maketables.c -rm -f Foundation/src/pcre_newline.c -rm -f Foundation/src/pcre_ord2utf8.c -rm -f Foundation/src/pcre_refcount.c -rm -f Foundation/src/pcre_string_utils.c -rm -f Foundation/src/pcre_study.c -rm -f Foundation/src/pcre_try_flipped.c -rm -f Foundation/src/pcre_valid_utf8.c -rm -f Foundation/src/pcre_version.c -rm -f Foundation/src/pcre_xclass.c -rm -f Data/SQLite/src/sqlite3.h -rm -f Data/SQLite/src/sqlite3.c -rm -f XML/include/Poco/XML/expat.h -rm -f XML/include/Poco/XML/expat_external.h -rm -f XML/src/ascii.h -rm -f XML/src/asciitab.h -rm -f XML/src/expat_config.h -rm -f XML/src/iasciitab.h -rm -f XML/src/internal.h -rm -f XML/src/latin1tab.h -rm -f XML/src/nametab.h -rm -f XML/src/utf8tab.h -rm -f XML/src/xmlparse.cpp -rm -f XML/src/xmlrole.c -rm -f XML/src/xmlrole.h -rm -f XML/src/xmltok.c -rm -f XML/src/xmltok.h -rm -f XML/src/xmltok_impl.c -rm -f XML/src/xmltok_impl.h -rm -f XML/src/xmltok_ns.c - -%build -%if %{with tests} - %global poco_tests -DENABLE_TESTS=ON -%endif -%if %{without samples} - %global poco_samples --no-samples -%endif -%if %{without mongodb} - %global poco_mongodb -DENABLE_MONGODB=OFF -%endif -%cmake -DPOCO_UNBUNDLED=ON %{?poco_tests} %{?poco_mongodb} -DENABLE_REDIS=OFF -DODBC_INCLUDE_DIR=%{_includedir}/libiodbc -B %{cmake_build_dir} -%make_build -C %{cmake_build_dir} -%cmake -DPOCO_UNBUNDLED=ON %{?poco_tests} %{?poco_mongodb} -DENABLE_REDIS=OFF -DODBC_INCLUDE_DIR=%{_includedir}/libiodbc -DCMAKE_BUILD_TYPE=Debug -B %{cmake_debug_dir} -%make_build -C %{cmake_debug_dir} - -%install -%make_install -C %{cmake_debug_dir} -rm -f %{buildroot}%{_prefix}/include/Poco/Config.h.orig -%make_install -C %{cmake_build_dir} -rm -f %{buildroot}%{_prefix}/include/Poco/Config.h.orig - -%check -%if %{with tests} -export POCO_BASE="$(pwd)" -pushd %{cmake_build_dir} -ctest -V %{?_smp_mflags} -E "MongoDB|Redis|DataMySQL|DataODBC" -popd -%endif - -# ----------------------------------------------------------------------------- -%package foundation -Summary: The Foundation POCO component - -%description foundation -This package contains the Foundation component of POCO. (POCO is a set -of C++ class libraries for network-centric applications.) -%files foundation -%{_libdir}/libPocoFoundation.so.* - - -# ----------------------------------------------------------------------------- -%package xml -Summary: The XML POCO component - -%description xml -This package contains the XML component of POCO. (POCO is a set of C++ -class libraries for network-centric applications.) -%files xml -%{_libdir}/libPocoXML.so.* - -# ----------------------------------------------------------------------------- -%package util -Summary: The Util POCO component - -%description util -This package contains the Util component of POCO. (POCO is a set of C++ -class libraries for network-centric applications.) -%files util -%{_libdir}/libPocoUtil.so.* - -# ----------------------------------------------------------------------------- -%package net -Summary: The Net POCO component - -%description net -This package contains the Net component of POCO. (POCO is a set of C++ -class libraries for network-centric applications.) -%files net -%{_libdir}/libPocoNet.so.* - -# ----------------------------------------------------------------------------- -%package crypto -Summary: The Crypto POCO component - -%description crypto -This package contains the Crypto component of POCO. (POCO is a set of -C++ class libraries for network-centric applications.) -%files crypto -%{_libdir}/libPocoCrypto.so.* - -# ----------------------------------------------------------------------------- -%package netssl -Summary: The NetSSL POCO component - -%description netssl -This package contains the NetSSL component of POCO. (POCO is a set of -C++ class libraries for network-centric applications.) -%files netssl -%{_libdir}/libPocoNetSSL.so.* - -# ----------------------------------------------------------------------------- -%package data -Summary: The Data POCO component - -%description data -This package contains the Data component of POCO. (POCO is a set of -C++ class libraries for network-centric applications.) -%files data -%{_libdir}/libPocoData.so.* - -# ----------------------------------------------------------------------------- -%package sqlite -Summary: The Data/SQLite POCO component - -%description sqlite -This package contains the Data/SQLite component of POCO. (POCO is a set -of C++ class libraries for network-centric applications.) -%files sqlite -%{_libdir}/libPocoDataSQLite.so.* - -# ----------------------------------------------------------------------------- -%package odbc -Summary: The Data/ODBC POCO component - -%description odbc -This package contains the Data/ODBC component of POCO. (POCO is a set -of C++ class libraries for network-centric applications.) -%files odbc -%{_libdir}/libPocoDataODBC.so.* - -# ----------------------------------------------------------------------------- -%package mysql -Summary: The Data/MySQL POCO component - -%description mysql -This package contains the Data/MySQL component of POCO. (POCO is a set -of C++ class libraries for network-centric applications.) -%files mysql -%{_libdir}/libPocoDataMySQL.so.* - -# ----------------------------------------------------------------------------- -%package postgresql -Summary: The Data/PostgreSQL POCO component - -%description postgresql -This package contains the Data/PostgreSQL component of POCO. (POCO is a set -of C++ class libraries for network-centric applications.) -%files postgresql -%{_libdir}/libPocoDataPostgreSQL.so.* - -# ----------------------------------------------------------------------------- -%package zip -Summary: The Zip POCO component - -%description zip -This package contains the Zip component of POCO. (POCO is a set of C++ -class libraries for network-centric applications.) -%files zip -%{_libdir}/libPocoZip.so.* - -# ----------------------------------------------------------------------------- -%package json -Summary: The JSON POCO component - -%description json -This package contains the JSON component of POCO. (POCO is a set of C++ -class libraries for network-centric applications.) -%files json -%{_libdir}/libPocoJSON.so.* - -# ----------------------------------------------------------------------------- -%if %{with mongodb} -%package mongodb -Summary: The MongoDB POCO component - -%description mongodb -This package contains the MongoDB component of POCO. (POCO is a set of C++ -class libraries for network-centric applications.) -%files mongodb -%{_libdir}/libPocoMongoDB.so.* -%endif - -# ----------------------------------------------------------------------------- -%package pagecompiler -Summary: The PageCompiler POCO component - -%description pagecompiler -This package contains the PageCompiler component of POCO. (POCO is a -set of C++ class libraries for network-centric applications.) -%files pagecompiler -%{_bindir}/cpspc -%{_bindir}/f2cpsp - -# ----------------------------------------------------------------------------- -%package encodings -Summary: The Encodings POCO component - -%description encodings -This package contains the Encodings component of POCO. (POCO is a set of C++ -class libraries for network-centric applications.) -%files encodings -%{_libdir}/libPocoEncodings.so.* - -# ----------------------------------------------------------------------------- -%package jwt -Summary: The JWT POCO component - -%description jwt -This package contains the JWT component of POCO. (POCO is a set of C++ -class libraries for network-centric applications.) -%files jwt -%{_libdir}/libPocoJWT.so.* - -# ----------------------------------------------------------------------------- -%package debug -Summary: Debug builds of the POCO libraries - -%description debug -This package contains the debug builds of the POCO libraries for -application testing purposes. -%files debug -%{_libdir}/libPocoFoundationd.so.* -%{_libdir}/libPocoXMLd.so.* -%{_libdir}/libPocoUtild.so.* -%{_libdir}/libPocoNetd.so.* -%{_libdir}/libPocoCryptod.so.* -%{_libdir}/libPocoNetSSLd.so.* -%{_libdir}/libPocoDatad.so.* -%{_libdir}/libPocoDataSQLited.so.* -%{_libdir}/libPocoDataODBCd.so.* -%{_libdir}/libPocoDataMySQLd.so.* -%{_libdir}/libPocoDataPostgreSQLd.so.* -%{_libdir}/libPocoZipd.so.* -%{_libdir}/libPocoJSONd.so.* -%if %{with mongodb} -%{_libdir}/libPocoMongoDBd.so.* -%endif -%{_libdir}/libPocoEncodingsd.so.* -%{_libdir}/libPocoJWTd.so.* - -# ----------------------------------------------------------------------------- -%package devel -Summary: Headers for developing programs that will use POCO - -Requires: poco-debug%{?_isa} = %{version}-%{release} -Requires: poco-foundation%{?_isa} = %{version}-%{release} -Requires: poco-xml%{?_isa} = %{version}-%{release} -Requires: poco-util%{?_isa} = %{version}-%{release} -Requires: poco-net%{?_isa} = %{version}-%{release} -Requires: poco-crypto%{?_isa} = %{version}-%{release} -Requires: poco-netssl%{?_isa} = %{version}-%{release} -Requires: poco-data%{?_isa} = %{version}-%{release} -Requires: poco-sqlite%{?_isa} = %{version}-%{release} -Requires: poco-odbc%{?_isa} = %{version}-%{release} -Requires: poco-mysql%{?_isa} = %{version}-%{release} -Requires: poco-postgresql%{?_isa} = %{version}-%{release} -Requires: poco-zip%{?_isa} = %{version}-%{release} -Requires: poco-json%{?_isa} = %{version}-%{release} -%if %{with mongodb} -Requires: poco-mongodb%{?_isa} = %{version}-%{release} -%endif -Requires: poco-pagecompiler%{?_isa} = %{version}-%{release} -Requires: poco-encodings%{?_isa} = %{version}-%{release} -Requires: poco-jwt%{?_isa} = %{version}-%{release} - -Requires: zlib-devel -Requires: expat-devel -Requires: openssl-devel - -%description devel -The POCO C++ Libraries (POCO stands for POrtable COmponents) -are open source C++ class libraries that simplify and accelerate the -development of network-centric, portable applications in C++. The -POCO C++ Libraries are built strictly on standard ANSI/ISO C++, -including the standard library. - -This package contains the header files needed for developing -POCO applications. - -%files devel -%{_includedir}/Poco -%{_libdir}/libPocoFoundation.so -%{_libdir}/libPocoFoundationd.so -%{_libdir}/libPocoXML.so -%{_libdir}/libPocoXMLd.so -%{_libdir}/libPocoUtil.so -%{_libdir}/libPocoUtild.so -%{_libdir}/libPocoNet.so -%{_libdir}/libPocoNetd.so -%{_libdir}/libPocoCrypto.so -%{_libdir}/libPocoCryptod.so -%{_libdir}/libPocoNetSSL.so -%{_libdir}/libPocoNetSSLd.so -%{_libdir}/libPocoData.so -%{_libdir}/libPocoDatad.so -%{_libdir}/libPocoDataSQLite.so -%{_libdir}/libPocoDataSQLited.so -%{_libdir}/libPocoDataODBC.so -%{_libdir}/libPocoDataODBCd.so -%{_libdir}/libPocoDataMySQL.so -%{_libdir}/libPocoDataMySQLd.so -%{_libdir}/libPocoDataPostgreSQL.so -%{_libdir}/libPocoDataPostgreSQLd.so -%{_libdir}/libPocoZip.so -%{_libdir}/libPocoZipd.so -%{_libdir}/libPocoJSON.so -%{_libdir}/libPocoJSONd.so -%if %{with mongodb} -%{_libdir}/libPocoMongoDB.so -%{_libdir}/libPocoMongoDBd.so -%endif -%{_libdir}/libPocoEncodings.so -%{_libdir}/libPocoEncodingsd.so -%{_libdir}/libPocoJWT.so -%{_libdir}/libPocoJWTd.so -%{_libdir}/cmake/Poco - -# ----------------------------------------------------------------------------- -%package doc -Summary: The POCO API reference documentation - -%description doc -The POCO C++ Libraries (POCO stands for POrtable COmponents) -are open source C++ class libraries that simplify and accelerate the -development of network-centric, portable applications in C++. The -POCO C++ Libraries are built strictly on standard ANSI/ISO C++, -including the standard library. - -This is the complete POCO class library reference documentation in -HTML format. - -%files doc -%doc README NEWS LICENSE CONTRIBUTORS CHANGELOG doc/* - -%changelog -* Wed Mar 16 2022 Sandino Araico Sánchez - 1.10.1-7 -- PostgreSQL package - -* Wed Mar 09 2022 Sandino Araico Sánchez - 1.10.1-6 -- Compile on CentOS 8 with mariadb - -* Wed Jan 27 2021 Fedora Release Engineering - 1.10.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Sat Aug 01 2020 Fedora Release Engineering - 1.10.1-3 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Thu Jul 30 2020 Scott Talbert - 1.10.1-4 -- Adapt to cmake out-of-source build changes -- Replace old SSL testsuite cert which was rejected by OpenSSL (#1865242) - -* Tue Jul 28 2020 Fedora Release Engineering - 1.10.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Feb 18 2020 Scott Talbert - 1.10.1-1 -- Update to new upstream release 1.10.1 (#1803758) - -* Thu Feb 06 2020 Scott Talbert - 1.10.0-1 -- Update to new upstream release 1.10.0 (#1795299) - -* Thu Jan 30 2020 Fedora Release Engineering - 1.9.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Sep 19 2019 Scott Talbert - 1.9.4-1 -- Update to new upstream release 1.9.4 (#1753136) - -* Wed Aug 21 2019 Scott Talbert - 1.9.3-1 -- Update to new upstream release 1.9.3 (#1743851) - -* Mon Aug 05 2019 Scott Talbert - 1.9.2-1 -- Update to new upstream release 1.9.2 - -* Fri Jul 26 2019 Fedora Release Engineering - 1.9.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sat Feb 02 2019 Fedora Release Engineering - 1.9.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Tue Aug 28 2018 Scott Talbert - 1.9.0-4 -- Switch build to use cmake and include cmake files (#1587836) - -* Fri Jul 13 2018 Fedora Release Engineering - 1.9.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Jun 29 2018 Scott Talbert - 1.9.0-2 -- Remove ldconfig scriptlets (no longer needed on F28+) - -* Tue Mar 13 2018 Scott Talbert - 1.9.0-1 -- New upstream release 1.9.0 -- Add subpackage for new Encodings component - -* Mon Feb 19 2018 Scott Talbert - 1.8.1-3 -- Add missing BR for gcc-c++ - -* Fri Feb 09 2018 Fedora Release Engineering - 1.8.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Jan 11 2018 Scott Talbert - 1.8.1-1 -- New upstream release 1.8.1 -- Remove patches that have been incorporated upstream - -* Thu Nov 16 2017 Scott Talbert - 1.8.0.1-1 -- New upstream release 1.8.0.1 - -* Tue Nov 14 2017 Scott Talbert - 1.8.0-1 -- New upstream release 1.8.0 - -* Wed Nov 08 2017 Scott Talbert - 1.7.9p2-1 -- New upstream release 1.7.9p2 - -* Fri Sep 22 2017 Scott Talbert - 1.7.9-2 -- Switch from mysql-devel to mariadb-connector-c-devel (#1493654) - -* Tue Sep 12 2017 Scott Talbert - 1.7.9-1 -- New upstream release 1.7.9 - -* Thu Jul 27 2017 Fedora Release Engineering - 1.7.8p3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Wed Jun 28 2017 Scott Talbert - 1.7.8p3-1 -- New upstream release 1.7.8p3 - -* Thu May 25 2017 Scott Talbert - 1.7.8p2-3 -- Add patch from upstream to resolve s390x build failures - -* Tue May 23 2017 Scott Talbert - 1.7.8p2-2 -- Add openssl-devel as a dependency of poco-devel (#1454462) - -* Mon May 08 2017 Scott Talbert - 1.7.8p2-1 -- New upstream release 1.7.8p2 - -* Sun Feb 19 2017 Francis ANDRE - 1.7.7-2 -- Add ignored-tests.patch to ignore failing tests on ppce and armv7hl - -* Sat Feb 18 2017 Scott Talbert - 1.7.7-1 -- New upstream release 1.7.7 - -* Sat Feb 11 2017 Fedora Release Engineering - 1.7.3-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu Jun 23 2016 Francis ANDRE - 1.7.3-5 -- Restore POCO_UNBUNDLED definition in Foundation/include/Poco/Config.h -so that user's code compiles without having to define POCO_UNBUNDLED. - -* Wed Jun 22 2016 Francis ANDRE - 1.7.3-4 -- Restore POCO_UNBUNDLED definition in Foundation/include/Poco/Config.h - -* Fri May 27 2016 Francis ANDRE - 1.7.3-3 -- Restore removal of bundled sources - -* Thu May 26 2016 Francis ANDRE - 1.7.3-3 -- Exclude Data/SQLite from testing. - - Wed May 25 2016 Dan Horák - 1.7.3-2 -- conditionalize mongodb support - -* Sat May 14 2016 Francis ANDRE - 1.7.3-1 -- New upstream release 1.7.3 - -* Mon Mar 28 2016 Scott Talbert - 1.7.2-1 -- New upstream release 1.7.2 - -* Sun Mar 20 2016 Scott Talbert - 1.7.1-1 -- New upstream release 1.7.1 -- Remove patches that have been incorporated upstream - -* Thu Feb 04 2016 Scott Talbert - 1.6.1-2 -- Add patch for SQLite on EL7 -- Add patch for PPC64LE - -* Sat Jan 30 2016 Scott Talbert - 1.6.1-1 -- New upstream release 1.6.1 (#917362) -- Removed AArch64 patch as it has been incorporated upstream -- Removed superfluous %%defattrs -- Add patches to fix partial PCRE unbundling issues -- Add patch to fix sample linking issues with JSON library -- Enable running of tests in %%check -- Add JSON and MongoDB subpackages - -* Thu Jun 18 2015 Fedora Release Engineering - 1.4.2p1-2.10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat May 02 2015 Kalev Lember - 1.4.2p1-2.9 -- Rebuilt for GCC 5 C++11 ABI change - -* Sun Aug 17 2014 Fedora Release Engineering - 1.4.2p1-2.8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Tue Jul 08 2014 Yaakov Selkowitz - 1.4.2p1-2.7 -- Add support for AArch64 - -* Sat Jun 07 2014 Fedora Release Engineering - 1.4.2p1-2.6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun Aug 04 2013 Fedora Release Engineering - 1.4.2p1-2.5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sat Jul 21 2012 Fedora Release Engineering - 1.4.2p1-2.3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Fri Feb 10 2012 Petr Pisar - 1.4.2p1-2.2 -- Rebuild against PCRE 8.30 - -* Sat Jan 14 2012 Fedora Release Engineering - 1.4.2p1-2.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Sun Dec 18 2011 Dan Horák - 1.4.p1-2 -- build without tests on s390 - -* Wed Sep 28 2011 Maxim Udushlivy - 1.4.2p1-1 -- Updated for POCO 1.4.2p1. Obsoleted .spec directives were removed. - -* Wed Mar 23 2011 Dan Horák - 1.4.1p1-1.1 -- rebuilt for mysql 5.5.10 (soname bump in libmysqlclient) - -* Thu Feb 10 2011 Maxim Udushlivy - 1.4.1p1-1 -- Updated for POCO 1.4.1p1. - -* Wed Feb 09 2011 Fedora Release Engineering - 1.4.1-1.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Tue Feb 01 2011 Maxim Udushlivy - 1.4.1-1 -- Updated for POCO 1.4.1. - -* Fri Jan 21 2011 Maxim Udushlivy - 1.4.0-1 -- Updated for POCO 1.4.0. The "syslibs" patch was removed. -- This release enables a small part of the PCRE library to be -compiled-in, which is unavoidable since POCO uses some internal PCRE -functions for Unicode classification and manipulation. - -* Wed Jun 02 2010 Maxim Udushlivy - 1.3.6p2-2 -- Missing dependencies on system header files were fixed. -- Options were added to build POCO without tests and samples. - -* Fri May 07 2010 Maxim Udushlivy - 1.3.6p2-1 -- The package was upgraded for the use of POCO version 1.3.6p2. - -* Wed Dec 23 2009 Maxim Udushlivy - 1.3.6p1-1 -- The package was upgraded for the use of POCO version 1.3.6p1. -- A new binary package (poco-pagecompiler) is now produced by the -rpmbuild process. -- The syslibs patch was considerably simplified (based on a new -"configure" script option which was introduced by POCO developers for -the maintainers of the POCO Debian package). - -* Tue Nov 17 2009 Maxim Udushlivy - 1.3.5-8 -- The "make" invocation command in the %%build section was modified to -skip premature symbol stripping from retail libraries. - -* Mon Nov 16 2009 Maxim Udushlivy - 1.3.5-7 -- A removal of the "Foundation/src/MSG00001.bin" binary file was added -to the "%%prep" section. -- Values for the top "Summary", "Group" and "%%description" were -restored. -- A "BuildRoot" tag was added. - -* Fri Nov 13 2009 Maxim Udushlivy - 1.3.5-6 -- The generation of the "poco" metapackage is now suppressed. -- A comment for the patch was added. -- The usage of %% symbol in the %%changelog section was fixed. - -* Wed Nov 11 2009 Maxim Udushlivy - 1.3.5-5 -- A patch "poco-1.3.5-syslibs.patch" was added. The build process now -does not use bundled versions of the system libraries (zlib, pcre, -sqlite and expat). - -* Fri Nov 06 2009 Maxim Udushlivy - 1.3.5-4 -- The name of "poco-testing" subpackage was reverted to "poco-debug". -- The "Release" field was fixed to use "%%{?dist}". -- The ".*DS_Store" files removal was moved to the %%prep section. -- Fedora compilation flags (%%{optflags}) are now injected into the -"configure" script. - -* Wed Nov 04 2009 Maxim Udushlivy - 1.3.5-3 -- Each POCO component is now put in its own binary package. The "poco" -package is now a meta package. -- Option "-s" was removed from the "make" invocation commands. -- "perl" was replaced by "sed" for string substitutions in Makefile's. - -* Tue Jun 23 2009 Maxim Udushlivy - 1.3.5-2 -- The "poco-extra" subpackage was split into separate "poco-odbc", -"poco-mysql" and "poco-zip". -- The "poco-debug" subpackage was renamed to "poco-testing". -- The "poco-doc" subpackage with the API reference documentation -was added. - -* Sat Jun 20 2009 Maxim Udushlivy - 1.3.5-1 -- The first version. - diff --git a/CentOS-8/SPECS/ucpp.spec b/CentOS-8/SPECS/ucpp.spec deleted file mode 100644 index 212733d..0000000 --- a/CentOS-8/SPECS/ucpp.spec +++ /dev/null @@ -1,117 +0,0 @@ -Summary: Embeddable, quick, light and fully compliant ISO C99 preprocessor -Name: ucpp -Version: 1.3.4 -Release: 11%{?dist} -URL: https://github.com/scarabeusiv/ucpp -Source0: http://dev.gentooexperimental.org/%7Escarabeus/ucpp-%{version}.tar.xz -License: BSD -# fix rpath issue -BuildRequires: libtool -Requires: %{name}-libs%{?_isa} = %{version}-%{release} - -%description -A C preprocessor is a part of a C compiler responsible for macro replacement, -conditional compilation and inclusion of header files. It is often found as -a stand-alone program on Unix systems. - -ucpp is such a preprocessor; it is designed to be quick and light, but anyway -fully compliant to the ISO standard 9899:1999, also known as C99. ucpp can be -compiled as a stand-alone program, or linked to some other code; in the latter -case, ucpp will output tokens, one at a time, on demand, as an integrated lexer. - -%package libs -Summary: Library for preprocessing C code compliant with ISO-C99 - -%description libs -libucpp is an ISO standard 9899:1999 compliant preprocessing library for C -code. It will output tokens, one at a time, on demand, as an integrated lexer. - -%package devel -Summary: Development files for libucpp Library -Requires: %{name}-libs%{?_isa} = %{version}-%{release} - -%description devel -libucpp is an ISO standard 9899:1999 compliant preprocessing library for C -code. It will output tokens, one at a time, on demand, as an integrated lexer. - -This package contains the development files for the library. - -%prep -%setup -q -# convert README to UTF-8 -iconv -f iso8859-1 -t utf8 README >README.utf8 && \ - touch -r README.utf8 README && \ - mv README.utf8 README -# autoreconf to fix rpath issue -autoreconf -vif - -%build -%configure \ - --disable-rpath \ - --disable-silent-rules \ - --disable-static \ - -make %{?_smp_mflags} - -%install -make DESTDIR=%{buildroot} install -rm %{buildroot}%{_libdir}/libucpp.la - -%post libs -p /sbin/ldconfig - -%postun libs -p /sbin/ldconfig - -%files -%{_bindir}/ucpp -%{_mandir}/man1/ucpp.1* - -%files libs -%doc AUTHORS ChangeLog* COPYING README -%{_libdir}/libucpp.so.* - -%files devel -%{_includedir}/libucpp -%{_libdir}/libucpp.so -%{_libdir}/pkgconfig/libucpp.pc - -%changelog -* Fri Feb 09 2018 Fedora Release Engineering - 1.3.4-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 1.3.4-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 1.3.4-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 1.3.4-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Feb 05 2016 Fedora Release Engineering - 1.3.4-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 1.3.4-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Aug 18 2014 Fedora Release Engineering - 1.3.4-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 1.3.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sat Feb 22 2014 Dominik Mierzejewski 1.3.4-3 -- add ?_isa to dependencies - -* Sun Nov 03 2013 Dominik Mierzejewski 1.3.4-2 -- make make verbose -- run ldconfig for libs -- convert README to UTF-8 - -* Wed Oct 30 2013 Dominik Mierzejewski 1.3.4-1 -- switch to new upstream -- update to 1.3.4 -- split libs and devel subpackages -- call autoreconf to fix rpath issue - -* Thu Oct 17 2013 Dominik Mierzejewski 1.3.2-1 -- initial build diff --git a/CentOS-8/SPECS/xmlsec1.spec b/CentOS-8/SPECS/xmlsec1.spec deleted file mode 100644 index d9e4756..0000000 --- a/CentOS-8/SPECS/xmlsec1.spec +++ /dev/null @@ -1,369 +0,0 @@ -Summary: Library providing support for "XML Signature" and "XML Encryption" standards -Name: xmlsec1 -Version: 1.2.33 -Release: 1%{?dist}%{?extra_release} -License: MIT -Source0: http://www.aleksey.com/xmlsec/download/xmlsec1-%{version}.tar.gz -URL: http://www.aleksey.com/xmlsec/ -BuildRequires: pkgconfig(libxml-2.0) >= 2.8.0 -BuildRequires: pkgconfig(libxslt) >= 1.0.20 -BuildRequires: pkgconfig(openssl) >= 1.0.0 -BuildRequires: pkgconfig(nss) >= 3.11.1 -BuildRequires: pkgconfig(nspr) >= 4.4.1 -BuildRequires: libgcrypt-devel >= 1.4.0 -BuildRequires: pkgconfig(gnutls) >= 2.8.0 -BuildRequires: libtool-ltdl-devel -# autoreconf stuff -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: gettext-devel -BuildRequires: libtool - -%description -XML Security Library is a C library based on LibXML2 and OpenSSL. -The library was created with a goal to support major XML security -standards "XML Digital Signature" and "XML Encryption". - -%package devel -Summary: Libraries, includes, etc. to develop applications with XML Digital Signatures and XML Encryption support. -Requires: xmlsec1%{?_isa} = %{version}-%{release} -Requires: openssl-devel%{?_isa} >= 1.0.0 - -%description devel -Libraries, includes, etc. you can use to develop applications with XML Digital -Signatures and XML Encryption support. - -%package openssl -Summary: OpenSSL crypto plugin for XML Security Library -Requires: xmlsec1%{?_isa} = %{version}-%{release} - -%description openssl -OpenSSL plugin for XML Security Library provides OpenSSL based crypto services -for the xmlsec library. - -%package openssl-devel -Summary: OpenSSL crypto plugin for XML Security Library -Requires: xmlsec1-devel%{?_isa} = %{version}-%{release} -Requires: xmlsec1-openssl%{?_isa} = %{version}-%{release} - -%description openssl-devel -Libraries, includes, etc. for developing XML Security applications with OpenSSL - -%package gcrypt -Summary: GCrypt crypto plugin for XML Security Library -Requires: xmlsec1%{?_isa} = %{version}-%{release} - -%description gcrypt -GCrypt plugin for XML Security Library provides GCrypt based crypto services -for the xmlsec library. - -%package gcrypt-devel -Summary: GCrypt crypto plugin for XML Security Library -Requires: xmlsec1-devel%{?_isa} = %{version}-%{release} -Requires: xmlsec1-gnutls-devel%{?_isa} = %{version}-%{release} - -%description gcrypt-devel -Libraries, includes, etc. for developing XML Security applications with GCrypt. - -%package gnutls -Summary: GNUTls crypto plugin for XML Security Library -Requires: xmlsec1%{?_isa} = %{version}-%{release} - -%description gnutls -GNUTls plugin for XML Security Library provides GNUTls based crypto services -for the xmlsec library. - -%package gnutls-devel -Summary: GNUTls crypto plugin for XML Security Library -Requires: xmlsec1-devel%{?_isa} = %{version}-%{release} -Requires: xmlsec1-openssl-devel%{?_isa} = %{version}-%{release} -Requires: libgcrypt-devel%{?_isa} >= 1.2.0 -Requires: gnutls-devel%{?_isa} >= 1.0.20 - -%description gnutls-devel -Libraries, includes, etc. for developing XML Security applications with GNUTls. - -%package nss -Summary: NSS crypto plugin for XML Security Library -Requires: xmlsec1%{?_isa} = %{version}-%{release} - -%description nss -NSS plugin for XML Security Library provides NSS based crypto services -for the xmlsec library - -%package nss-devel -Summary: NSS crypto plugin for XML Security Library -Requires: xmlsec1-devel%{?_isa} = %{version}-%{release} -Requires: xmlsec1-nss%{?_isa} = %{version}-%{release} - -%description nss-devel -Libraries, includes, etc. for developing XML Security applications with NSS. - -%prep -%setup -q - -%build -autoreconf -vfi -%configure --disable-static -sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool -sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool -%make_build V=1 - -# positively ugly but only sane way to get around #192756 -sed 's+/lib64+/$archlib+g' < xmlsec1-config | sed 's+/lib+/$archlib+g' | sed 's+ -DXMLSEC_NO_SIZE_T++' > xmlsec1-config.$$ && mv xmlsec1-config.$$ xmlsec1-config - -%install -%make_install -rm -vf %{buildroot}%{_libdir}/*.la - -# move installed docs to include them in -devel package via %%doc magic -rm -rf __tmp_doc ; mkdir __tmp_doc -mv %{buildroot}%{_docdir}/xmlsec1/* __tmp_doc - -%ldconfig_scriptlets -%ldconfig_scriptlets gnutls -%ldconfig_scriptlets openssl - -%files -%doc AUTHORS ChangeLog NEWS README Copyright -%{_mandir}/man1/xmlsec1.1* -%{_libdir}/libxmlsec1.so.* -%{_bindir}/xmlsec1 - -%files devel -%{_bindir}/xmlsec1-config -%dir %{_includedir}/xmlsec1 -%dir %{_includedir}/xmlsec1/xmlsec -#%dir %{_includedir}/xmlsec1/xmlsec/private -%{_includedir}/xmlsec1/xmlsec/*.h -#%{_includedir}/xmlsec1/xmlsec/private/*.h -%{_libdir}/libxmlsec1.so -%{_libdir}/pkgconfig/xmlsec1.pc -%{_libdir}/xmlsec1Conf.sh -%{_datadir}/aclocal/xmlsec1.m4 -%{_mandir}/man1/xmlsec1-config.1* -%doc HACKING __tmp_doc/* - -%files openssl -%{_libdir}/libxmlsec1-openssl.so.* -%{_libdir}/libxmlsec1-openssl.so - -%files openssl-devel -%{_includedir}/xmlsec1/xmlsec/openssl/ -%{_libdir}/pkgconfig/xmlsec1-openssl.pc - -%files gcrypt -%{_libdir}/libxmlsec1-gcrypt.so.* -%{_libdir}/libxmlsec1-gcrypt.so - -%files gcrypt-devel -%{_includedir}/xmlsec1/xmlsec/gcrypt/ -%{_libdir}/pkgconfig/xmlsec1-gcrypt.pc - -%files gnutls -%{_libdir}/libxmlsec1-gnutls.so.* -%{_libdir}/libxmlsec1-gnutls.so - -%files gnutls-devel -%{_includedir}/xmlsec1/xmlsec/gnutls/ -%{_libdir}/pkgconfig/xmlsec1-gnutls.pc - -%files nss -%{_libdir}/libxmlsec1-nss.so.* -%{_libdir}/libxmlsec1-nss.so - -%files nss-devel -%{_includedir}/xmlsec1/xmlsec/nss/ -%{_libdir}/pkgconfig/xmlsec1-nss.pc - -%changelog -* Mon Mar 07 2022 Sandino Araico Sánchez - 1.2.33-1 -- Version bumb to 1.2.33 - -* Thu Apr 12 2018 John Dennis - 1.2.25-4 -- Resolves: rhbz#1566748 - xmlSecOpenSSLX509DataNodeRead fails to return error - -* Fri Feb 09 2018 Fedora Release Engineering - 1.2.25-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Jan 31 2018 Igor Gnatenko - 1.2.25-2 -- Switch to %%ldconfig_scriptlets - -* Wed Nov 08 2017 Igor Gnatenko - 1.2.25-1 -- Update to 1.2.25 - -* Thu Aug 03 2017 Fedora Release Engineering - 1.2.23-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 1.2.23-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 1.2.23-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Mon Oct 17 2016 Simo Sorce - 1.2.23-1 -- New Upstream relase 1.2.23 -- Adds compatibility for OpenSSL 1.1.0 - -* Fri Feb 05 2016 Fedora Release Engineering - 1.2.20-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 1.2.20-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Fri Sep 19 2014 Simo Sorce - 1.2.20-1 -- Update to new upstream release 1.2.20 -- This release fixes a number of miscellaneous bugs and updates expired or - soon-to-be-expired certificates in the test suite. -- Also drops the no-ecdsa patch - -* Mon Aug 18 2014 Fedora Release Engineering - 1.2.19-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 1.2.19-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Thu Apr 24 2014 Tomáš Mráz - 1.2.19-4 -- Rebuild for new libgcrypt - -* Fri Dec 13 2013 Michael Schwendt - 1.2.19-3 -- Fix duplicate documentation (#1001250) -- Turn on verbose build output via V=1 make -- Use %%?_isa in explicit package deps -- Fix base package Group tag to "System Environment/Libraries" -- Remove %%defattr - -* Sun Aug 04 2013 Fedora Release Engineering - 1.2.19-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Mon Mar 25 2013 Daniel Veillard - 1.2.19-1 -- Update to upstream release 1.2.19 - -* Fri Feb 15 2013 Fedora Release Engineering - 1.2.18-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sun Jul 22 2012 Fedora Release Engineering - 1.2.18-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jan 14 2012 Fedora Release Engineering - 1.2.18-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Thu May 12 2011 Daniel Veillard - 1.2.18-1 -- Update to upstream release 1.2.18 - -* Mon Apr 11 2011 Daniel Veillard - 1.2.17-1 -- Update to upstream release 1.2.17 -- fixes CVE-2011-1425 on xslt file creation - -* Tue Mar 22 2011 Daniel Veillard - 1.2.16-4 -- Fix missing links to unversioned shared library files 541599 - -* Mon Feb 07 2011 Fedora Release Engineering - 1.2.16-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Wed Jun 2 2010 Tom "spot" Callaway - 1.2.16-2 -- add missing BuildRequires: libtool-ltdl-devel - -* Wed Jun 2 2010 Tom "spot" Callaway - 1.2.16-1 -- update to 1.2.16 -- cleanup spec file -- disable static libs -- disable rpath -- enable gcrypt subpackage - -* Wed Aug 26 2009 Tomas Mraz - 1.2.12-2 -- rebuilt with new openssl - -* Tue Aug 11 2009 Daniel Veillard - 1.2.12-1 -- update to new upstream release 1.2.12 -- includes fix for CVE-2009-0217 -- cleanup spec file - -* Mon Jul 27 2009 Fedora Release Engineering - 1.2.11-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Thu Feb 26 2009 Fedora Release Engineering - 1.2.11-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Sun Jan 18 2009 Tomas Mraz - 1.2.11-2 -- rebuild with new openssl - -* Fri Jul 11 2008 Daniel Veillard - 1.2.11-1 -- update to new upstream release 1.2.11 -- rebuild for gnutls update - -* Wed Feb 20 2008 Fedora Release Engineering - 1.2.9-10.1 -- Autorebuild for GCC 4.3 - -* Wed Dec 05 2007 Release Engineering - 1.2.9-9 - - Rebuild for deps - -* Wed Jul 12 2006 Jesse Keating - 1.2.9-8.1 -- rebuild - -* Wed Jun 14 2006 Tomas Mraz - 1.2.9-8 -- rebuilt with new gnutls - -* Thu Jun 8 2006 Daniel Veillard - 1.2.9-7 -- oops libxmlsec1.la was still there, should fix #171410 and #154142 - -* Thu Jun 8 2006 Daniel Veillard - 1.2.9-6 -- Ugly patch and sed based changes to work around #192756 xmlsec1-config - multilib problem - -* Wed Jun 7 2006 Jeremy Katz - 1.2.9-5 -- move .so symlinks to -devel subpackage - -* Fri Feb 10 2006 Jesse Keating - 1.2.9-4.2 -- bump again for double-long bug on ppc(64) - -* Tue Feb 07 2006 Jesse Keating - 1.2.9-4.1 -- rebuilt for new gcc4.1 snapshot and glibc changes - -* Thu Dec 15 2005 Christopher Aillon 1.2.9-4 -- NSS has been split out of the mozilla package, so require that now - and update separate_nspr.patch to account for the new NSS as well - -* Fri Dec 09 2005 Jesse Keating -- rebuilt - -* Wed Nov 23 2005 Tomas Mraz 1.2.9-3 -- rebuilt due to gnutls library revision -* Wed Nov 9 2005 1.2.9-2 -- rebuilt due to openssl library revision -* Tue Sep 20 2005 1.2.9-1 -- update from upstream, release done in July -- apparently nss is now available on ppc64 -* Mon Aug 8 2005 1.2.8-3 -- rebuilt with new gnutls -- nspr has been split to a separate package -* Fri Jul 8 2005 Daniel Veillard 1.2.8-2 -- Enabling the mozilla-nss crypto backend -* Fri Jul 8 2005 Daniel Veillard 1.2.8-1 -- update from upstream, needed for openoffice -* Tue Mar 8 2005 Daniel Veillard 1.2.7-4 -- rebuilt with gcc4 -* Wed Feb 23 2005 Daniel Veillard 1.2.7-1 -- Upstream release of 1.2.7, mostly bug fixes plus new functions - to GetKeys from simple store and X509 handling. -* Wed Feb 9 2005 Daniel Veillard 1.2.6-4 -- Adding support for GNUTls crypto backend -* Wed Sep 1 2004 Daniel Veillard 1.2.6-3 -- adding missing ldconfig calls -* Thu Aug 26 2004 Daniel Veillard 1.2.6-2 -- updated with upstream release from Aleksey -* Mon Jun 21 2004 Daniel Veillard 1.2.5-2 -- rebuilt -* Mon Apr 19 2004 Daniel Veillard 1.2.5-1 -- updated with upstream release from Aleksey -* Wed Feb 11 2004 Daniel Veillard 1.2.4-1 -- updated with upstream release from Aleksey -* Tue Jan 6 2004 Daniel Veillard 1.2.3-1 -- updated with upstream release from Aleksey -* Wed Nov 12 2003 Daniel Veillard 1.2.2-1 -- updated with upstream release from Aleksey, specific patches should - have been integrated now. -* Thu Nov 6 2003 Daniel Veillard 1.2.1-1 -- initial packaging based on the upstream one and libxml2 one. -- desactivated mozilla-nss due to detection/architecture problems diff --git a/CentOS-8/SPECS/zxing-cpp.spec b/CentOS-8/SPECS/zxing-cpp.spec deleted file mode 100644 index aac107e..0000000 --- a/CentOS-8/SPECS/zxing-cpp.spec +++ /dev/null @@ -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 1.2.0-1 -- initial import diff --git a/Fedora-38 b/Fedora-38 deleted file mode 120000 index 023c254..0000000 --- a/Fedora-38 +++ /dev/null @@ -1 +0,0 @@ -CentOS-9 \ No newline at end of file From aeb2e407f18cfa3805dcbaa0a8ff1beaa297195a Mon Sep 17 00:00:00 2001 From: Sandino Araico Sanchez Date: Fri, 21 Jun 2024 19:15:44 -0600 Subject: [PATCH 07/19] removed old link Fedora-38 --- Fedora-38 | 1 - 1 file changed, 1 deletion(-) delete mode 120000 Fedora-38 diff --git a/Fedora-38 b/Fedora-38 deleted file mode 120000 index 8dcc934..0000000 --- a/Fedora-38 +++ /dev/null @@ -1 +0,0 @@ -rpmbuild \ No newline at end of file From 0888337fc2cf48a9241dcc655be4796ea32cfa5d Mon Sep 17 00:00:00 2001 From: Sandino Araico Sanchez Date: Fri, 21 Jun 2024 19:21:34 -0600 Subject: [PATCH 08/19] rebuild --- rpmbuild/SPECS/libreoffice.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rpmbuild/SPECS/libreoffice.spec b/rpmbuild/SPECS/libreoffice.spec index 5d8143c..993850d 100644 --- a/rpmbuild/SPECS/libreoffice.spec +++ b/rpmbuild/SPECS/libreoffice.spec @@ -87,7 +87,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.2 -Release: 6+gob.mx1.2 +Release: 9+gob.mx1.2%{?dist} # default new files are: MPLv2 # older files are typically: MPLv2 incorporating work under ASLv2 @@ -2879,6 +2879,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || : %{_includedir}/LibreOfficeKit %changelog +* Fri Jun 21 2024 Sandino Araico Sánchez - 1:24.2.1.2-9+gob.mx1.2 +- Rebuild + * Thu Mar 28 2024 Sandino Araico Sánchez - 1:24.2.1.2-6+gob.mx1.2 - Patchset gob.mx 1.2 From dade916eb0e3d654d626276e5fbdbc4c5e50a098 Mon Sep 17 00:00:00 2001 From: Sandino Araico Sanchez Date: Mon, 24 Jun 2024 20:59:17 -0600 Subject: [PATCH 09/19] 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 From 3f9c1aba3d5d41b441b0406c9e2ce9dcd230326d Mon Sep 17 00:00:00 2001 From: Sandino Araico Sanchez Date: Mon, 24 Jun 2024 21:01:02 -0600 Subject: [PATCH 10/19] Llave con la que viene firmado el patchset --- rpmbuild/SOURCES/ed25519.key.asc | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 rpmbuild/SOURCES/ed25519.key.asc diff --git a/rpmbuild/SOURCES/ed25519.key.asc b/rpmbuild/SOURCES/ed25519.key.asc new file mode 100644 index 0000000..2d5e010 --- /dev/null +++ b/rpmbuild/SOURCES/ed25519.key.asc @@ -0,0 +1,14 @@ +-----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----- From e04b01fd8962758f74f4cbe53887a37c84235bd9 Mon Sep 17 00:00:00 2001 From: Sandino Araico Sanchez Date: Mon, 24 Jun 2024 21:15:47 -0600 Subject: [PATCH 11/19] Minor version bump to libreoffice 24.2.2.2 --- rpmbuild/SPECS/libreoffice.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/rpmbuild/SPECS/libreoffice.spec b/rpmbuild/SPECS/libreoffice.spec index c9f9505..fa0535b 100644 --- a/rpmbuild/SPECS/libreoffice.spec +++ b/rpmbuild/SPECS/libreoffice.spec @@ -77,8 +77,8 @@ ExcludeArch: %{ix86} Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 -Version: %{libo_version}.1 -Release: 4+gob.mx1.2%{?dist} +Version: %{libo_version}.2 +Release: 5+gob.mx1.2%{?dist} # default new files are: MPLv2 # older files are typically: MPLv2 incorporating work under ASLv2 @@ -2873,9 +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 +* Mon Jun 24 2024 Sandino Araico Sánchez - 1:24.2.2.2-5+gob.mx1.2 - Added NotoKufiArabic-v2.109.zip to sources - Updated gob.mx 1.2 patchset +- Minor version bump to libreoffice 24.2.2.2 * Sat Jun 22 2024 Sandino Araico Sánchez - 1:24.2.2.1-3+gob.mx1.2 - merge 24.2.2.1.fc40 From c664adda67e384689c70cb38adb57acded057429 Mon Sep 17 00:00:00 2001 From: Sandino Araico Sanchez Date: Mon, 24 Jun 2024 21:35:21 -0600 Subject: [PATCH 12/19] Temporarily disabled patch for kf6 scaling --- rpmbuild/SPECS/libreoffice.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rpmbuild/SPECS/libreoffice.spec b/rpmbuild/SPECS/libreoffice.spec index fa0535b..f954f1b 100644 --- a/rpmbuild/SPECS/libreoffice.spec +++ b/rpmbuild/SPECS/libreoffice.spec @@ -365,7 +365,7 @@ Patch11: lo-7.6-ppc64le-tests.patch # https://bugs.documentfoundation.org/show_bug.cgi?id=158108 Patch12: libreoffice-7.5.8.2-icu-74-compatibility.patch # Patch for kf6 scaling. -Patch13: 86abb6fd8a8f680f9fc5ff1db775845c9f4e254b.patch +#Patch13: 86abb6fd8a8f680f9fc5ff1db775845c9f4e254b.patch # Parches gob.mx 1.2 Patch21: 0001-Archivos-de-distro-config-de-brand-Office.patch @@ -2874,6 +2874,7 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || : %changelog * Mon Jun 24 2024 Sandino Araico Sánchez - 1:24.2.2.2-5+gob.mx1.2 +- Temporarily disabled patch for kf6 scaling - Added NotoKufiArabic-v2.109.zip to sources - Updated gob.mx 1.2 patchset - Minor version bump to libreoffice 24.2.2.2 From 0b8497aa8c1cd641e294a3e271bd3c2875950f1b Mon Sep 17 00:00:00 2001 From: Sandino Araico Sanchez Date: Tue, 25 Jun 2024 03:11:29 -0600 Subject: [PATCH 13/19] Patchset gob.mx 1.3 --- ...vos-de-distro-config-de-brand-Office.patch | 62 - .../0001-cui-fix-without-java-build.patch | 41 - ...icacion-al-build-y-borrado-UPDATEURL.patch | 94 - ...SvxJavaClassPathDlg-SetClassPath-for.patch | 51 - ...-Custom-images-and-referencies-added.patch | 2569 ------ .../0004-Fuentes-monserrat-y-gmx.patch | 171 - rpmbuild/SOURCES/0005-Fonts-added.patch | 26 - .../0006-Modificado-archivo-tar-xz-a-gz.patch | 26 - ...07-Corregida-instrucci-n-de-descarga.patch | 29 - rpmbuild/SOURCES/0008-Cambios-en-logo.patch | 5074 ----------- ...dificado-link-de-descarga-de-fuentes.patch | 27 - .../0010-Restauracion-link-repos-src.patch | 25 - .../SOURCES/0011-logo-image-updated.patch | 2536 ------ ...Update-OfficeLinux.conf-with-lang-es.patch | 21 - .../0013-Update-OfficeLinux.conf.patch | 30 - .../SOURCES/0014-fix-error-make-install.patch | 65 - rpmbuild/SOURCES/0015-Cambios-en-logo.patch | 2536 ------ ...6-Felipe-Carrillo-Puerto-image-added.patch | 7656 ----------------- ...017-Restaurar-el-cambio-de-copyright.patch | 44 - ...ckage-version-de-nuestras-distro-con.patch | 47 - ...-jdk-home-de-nuestras-distro-configs.patch | 37 - ...breoffice-24.2.3.2+gobmx1.3-patchset.patch | 453 + rpmbuild/SPECS/libreoffice.spec | 28 +- 23 files changed, 458 insertions(+), 21190 deletions(-) delete mode 100644 rpmbuild/SOURCES/0001-Archivos-de-distro-config-de-brand-Office.patch delete mode 100644 rpmbuild/SOURCES/0001-cui-fix-without-java-build.patch delete mode 100644 rpmbuild/SOURCES/0002-Modificacion-al-build-y-borrado-UPDATEURL.patch delete mode 100644 rpmbuild/SOURCES/0002-cui-don-t-build-SvxJavaClassPathDlg-SetClassPath-for.patch delete mode 100644 rpmbuild/SOURCES/0003-Custom-images-and-referencies-added.patch delete mode 100644 rpmbuild/SOURCES/0004-Fuentes-monserrat-y-gmx.patch delete mode 100644 rpmbuild/SOURCES/0005-Fonts-added.patch delete mode 100644 rpmbuild/SOURCES/0006-Modificado-archivo-tar-xz-a-gz.patch delete mode 100644 rpmbuild/SOURCES/0007-Corregida-instrucci-n-de-descarga.patch delete mode 100644 rpmbuild/SOURCES/0008-Cambios-en-logo.patch delete mode 100644 rpmbuild/SOURCES/0009-Modificado-link-de-descarga-de-fuentes.patch delete mode 100644 rpmbuild/SOURCES/0010-Restauracion-link-repos-src.patch delete mode 100644 rpmbuild/SOURCES/0011-logo-image-updated.patch delete mode 100644 rpmbuild/SOURCES/0012-Update-OfficeLinux.conf-with-lang-es.patch delete mode 100644 rpmbuild/SOURCES/0013-Update-OfficeLinux.conf.patch delete mode 100644 rpmbuild/SOURCES/0014-fix-error-make-install.patch delete mode 100644 rpmbuild/SOURCES/0015-Cambios-en-logo.patch delete mode 100644 rpmbuild/SOURCES/0016-Felipe-Carrillo-Puerto-image-added.patch delete mode 100644 rpmbuild/SOURCES/0017-Restaurar-el-cambio-de-copyright.patch delete mode 100644 rpmbuild/SOURCES/0018-Eliminar-with-package-version-de-nuestras-distro-con.patch delete mode 100644 rpmbuild/SOURCES/0019-Eliminar-with-jdk-home-de-nuestras-distro-configs.patch create mode 100644 rpmbuild/SOURCES/libreoffice-24.2.3.2+gobmx1.3-patchset.patch 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 deleted file mode 100644 index d309aa1..0000000 --- a/rpmbuild/SOURCES/0001-Archivos-de-distro-config-de-brand-Office.patch +++ /dev/null @@ -1,62 +0,0 @@ -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 - -Change-Id: I290939038b4fedf7a03f3ce68250966766a57e2b ---- - distro-configs/OfficeLinux.conf | 10 ++++++++++ - distro-configs/OfficeWin64.conf | 24 ++++++++++++++++++++++++ - 2 files changed, 34 insertions(+) - create mode 100644 distro-configs/OfficeLinux.conf - create mode 100644 distro-configs/OfficeWin64.conf - -diff --git a/distro-configs/OfficeLinux.conf b/distro-configs/OfficeLinux.conf -new file mode 100644 -index 000000000000..6cb4bd4dca66 ---- /dev/null -+++ b/distro-configs/OfficeLinux.conf -@@ -0,0 +1,10 @@ -+--with-parallelism -+--with-branding=custom_images -+--enable-release-build -+--enable-epm -+--with-package-format=deb -+--with-product-name=Office -+--with-vendor=INFOTEC -+--with-vendor=INFOTEC -+--with-package-version=7.5.0.0 -+--disable-community-flavor -diff --git a/distro-configs/OfficeWin64.conf b/distro-configs/OfficeWin64.conf -new file mode 100644 -index 000000000000..01ad659c2af3 ---- /dev/null -+++ b/distro-configs/OfficeWin64.conf -@@ -0,0 +1,24 @@ -+--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 -+--with-product-name=Office -+--with-vendor=INFOTEC -+--with-package-version=7.5.0.0 -+--disable-community-flavor --- -2.43.0 - diff --git a/rpmbuild/SOURCES/0001-cui-fix-without-java-build.patch b/rpmbuild/SOURCES/0001-cui-fix-without-java-build.patch deleted file mode 100644 index b0da525..0000000 --- a/rpmbuild/SOURCES/0001-cui-fix-without-java-build.patch +++ /dev/null @@ -1,41 +0,0 @@ -From af3963c32c63893949a3028396af90ee7d811e5b Mon Sep 17 00:00:00 2001 -From: Miklos Vajna -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 -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 - diff --git a/rpmbuild/SOURCES/0002-Modificacion-al-build-y-borrado-UPDATEURL.patch b/rpmbuild/SOURCES/0002-Modificacion-al-build-y-borrado-UPDATEURL.patch deleted file mode 100644 index a38c517..0000000 --- a/rpmbuild/SOURCES/0002-Modificacion-al-build-y-borrado-UPDATEURL.patch +++ /dev/null @@ -1,94 +0,0 @@ -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 - -Change-Id: I10a2d0a01ceb02d5d7f5267dcb97eb25ce6600d7 ---- - instsetoo_native/util/openoffice.lst.in | 73 +++++++++++++++++++++++++ - 1 file changed, 73 insertions(+) - -diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in -index b5da0bfb6697..454670cb1e15 100644 ---- a/instsetoo_native/util/openoffice.lst.in -+++ b/instsetoo_native/util/openoffice.lst.in -@@ -193,3 +193,76 @@ LibreOfficeDev_SDK - include {installscriptdir},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{licensepath},{packinfopath} - } - } -+ -+ -+Office -+{ -+ Settings -+ { -+ variables -+ { -+ PRODUCTNAME Office -+ PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ -+ PRODUCTEXTENSION .@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@ -+ POSTVERSIONEXTENSION -+ BUNDLEIDENTIFIER @MACOSX_BUNDLE_IDENTIFIER@ -+ BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ -+ USERDIRPRODUCTVERSION 4 -+ BASEPRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ -+ PCPFILENAME libreoffice.pcp -+ UPDATEURL -+ 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@ -+ PACKAGEREVISION {buildid} -+ LICENSENAME LGPL -+ ROOTMODULEGID gid_Module_Root -+ GLOBALPATCHFILEGID gid_File_Txt_Patchfiles -+ SPELLCHECKERFILE spellchecker_selection.txt -+ CHANGETARGETDIR 1 -+ PATCHCODEFILE ooo_patchcodes.txt -+ } -+ active 1 -+ compression 5 -+ script setup_osl -+ downloadname Office_{productversion}_{os}_install_{languages} -+ langpackdownloadname LibreOffice_{productversion}_languagepack_{os}_install_{languages} -+ helppackdownloadname LibreOffice_{productversion}_helppack_{os}_install_{languages} -+ include {installscriptdir},{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native,{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}/ExtensionPackage,{filelistpath}/CustomTarget/helpcontent2/help3xsl/filelists,{extensionsdir},{licensepath},{packinfopath} -+ } -+} -+ -+Office_SDK -+{ -+ Settings -+ { -+ downloadname LibreOffice-SDK_{packageversion}_{os}_install_{languages} -+ variables -+ { -+ PRODUCTNAME Office -+ PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ -+ PRODUCTEXTENSION .@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@ -+ POSTVERSIONEXTENSION SDK -+ BUNDLEIDENTIFIER @MACOSX_BUNDLE_IDENTIFIER@.SDK -+ BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ -+ PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@ -+ PACKAGEREVISION {buildid} -+ PACK_INSTALLED 1 -+ DMG_VOLUMEEXTENSION SDK -+ DATABASENAME office40sdk -+ NO_README_IN_ROOTDIR 1 -+ LICENSENAME LGPL -+ IGNOREDIRECTORYLAYER 1 -+ NOVERSIONINDIRNAME 0 -+ NOSPACEINDIRECTORYNAME 1 -+ NOSHORTDIRECTORYNAMES 1 -+ CHANGETARGETDIR 1 -+ DONTUSESTARTMENUFOLDER 1 -+ } -+ active 1 -+ compression 5 -+ script sdkoo -+ include {installscriptdir},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{licensepath},{packinfopath} -+ } -+} -+ --- -2.43.0 - diff --git a/rpmbuild/SOURCES/0002-cui-don-t-build-SvxJavaClassPathDlg-SetClassPath-for.patch b/rpmbuild/SOURCES/0002-cui-don-t-build-SvxJavaClassPathDlg-SetClassPath-for.patch deleted file mode 100644 index 5ebcb9a..0000000 --- a/rpmbuild/SOURCES/0002-cui-don-t-build-SvxJavaClassPathDlg-SetClassPath-for.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 8b330bb761e05fcfabd5a30f8784046c93b91431 Mon Sep 17 00:00:00 2001 -From: Miklos Vajna -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 -. - -Change-Id: I0e5a21036ce048c18d408c07cce088dbab7fc030 -Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153396 -Reviewed-by: Miklos Vajna -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 - diff --git a/rpmbuild/SOURCES/0003-Custom-images-and-referencies-added.patch b/rpmbuild/SOURCES/0003-Custom-images-and-referencies-added.patch deleted file mode 100644 index f0c8850..0000000 --- a/rpmbuild/SOURCES/0003-Custom-images-and-referencies-added.patch +++ /dev/null @@ -1,2569 +0,0 @@ -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 - -Change-Id: Ic7e4beefaf65fec8bb2b4ef03996b3ff5e849fee ---- - cui/source/dialogs/about.cxx | 7 +- - custom_images/MexGob.svg | 2516 ++++++++++++++++++++++++++++++++++ - 2 files changed, 2519 insertions(+), 4 deletions(-) - create mode 100644 custom_images/MexGob.svg - -diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx -index ce82e418cf9e..01073166f18b 100644 ---- a/cui/source/dialogs/about.cxx -+++ b/cui/source/dialogs/about.cxx -@@ -78,8 +78,7 @@ AboutDialog::AboutDialog(weld::Window *pParent) - OUString sbuildId = GetBuildString(); - if (IsStringValidGitHash(sbuildId)) { - const tools::Long nMaxChar = 25; -- m_pBuildLabel->set_uri("https://gerrit.libreoffice.org/gitweb?p=core.git;a=log;h=" -- + sbuildId); -+ m_pBuildLabel->set_uri("https://git.softwarelibre.mx/strepsirrhini/office-gobmx"); - m_pBuildLabel->set_label(sbuildId.getLength() > nMaxChar ? sbuildId.replaceAt( - nMaxChar, sbuildId.getLength() - nMaxChar, u"...") - : sbuildId); -@@ -112,7 +111,7 @@ AboutDialog::AboutDialog(weld::Window *pParent) - Graphic aGraphic(aBackgroundBitmap); - m_pBrandImage->set_image(aGraphic.GetXGraphic()); - } -- if (SfxApplication::loadBrandSvg("shell/about", aBackgroundBitmap, nWidth * 0.9)) { -+ if (SfxApplication::loadBrandSvg("shell/MexGob", aBackgroundBitmap, nWidth * 0.9)) { - // Eliminate white background when Skia is disabled by not drawing the - // background bitmap to a VirtualDevice. On most platforms, non-Skia - // VirtualDevices will be filled with a solid color when drawing -@@ -153,7 +152,7 @@ OUString AboutDialog::GetVersionString() { - OUString sVersion = CuiResId(TranslateId(nullptr, "%ABOUTBOXPRODUCTVERSION%ABOUTBOXPRODUCTVERSIONSUFFIX")) + " (" + arch + ")"; - - #if HAVE_FEATURE_COMMUNITY_FLAVOR -- sVersion += " / LibreOffice Community"; -+ sVersion += " / LibreOffice GOBMX"; - #endif - - return sVersion; -diff --git a/custom_images/MexGob.svg b/custom_images/MexGob.svg -new file mode 100644 -index 000000000000..6ad4cd79920c ---- /dev/null -+++ b/custom_images/MexGob.svg -@@ -0,0 +1,2516 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ --- -2.43.0 - diff --git a/rpmbuild/SOURCES/0004-Fuentes-monserrat-y-gmx.patch b/rpmbuild/SOURCES/0004-Fuentes-monserrat-y-gmx.patch deleted file mode 100644 index 9cd4dc7..0000000 --- a/rpmbuild/SOURCES/0004-Fuentes-monserrat-y-gmx.patch +++ /dev/null @@ -1,171 +0,0 @@ -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 - -Change-Id: I73186714bc4809d0b3d48ceb94e933a78db2d623 ---- - Makefile.fetch | 4 ++ - Repository.mk | 1 + - 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.xz | Bin 0 -> 1172924 bytes - solenv/flatpak-manifest.in | 7 +++ - 7 files changed, 77 insertions(+) - 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.xz - -diff --git a/Makefile.fetch b/Makefile.fetch -index b96cb573c2bf..99f9bd3bca18 100644 ---- a/Makefile.fetch -+++ b/Makefile.fetch -@@ -124,6 +124,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S - $(call fetch_Optional,EXPAT,EXPAT_TARBALL) \ - $(call fetch_Optional,FIREBIRD,FIREBIRD_TARBALL) \ - $(call fetch_Optional,FONTCONFIG,FONTCONFIG_TARBALL) \ -+ $(call fetch_Optional,FONTGMXCONFIG,FONTGMXCONFIG_TARBALL) \ - $(call fetch_Optional,FREEHAND,FREEHAND_TARBALL) \ - $(call fetch_Optional,FREETYPE,FREETYPE_TARBALL) \ - FROZEN_TARBALL \ -@@ -241,6 +242,9 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S - $(call fetch_Optional,ODFVALIDATOR,ODFVALIDATOR_JAR) \ - $(call fetch_Optional,OFFICEOTRON,OFFICEOTRON_JAR) \ - ,$(call fetch_Download_item,https://dev-www.libreoffice.org/extern,$(item))) -+ $(foreach item, \ -+ $(call fetch_Optional,MORE_FONTS,FONT_GMX_TARBALL) \ -+ ,$(call fetch__Download_item,https://repos.libreoffice.gob.mx/src,$(item))) - @mkdir -p $(dir $@) && touch $@ - @mkdir -p $(dir $@)/Executable - -diff --git a/Repository.mk b/Repository.mk -index 3e2e29098e66..c04fb9cd4108 100644 ---- a/Repository.mk -+++ b/Repository.mk -@@ -1044,6 +1044,7 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo_fonts,\ - $(call gb_Helper_optional,MORE_FONTS,\ - fonts_alef \ - fonts_amiri \ -+ fonts_gmx \ - fonts_caladea \ - fonts_carlito \ - $(if $(MPL_SUBSET),,fonts_culmus) \ -diff --git a/external/more_fonts/ExternalPackage_gmx.mk b/external/more_fonts/ExternalPackage_gmx.mk -new file mode 100644 -index 000000000000..ccc1b03c5db2 ---- /dev/null -+++ b/external/more_fonts/ExternalPackage_gmx.mk -@@ -0,0 +1,49 @@ -+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -+# -+# This file is part of the LibreOffice project. -+# -+# This Source Code Form 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/. -+# -+ -+$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_gmx,font_gmx)) -+ -+$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_gmx,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ -+ GMX-BlackItalic.otf \ -+ GMX-BlackItalicSc.otf \ -+ GMX-Black.otf \ -+ GMX-BlackSc.otf \ -+ GMX-BoldItalic.otf \ -+ GMX-BoldItalicSc.otf \ -+ GMX-Bold.otf \ -+ GMX-BoldSc.otf \ -+ GMX-LightItalic.otf \ -+ GMX-LightItalicSc.otf \ -+ GMX-Light.otf \ -+ GMX-LightSc.otf \ -+ GMX-RegularItalic.otf \ -+ GMX-RegularItalicSc.otf \ -+ GMX-Regular.otf \ -+ GMX-RegularSc.otf \ -+ Montserrat-BlackItalic.ttf \ -+ Montserrat-Black.ttf \ -+ Montserrat-BoldItalic.ttf \ -+ Montserrat-Bold.ttf \ -+ Montserrat-ExtraBoldItalic.ttf \ -+ Montserrat-ExtraBold.ttf \ -+ Montserrat-ExtraLightItalic.ttf \ -+ Montserrat-ExtraLight.ttf \ -+ Montserrat-Italic.ttf \ -+ Montserrat-LightItalic.ttf \ -+ Montserrat-Light.ttf \ -+ Montserrat-MediumItalic.ttf \ -+ Montserrat-Medium.ttf \ -+ Montserrat-Regular.ttf \ -+ Montserrat-SemiBoldItalic.ttf \ -+ Montserrat-SemiBold.ttf \ -+ Montserrat-ThinItalic.ttf \ -+ Montserrat-Thin.ttf \ -+)) -+ -+# vim: set noet sw=4 ts=4: -\ No newline at end of file -diff --git a/external/more_fonts/Module_more_fonts.mk b/external/more_fonts/Module_more_fonts.mk -index e17af9a15141..b85f7468528f 100644 ---- a/external/more_fonts/Module_more_fonts.mk -+++ b/external/more_fonts/Module_more_fonts.mk -@@ -12,6 +12,7 @@ $(eval $(call gb_Module_Module,more_fonts)) - $(eval $(call gb_Module_add_targets,more_fonts,\ - ExternalPackage_alef \ - ExternalPackage_amiri \ -+ ExternalPackage_gmx \ - ExternalPackage_caladea \ - ExternalPackage_carlito \ - $(if $(MPL_SUBSET),,ExternalPackage_culmus) \ -@@ -39,6 +40,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\ - ExternalPackage_scheherazade \ - UnpackedTarball_alef \ - UnpackedTarball_amiri \ -+ UnpackedTarball_gmx \ - UnpackedTarball_caladea \ - UnpackedTarball_carlito \ - $(if $(MPL_SUBSET),,UnpackedTarball_culmus) \ -diff --git a/external/more_fonts/UnpackedTarball_gmx.mk b/external/more_fonts/UnpackedTarball_gmx.mk -new file mode 100644 -index 000000000000..ac8020494d7e ---- /dev/null -+++ b/external/more_fonts/UnpackedTarball_gmx.mk -@@ -0,0 +1,14 @@ -+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -+# -+# This file is part of the LibreOffice project. -+# -+# This Source Code Form 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/. -+# -+ -+$(eval $(call gb_UnpackedTarball_UnpackedTarball,font_gmx)) -+ -+$(eval $(call gb_UnpackedTarball_set_tarball,font_gmx,$(FONT_GMX_TARBALL))) -+ -+# vim: set noet sw=4 ts=4: -\ No newline at end of file -diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in -index 74beb39f21b9..78b044fa4745 100644 ---- a/solenv/flatpak-manifest.in -+++ b/solenv/flatpak-manifest.in -@@ -590,6 +590,13 @@ - "dest": "external/tarballs", - "dest-filename": "@FONT_AMIRI_TARBALL@" - }, -+ { -+ "url": "https://repos.libreoffice.gob.mx/src/@FONT_GMX_TARBALL@", -+ "sha256": "@FONT_GMX_SHA256SUM@", -+ "type": "file", -+ "dest": "external/tarballs", -+ "dest-filename": "@FONT_GMX_TARBALL@" -+ }, - { - "url": "https://dev-www.libreoffice.org/src/@FONT_CULMUS_TARBALL@", - "sha256": "@FONT_CULMUS_SHA256SUM@", --- -2.43.0 - diff --git a/rpmbuild/SOURCES/0005-Fonts-added.patch b/rpmbuild/SOURCES/0005-Fonts-added.patch deleted file mode 100644 index 5599dc9..0000000 --- a/rpmbuild/SOURCES/0005-Fonts-added.patch +++ /dev/null @@ -1,26 +0,0 @@ -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 - -Change-Id: I32fb8011dd391d35c34627713cb38e5432927c7e ---- - .git-hooks/pre-commit | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/.git-hooks/pre-commit b/.git-hooks/pre-commit -index 521ed202b9ac..bdb5022849a6 100755 ---- a/.git-hooks/pre-commit -+++ b/.git-hooks/pre-commit -@@ -426,7 +426,7 @@ while () - } - my $size = `git cat-file -s :$_`; - # For now let's say large is 500KB -- my $limit = 500; -+ my $limit = 10000; - if ($size > $limit * 1024) - { - print "Error: Attempt to add a large file: $_, pleasy try to fit into $limit KB.\n"; --- -2.43.0 - diff --git a/rpmbuild/SOURCES/0006-Modificado-archivo-tar-xz-a-gz.patch b/rpmbuild/SOURCES/0006-Modificado-archivo-tar-xz-a-gz.patch deleted file mode 100644 index ebe26f2..0000000 --- a/rpmbuild/SOURCES/0006-Modificado-archivo-tar-xz-a-gz.patch +++ /dev/null @@ -1,26 +0,0 @@ -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 - ---- - download.lst | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/download.lst b/download.lst -index 438359f38b65..9f675b2d8fe5 100644 ---- a/download.lst -+++ b/download.lst -@@ -3,6 +3,9 @@ - # There is a script solenv/bin/generate-flatpak-manifest.sh to substitute the variables, - # so upgrading to a new version only requires changes in download.lst. - -+FONT_GMX_TARBALL := gmx-fonts.tar.gz -+FONT_GMX_SHA256SUM := -+# - ABW_SHA256SUM := e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed - ABW_TARBALL := libabw-0.1.3.tar.xz - # three static lines --- -2.43.0 - diff --git a/rpmbuild/SOURCES/0007-Corregida-instrucci-n-de-descarga.patch b/rpmbuild/SOURCES/0007-Corregida-instrucci-n-de-descarga.patch deleted file mode 100644 index 723dc11..0000000 --- a/rpmbuild/SOURCES/0007-Corregida-instrucci-n-de-descarga.patch +++ /dev/null @@ -1,29 +0,0 @@ -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?= - =?UTF-8?q?rga?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - ---- - Makefile.fetch | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.fetch b/Makefile.fetch -index 99f9bd3bca18..b0443f367007 100644 ---- a/Makefile.fetch -+++ b/Makefile.fetch -@@ -244,7 +244,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S - ,$(call fetch_Download_item,https://dev-www.libreoffice.org/extern,$(item))) - $(foreach item, \ - $(call fetch_Optional,MORE_FONTS,FONT_GMX_TARBALL) \ -- ,$(call fetch__Download_item,https://repos.libreoffice.gob.mx/src,$(item))) -+ ,$(call fetch_Download_item,https://repos.libreoffice.gob.mx/src,$(item))) - @mkdir -p $(dir $@) && touch $@ - @mkdir -p $(dir $@)/Executable - --- -2.43.0 - diff --git a/rpmbuild/SOURCES/0008-Cambios-en-logo.patch b/rpmbuild/SOURCES/0008-Cambios-en-logo.patch deleted file mode 100644 index c10ab77..0000000 --- a/rpmbuild/SOURCES/0008-Cambios-en-logo.patch +++ /dev/null @@ -1,5074 +0,0 @@ -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 - -Change-Id: Ica978200502962bedf5901be88db7a2484678346 ---- - cui/source/dialogs/about.cxx | 2 +- - custom_images/about.svg | 2516 ++++++++++++++++++++++++++++++++++ - custom_images/logo.svg | 2516 ++++++++++++++++++++++++++++++++++ - 3 files changed, 5033 insertions(+), 1 deletion(-) - create mode 100644 custom_images/about.svg - create mode 100644 custom_images/logo.svg - -diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx -index 01073166f18b..496cc16676c2 100644 ---- a/cui/source/dialogs/about.cxx -+++ b/cui/source/dialogs/about.cxx -@@ -111,7 +111,7 @@ AboutDialog::AboutDialog(weld::Window *pParent) - Graphic aGraphic(aBackgroundBitmap); - m_pBrandImage->set_image(aGraphic.GetXGraphic()); - } -- if (SfxApplication::loadBrandSvg("shell/MexGob", aBackgroundBitmap, nWidth * 0.9)) { -+ if (SfxApplication::loadBrandSvg("shell/about", aBackgroundBitmap, nWidth * 0.9)) { - // Eliminate white background when Skia is disabled by not drawing the - // background bitmap to a VirtualDevice. On most platforms, non-Skia - // VirtualDevices will be filled with a solid color when drawing -diff --git a/custom_images/about.svg b/custom_images/about.svg -new file mode 100644 -index 000000000000..6ad4cd79920c ---- /dev/null -+++ b/custom_images/about.svg -@@ -0,0 +1,2516 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/custom_images/logo.svg b/custom_images/logo.svg -new file mode 100644 -index 000000000000..6ad4cd79920c ---- /dev/null -+++ b/custom_images/logo.svg -@@ -0,0 +1,2516 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ --- -2.43.0 - diff --git a/rpmbuild/SOURCES/0009-Modificado-link-de-descarga-de-fuentes.patch b/rpmbuild/SOURCES/0009-Modificado-link-de-descarga-de-fuentes.patch deleted file mode 100644 index 885c41b..0000000 --- a/rpmbuild/SOURCES/0009-Modificado-link-de-descarga-de-fuentes.patch +++ /dev/null @@ -1,27 +0,0 @@ -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 - -Change-Id: I80b8e9ea4286d68c1880ef45eaa191a8f0c3e7d2 ---- - Makefile.fetch | 2 +- - fonts/gmx-fonts.tar.gz | Bin 0 -> 2409292 bytes - fonts/gmx-fonts.tar.xz | Bin 1172924 -> 0 bytes - 3 files changed, 1 insertion(+), 1 deletion(-) - create mode 100644 fonts/gmx-fonts.tar.gz - delete mode 100644 fonts/gmx-fonts.tar.xz - -diff --git a/Makefile.fetch b/Makefile.fetch -index b0443f367007..ede18af4197d 100644 ---- a/Makefile.fetch -+++ b/Makefile.fetch -@@ -244,7 +244,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S - ,$(call fetch_Download_item,https://dev-www.libreoffice.org/extern,$(item))) - $(foreach item, \ - $(call fetch_Optional,MORE_FONTS,FONT_GMX_TARBALL) \ -- ,$(call fetch_Download_item,https://repos.libreoffice.gob.mx/src,$(item))) -+ ,$(call fetch_Download_item,https://git.softwarelibre.mx/strepsirrhini/office-gobmx/-/tree/logos/fonts,$(item))) - @mkdir -p $(dir $@) && touch $@ - @mkdir -p $(dir $@)/Executable - diff --git a/rpmbuild/SOURCES/0010-Restauracion-link-repos-src.patch b/rpmbuild/SOURCES/0010-Restauracion-link-repos-src.patch deleted file mode 100644 index 849847b..0000000 --- a/rpmbuild/SOURCES/0010-Restauracion-link-repos-src.patch +++ /dev/null @@ -1,25 +0,0 @@ -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 - ---- - Makefile.fetch | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.fetch b/Makefile.fetch -index ede18af4197d..b0443f367007 100644 ---- a/Makefile.fetch -+++ b/Makefile.fetch -@@ -244,7 +244,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S - ,$(call fetch_Download_item,https://dev-www.libreoffice.org/extern,$(item))) - $(foreach item, \ - $(call fetch_Optional,MORE_FONTS,FONT_GMX_TARBALL) \ -- ,$(call fetch_Download_item,https://git.softwarelibre.mx/strepsirrhini/office-gobmx/-/tree/logos/fonts,$(item))) -+ ,$(call fetch_Download_item,https://repos.libreoffice.gob.mx/src,$(item))) - @mkdir -p $(dir $@) && touch $@ - @mkdir -p $(dir $@)/Executable - --- -2.43.0 - diff --git a/rpmbuild/SOURCES/0011-logo-image-updated.patch b/rpmbuild/SOURCES/0011-logo-image-updated.patch deleted file mode 100644 index cbbe465..0000000 --- a/rpmbuild/SOURCES/0011-logo-image-updated.patch +++ /dev/null @@ -1,2536 +0,0 @@ -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 - -Change-Id: Ib4c398af48d0014c7f11b0da5f67f3659fc018fe ---- - custom_images/logo.svg | 2517 +--------------------------------------- - 1 file changed, 1 insertion(+), 2516 deletions(-) - -diff --git a/custom_images/logo.svg b/custom_images/logo.svg -index 6ad4cd79920c..3215508ec8c3 100644 ---- a/custom_images/logo.svg -+++ b/custom_images/logo.svg -@@ -1,2516 +1 @@ -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -+ -\ No newline at end of file --- -2.43.0 - diff --git a/rpmbuild/SOURCES/0012-Update-OfficeLinux.conf-with-lang-es.patch b/rpmbuild/SOURCES/0012-Update-OfficeLinux.conf-with-lang-es.patch deleted file mode 100644 index 8468771..0000000 --- a/rpmbuild/SOURCES/0012-Update-OfficeLinux.conf-with-lang-es.patch +++ /dev/null @@ -1,21 +0,0 @@ -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 - ---- - distro-configs/OfficeLinux.conf | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/distro-configs/OfficeLinux.conf b/distro-configs/OfficeLinux.conf -index 6cb4bd4dca66..30550375e27a 100644 ---- a/distro-configs/OfficeLinux.conf -+++ b/distro-configs/OfficeLinux.conf -@@ -8,3 +8,4 @@ - --with-vendor=INFOTEC - --with-package-version=7.5.0.0 - --disable-community-flavor -+--with-lang=es --- -2.43.0 - diff --git a/rpmbuild/SOURCES/0013-Update-OfficeLinux.conf.patch b/rpmbuild/SOURCES/0013-Update-OfficeLinux.conf.patch deleted file mode 100644 index 10154f9..0000000 --- a/rpmbuild/SOURCES/0013-Update-OfficeLinux.conf.patch +++ /dev/null @@ -1,30 +0,0 @@ -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 - ---- - distro-configs/OfficeLinux.conf | 7 ++----- - 1 file changed, 2 insertions(+), 5 deletions(-) - -diff --git a/distro-configs/OfficeLinux.conf b/distro-configs/OfficeLinux.conf -index 30550375e27a..8f9dc46b2814 100644 ---- a/distro-configs/OfficeLinux.conf -+++ b/distro-configs/OfficeLinux.conf -@@ -1,11 +1,8 @@ - --with-parallelism -+--enable-dbgutil -+--without-doxygen - --with-branding=custom_images ----enable-release-build ----enable-epm ----with-package-format=deb - --with-product-name=Office - --with-vendor=INFOTEC ----with-vendor=INFOTEC - --with-package-version=7.5.0.0 ----disable-community-flavor - --with-lang=es --- -2.43.0 - diff --git a/rpmbuild/SOURCES/0014-fix-error-make-install.patch b/rpmbuild/SOURCES/0014-fix-error-make-install.patch deleted file mode 100644 index fce26ed..0000000 --- a/rpmbuild/SOURCES/0014-fix-error-make-install.patch +++ /dev/null @@ -1,65 +0,0 @@ -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 - -Change-Id: I590a323ec835f16badf1889f4c09d00fee3d3999 ---- - instsetoo_native/util/openoffice.lst.in | 44 +++++++++++++++++++++++++ - 1 file changed, 44 insertions(+) - -diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in -index 454670cb1e15..de7de46a22ff 100644 ---- a/instsetoo_native/util/openoffice.lst.in -+++ b/instsetoo_native/util/openoffice.lst.in -@@ -266,3 +266,47 @@ Office_SDK - } - } - -+OfficeDev -+{ -+ Settings -+ { -+ variables -+ { -+ PRODUCTNAME OfficeDev -+ PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ -+ PRODUCTEXTENSION .@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@ -+ WINDOWSBASISROOTNAME LibreOfficeDev @LIBO_VERSION_MAJOR@ -+ UNIXBASISROOTNAME libreofficedev@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ -+ POSTVERSIONEXTENSION -+ BUNDLEIDENTIFIER @MACOSX_BUNDLE_IDENTIFIER@ -+ BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ -+ USERDIRPRODUCTVERSION 4 -+ BASEPRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ -+ DEVELOPMENTPRODUCT 1 -+ BASISPACKAGEPREFIX lodevbasis -+ UREPACKAGEPREFIX libreofficedev -+ SOLSUREPACKAGEPREFIX libreofficedev -+ REGISTRYLAYERNAME LayerDev -+ UPDATEURL https://update.libreoffice.org/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@ -+ PACKAGEREVISION {buildid} -+ LICENSENAME LGPL -+ ROOTMODULEGID gid_Module_Root -+ GLOBALPATCHFILEGID gid_File_Txt_Patchfiles -+ SPELLCHECKERFILE spellchecker_selection.txt -+ CHANGETARGETDIR 1 -+ PATCHCODEFILE ooodev_patchcodes.txt -+ CODEFILENAME codes_ooodev.txt -+ LOCALUSERDIR $ORIGIN/.. -+ } -+ active 1 -+ compression 5 -+ script setup_osl -+ downloadname LibreOfficeDev_{productversion}_{os}_install_{languages} -+ langpackdownloadname LibreOfficeDev_{productversion}_languagepack_{os}_install_{languages} -+ helppackdownloadname LibreOfficeDev_{productversion}_helppack_{os}_install_{languages} -+ include {installscriptdir},{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native,{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}/ExtensionPackage,{filelistpath}/CustomTarget/helpcontent2/help3xsl/filelists,{extensionsdir},{licensepath},{packinfopath} -+ } -+} --- -2.43.0 - diff --git a/rpmbuild/SOURCES/0015-Cambios-en-logo.patch b/rpmbuild/SOURCES/0015-Cambios-en-logo.patch deleted file mode 100644 index 36090ed..0000000 --- a/rpmbuild/SOURCES/0015-Cambios-en-logo.patch +++ /dev/null @@ -1,2536 +0,0 @@ -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 - -Change-Id: Ica978200502962bedf5901be88db7a2484678346 ---- - custom_images/logo.svg | 2517 +++++++++++++++++++++++++++++++++++++++- - 1 file changed, 2516 insertions(+), 1 deletion(-) - -diff --git a/custom_images/logo.svg b/custom_images/logo.svg -index 3215508ec8c3..6ad4cd79920c 100644 ---- a/custom_images/logo.svg -+++ b/custom_images/logo.svg -@@ -1 +1,2516 @@ -- -\ No newline at end of file -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ --- -2.43.0 - diff --git a/rpmbuild/SOURCES/0016-Felipe-Carrillo-Puerto-image-added.patch b/rpmbuild/SOURCES/0016-Felipe-Carrillo-Puerto-image-added.patch deleted file mode 100644 index 5aac130..0000000 --- a/rpmbuild/SOURCES/0016-Felipe-Carrillo-Puerto-image-added.patch +++ /dev/null @@ -1,7656 +0,0 @@ -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. - -Change-Id: I31ea40f0a4437ad61b3fe0c14edbf9b0fccb82c6 ---- - custom_images/MexGob.svg | 2516 ------------------------------------- - custom_images/about.svg | 2554 +------------------------------------- - custom_images/logo.svg | 2554 +------------------------------------- - 3 files changed, 76 insertions(+), 7548 deletions(-) - delete mode 100644 custom_images/MexGob.svg - -diff --git a/custom_images/MexGob.svg b/custom_images/MexGob.svg -deleted file mode 100644 -index 6ad4cd79920c..000000000000 ---- a/custom_images/MexGob.svg -+++ /dev/null -@@ -1,2516 +0,0 @@ -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -diff --git a/custom_images/about.svg b/custom_images/about.svg -index 6ad4cd79920c..daf00b17b744 100644 ---- a/custom_images/about.svg -+++ b/custom_images/about.svg -@@ -1,2516 +1,38 @@ -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/custom_images/logo.svg b/custom_images/logo.svg -index 6ad4cd79920c..daf00b17b744 100644 ---- a/custom_images/logo.svg -+++ b/custom_images/logo.svg -@@ -1,2516 +1,38 @@ -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ --- -2.43.0 - diff --git a/rpmbuild/SOURCES/0017-Restaurar-el-cambio-de-copyright.patch b/rpmbuild/SOURCES/0017-Restaurar-el-cambio-de-copyright.patch deleted file mode 100644 index 907b260..0000000 --- a/rpmbuild/SOURCES/0017-Restaurar-el-cambio-de-copyright.patch +++ /dev/null @@ -1,44 +0,0 @@ -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. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Israel observó que el copyright en el archivo -external/more_fonts/UnpackedTarball_gmx.mk fue regenerado -incorrectamente. Durante una limpia de commits este cambio fue retirado. -Con este commit restauro el cambio original de Israel para dar la -atribución correspondiente. - -Change-Id: Ib25131be3e3605715a9b1b20fb060c3aae9be252 ---- - external/more_fonts/UnpackedTarball_gmx.mk | 7 ++----- - 1 file changed, 2 insertions(+), 5 deletions(-) - -diff --git a/external/more_fonts/UnpackedTarball_gmx.mk b/external/more_fonts/UnpackedTarball_gmx.mk -index ac8020494d7e..28b53b415a2a 100644 ---- a/external/more_fonts/UnpackedTarball_gmx.mk -+++ b/external/more_fonts/UnpackedTarball_gmx.mk -@@ -1,14 +1,11 @@ - # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- - # --# This file is part of the LibreOffice project. -+# This file is part of the GobMX project. - # --# This Source Code Form 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/. - # - - $(eval $(call gb_UnpackedTarball_UnpackedTarball,font_gmx)) - - $(eval $(call gb_UnpackedTarball_set_tarball,font_gmx,$(FONT_GMX_TARBALL))) - --# vim: set noet sw=4 ts=4: -\ No newline at end of file -+# vim: set noet sw=4 ts=4: --- -2.43.0 - 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 deleted file mode 100644 index 3459b73..0000000 --- a/rpmbuild/SOURCES/0018-Eliminar-with-package-version-de-nuestras-distro-con.patch +++ /dev/null @@ -1,47 +0,0 @@ -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 - distro-configs -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -En el issue #7 [1] se reporta que --with-package-version está indicado -de manera fija en nuestras configuraciones de distro-config. Se acordó -que estas líneas deberían establecerse sólo durante la compilación o -durante una rama, más no en master. - -Este commit eliminar ambas líneas. - -[1] https://git.softwarelibre.mx/strepsirrhini/office-gobmx/-/issues/7 - -Change-Id: I043f42b9bc14d6f6bbf38776f3de73741cc201cd ---- - distro-configs/OfficeLinux.conf | 1 - - distro-configs/OfficeWin64.conf | 1 - - 2 files changed, 2 deletions(-) - -diff --git a/distro-configs/OfficeLinux.conf b/distro-configs/OfficeLinux.conf -index 8f9dc46b2814..ce64682af1fa 100644 ---- a/distro-configs/OfficeLinux.conf -+++ b/distro-configs/OfficeLinux.conf -@@ -4,5 +4,4 @@ - --with-branding=custom_images - --with-product-name=Office - --with-vendor=INFOTEC ----with-package-version=7.5.0.0 - --with-lang=es -diff --git a/distro-configs/OfficeWin64.conf b/distro-configs/OfficeWin64.conf -index 01ad659c2af3..032d5c70803a 100644 ---- a/distro-configs/OfficeWin64.conf -+++ b/distro-configs/OfficeWin64.conf -@@ -20,5 +20,4 @@ - --with-branding=custom_images - --with-product-name=Office - --with-vendor=INFOTEC ----with-package-version=7.5.0.0 - --disable-community-flavor --- -2.43.0 - 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 deleted file mode 100644 index 3f77f3d..0000000 --- a/rpmbuild/SOURCES/0019-Eliminar-with-jdk-home-de-nuestras-distro-configs.patch +++ /dev/null @@ -1,37 +0,0 @@ -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 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -En el issue #8 [1] se reporta que --with-jdk-home está indicado -de manera fija en nuestras configuraciones de distro-config, lo cual casa la -compilación a una ruta que depende de cada sistema. Se acordó que estas -líneas deberían establecerse sólo durante la compilación. - -Este commit elimina la línea del archivo OfficeLinux.conf. Aún cuando el -issue indica que también estaba en OfficeWin64.conf, esto no es correcto. - -[1] https://git.softwarelibre.mx/strepsirrhini/office-gobmx/-/issues/8 - -Change-Id: Ie953e5a5747d49454dad2b7e9e0194b79a3c5851 ---- - distro-configs/OfficeWin64.conf | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/distro-configs/OfficeWin64.conf b/distro-configs/OfficeWin64.conf -index 032d5c70803a..25996d9d6710 100644 ---- a/distro-configs/OfficeWin64.conf -+++ b/distro-configs/OfficeWin64.conf -@@ -1,6 +1,5 @@ - --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 --- -2.43.0 - diff --git a/rpmbuild/SOURCES/libreoffice-24.2.3.2+gobmx1.3-patchset.patch b/rpmbuild/SOURCES/libreoffice-24.2.3.2+gobmx1.3-patchset.patch new file mode 100644 index 0000000..45d884c --- /dev/null +++ b/rpmbuild/SOURCES/libreoffice-24.2.3.2+gobmx1.3-patchset.patch @@ -0,0 +1,453 @@ +diff --git a/.git-hooks/pre-commit b/.git-hooks/pre-commit +index 521ed202b9ac..bdb5022849a6 100755 +--- a/.git-hooks/pre-commit ++++ b/.git-hooks/pre-commit +@@ -426,7 +426,7 @@ while () + } + my $size = `git cat-file -s :$_`; + # For now let's say large is 500KB +- my $limit = 500; ++ my $limit = 10000; + if ($size > $limit * 1024) + { + print "Error: Attempt to add a large file: $_, pleasy try to fit into $limit KB.\n"; +diff --git a/.gitmodules b/.gitmodules +index c441234d6030..d77ba6275c9a 100644 +--- a/.gitmodules ++++ b/.gitmodules +@@ -1,12 +1,12 @@ + [submodule "dictionaries"] + path = dictionaries +- url = ../dictionaries ++ url = https://github.com/LibreOffice/dictionaries.git + branch = . + [submodule "helpcontent2"] + path = helpcontent2 +- url = ../help ++ url = https://github.com/LibreOffice/help.git + branch = . + [submodule "translations"] + path = translations +- url = ../translations ++ url = https://github.com/LibreOffice/translations.git + branch = . +diff --git a/Makefile.fetch b/Makefile.fetch +index b96cb573c2bf..6ff404e031f9 100644 +--- a/Makefile.fetch ++++ b/Makefile.fetch +@@ -241,6 +241,9 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S + $(call fetch_Optional,ODFVALIDATOR,ODFVALIDATOR_JAR) \ + $(call fetch_Optional,OFFICEOTRON,OFFICEOTRON_JAR) \ + ,$(call fetch_Download_item,https://dev-www.libreoffice.org/extern,$(item))) ++ $(foreach item, \ ++ $(call fetch_Optional,MORE_FONTS,FONT_GMX_TARBALL) \ ++ ,$(call fetch_Download_item,https://repos.libreoffice.gob.mx/src,$(item))) + @mkdir -p $(dir $@) && touch $@ + @mkdir -p $(dir $@)/Executable + +diff --git a/Repository.mk b/Repository.mk +index 3e2e29098e66..c04fb9cd4108 100644 +--- a/Repository.mk ++++ b/Repository.mk +@@ -1044,6 +1044,7 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo_fonts,\ + $(call gb_Helper_optional,MORE_FONTS,\ + fonts_alef \ + fonts_amiri \ ++ fonts_gmx \ + fonts_caladea \ + fonts_carlito \ + $(if $(MPL_SUBSET),,fonts_culmus) \ +diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx +index ce82e418cf9e..496cc16676c2 100644 +--- a/cui/source/dialogs/about.cxx ++++ b/cui/source/dialogs/about.cxx +@@ -78,8 +78,7 @@ AboutDialog::AboutDialog(weld::Window *pParent) + OUString sbuildId = GetBuildString(); + if (IsStringValidGitHash(sbuildId)) { + const tools::Long nMaxChar = 25; +- m_pBuildLabel->set_uri("https://gerrit.libreoffice.org/gitweb?p=core.git;a=log;h=" +- + sbuildId); ++ m_pBuildLabel->set_uri("https://git.softwarelibre.mx/strepsirrhini/office-gobmx"); + m_pBuildLabel->set_label(sbuildId.getLength() > nMaxChar ? sbuildId.replaceAt( + nMaxChar, sbuildId.getLength() - nMaxChar, u"...") + : sbuildId); +@@ -153,7 +152,7 @@ OUString AboutDialog::GetVersionString() { + OUString sVersion = CuiResId(TranslateId(nullptr, "%ABOUTBOXPRODUCTVERSION%ABOUTBOXPRODUCTVERSIONSUFFIX")) + " (" + arch + ")"; + + #if HAVE_FEATURE_COMMUNITY_FLAVOR +- sVersion += " / LibreOffice Community"; ++ sVersion += " / LibreOffice GOBMX"; + #endif + + return sVersion; +diff --git a/custom_images/about.svg b/custom_images/about.svg +new file mode 100644 +index 000000000000..daf00b17b744 +--- /dev/null ++++ b/custom_images/about.svg +@@ -0,0 +1,38 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +diff --git a/distro-configs/OfficeLinux.conf b/distro-configs/OfficeLinux.conf +new file mode 100644 +index 000000000000..85fc071d1976 +--- /dev/null ++++ b/distro-configs/OfficeLinux.conf +@@ -0,0 +1,11 @@ ++--with-parallelism ++--enable-dbgutil ++--without-doxygen ++--with-branding=custom_images ++--with-product-name=Office ++--with-vendor=INFOTEC ++--with-lang=es ++--enable-release-build ++--with-package-format=rpm ++--enable-epm ++--disable-community-flavor +diff --git a/distro-configs/OfficeLinuxRelease.conf b/distro-configs/OfficeLinuxRelease.conf +new file mode 100644 +index 000000000000..d95f5a435fc3 +--- /dev/null ++++ b/distro-configs/OfficeLinuxRelease.conf +@@ -0,0 +1,22 @@ ++--with-parallelism ++--without-doxygen ++--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=rpm ++--enable-mergelibs ++--enable-lto ++--enable-odk ++--without-ucrt-dir ++--enable-release-build ++--enable-epm ++--with-lang=es ++--with-branding=custom_images ++--with-product-name=Office ++--with-vendor=INFOTEC ++--disable-community-flavor +diff --git a/distro-configs/OfficeWin64.conf b/distro-configs/OfficeWin64.conf +new file mode 100644 +index 000000000000..25996d9d6710 +--- /dev/null ++++ b/distro-configs/OfficeWin64.conf +@@ -0,0 +1,22 @@ ++--with-ant-home=/cygdrive/c/sources/apache-ant-1.9.5 ++--with-visual-studio=2022 ++--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 ++--with-product-name=Office ++--with-vendor=INFOTEC ++--disable-community-flavor +diff --git a/download.lst b/download.lst +index 0f16c450c5cd..e34dc1497e5b 100644 +--- a/download.lst ++++ b/download.lst +@@ -3,6 +3,9 @@ + # There is a script solenv/bin/generate-flatpak-manifest.sh to substitute the variables, + # so upgrading to a new version only requires changes in download.lst. + ++FONT_GMX_TARBALL := gmx-fonts.tar.gz ++FONT_GMX_SHA256SUM := ++# + ABW_SHA256SUM := e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed + ABW_TARBALL := libabw-0.1.3.tar.xz + # three static lines +diff --git a/external/more_fonts/ExternalPackage_gmx.mk b/external/more_fonts/ExternalPackage_gmx.mk +new file mode 100644 +index 000000000000..ccc1b03c5db2 +--- /dev/null ++++ b/external/more_fonts/ExternalPackage_gmx.mk +@@ -0,0 +1,49 @@ ++# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- ++# ++# This file is part of the LibreOffice project. ++# ++# This Source Code Form 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/. ++# ++ ++$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_gmx,font_gmx)) ++ ++$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_gmx,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ ++ GMX-BlackItalic.otf \ ++ GMX-BlackItalicSc.otf \ ++ GMX-Black.otf \ ++ GMX-BlackSc.otf \ ++ GMX-BoldItalic.otf \ ++ GMX-BoldItalicSc.otf \ ++ GMX-Bold.otf \ ++ GMX-BoldSc.otf \ ++ GMX-LightItalic.otf \ ++ GMX-LightItalicSc.otf \ ++ GMX-Light.otf \ ++ GMX-LightSc.otf \ ++ GMX-RegularItalic.otf \ ++ GMX-RegularItalicSc.otf \ ++ GMX-Regular.otf \ ++ GMX-RegularSc.otf \ ++ Montserrat-BlackItalic.ttf \ ++ Montserrat-Black.ttf \ ++ Montserrat-BoldItalic.ttf \ ++ Montserrat-Bold.ttf \ ++ Montserrat-ExtraBoldItalic.ttf \ ++ Montserrat-ExtraBold.ttf \ ++ Montserrat-ExtraLightItalic.ttf \ ++ Montserrat-ExtraLight.ttf \ ++ Montserrat-Italic.ttf \ ++ Montserrat-LightItalic.ttf \ ++ Montserrat-Light.ttf \ ++ Montserrat-MediumItalic.ttf \ ++ Montserrat-Medium.ttf \ ++ Montserrat-Regular.ttf \ ++ Montserrat-SemiBoldItalic.ttf \ ++ Montserrat-SemiBold.ttf \ ++ Montserrat-ThinItalic.ttf \ ++ Montserrat-Thin.ttf \ ++)) ++ ++# vim: set noet sw=4 ts=4: +\ No newline at end of file +diff --git a/external/more_fonts/Module_more_fonts.mk b/external/more_fonts/Module_more_fonts.mk +index e17af9a15141..b85f7468528f 100644 +--- a/external/more_fonts/Module_more_fonts.mk ++++ b/external/more_fonts/Module_more_fonts.mk +@@ -12,6 +12,7 @@ $(eval $(call gb_Module_Module,more_fonts)) + $(eval $(call gb_Module_add_targets,more_fonts,\ + ExternalPackage_alef \ + ExternalPackage_amiri \ ++ ExternalPackage_gmx \ + ExternalPackage_caladea \ + ExternalPackage_carlito \ + $(if $(MPL_SUBSET),,ExternalPackage_culmus) \ +@@ -39,6 +40,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\ + ExternalPackage_scheherazade \ + UnpackedTarball_alef \ + UnpackedTarball_amiri \ ++ UnpackedTarball_gmx \ + UnpackedTarball_caladea \ + UnpackedTarball_carlito \ + $(if $(MPL_SUBSET),,UnpackedTarball_culmus) \ +diff --git a/external/more_fonts/UnpackedTarball_gmx.mk b/external/more_fonts/UnpackedTarball_gmx.mk +new file mode 100644 +index 000000000000..28b53b415a2a +--- /dev/null ++++ b/external/more_fonts/UnpackedTarball_gmx.mk +@@ -0,0 +1,11 @@ ++# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- ++# ++# This file is part of the GobMX project. ++# ++# ++ ++$(eval $(call gb_UnpackedTarball_UnpackedTarball,font_gmx)) ++ ++$(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/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in +index b5da0bfb6697..de7de46a22ff 100644 +--- a/instsetoo_native/util/openoffice.lst.in ++++ b/instsetoo_native/util/openoffice.lst.in +@@ -193,3 +193,120 @@ LibreOfficeDev_SDK + include {installscriptdir},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{licensepath},{packinfopath} + } + } ++ ++ ++Office ++{ ++ Settings ++ { ++ variables ++ { ++ PRODUCTNAME Office ++ PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ ++ PRODUCTEXTENSION .@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@ ++ POSTVERSIONEXTENSION ++ BUNDLEIDENTIFIER @MACOSX_BUNDLE_IDENTIFIER@ ++ BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ ++ USERDIRPRODUCTVERSION 4 ++ BASEPRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ ++ PCPFILENAME libreoffice.pcp ++ UPDATEURL ++ 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@ ++ PACKAGEREVISION {buildid} ++ LICENSENAME LGPL ++ ROOTMODULEGID gid_Module_Root ++ GLOBALPATCHFILEGID gid_File_Txt_Patchfiles ++ SPELLCHECKERFILE spellchecker_selection.txt ++ CHANGETARGETDIR 1 ++ PATCHCODEFILE ooo_patchcodes.txt ++ } ++ active 1 ++ compression 5 ++ script setup_osl ++ downloadname Office_{productversion}_{os}_install_{languages} ++ langpackdownloadname LibreOffice_{productversion}_languagepack_{os}_install_{languages} ++ helppackdownloadname LibreOffice_{productversion}_helppack_{os}_install_{languages} ++ include {installscriptdir},{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native,{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}/ExtensionPackage,{filelistpath}/CustomTarget/helpcontent2/help3xsl/filelists,{extensionsdir},{licensepath},{packinfopath} ++ } ++} ++ ++Office_SDK ++{ ++ Settings ++ { ++ downloadname LibreOffice-SDK_{packageversion}_{os}_install_{languages} ++ variables ++ { ++ PRODUCTNAME Office ++ PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ ++ PRODUCTEXTENSION .@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@ ++ POSTVERSIONEXTENSION SDK ++ BUNDLEIDENTIFIER @MACOSX_BUNDLE_IDENTIFIER@.SDK ++ BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ ++ PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@ ++ PACKAGEREVISION {buildid} ++ PACK_INSTALLED 1 ++ DMG_VOLUMEEXTENSION SDK ++ DATABASENAME office40sdk ++ NO_README_IN_ROOTDIR 1 ++ LICENSENAME LGPL ++ IGNOREDIRECTORYLAYER 1 ++ NOVERSIONINDIRNAME 0 ++ NOSPACEINDIRECTORYNAME 1 ++ NOSHORTDIRECTORYNAMES 1 ++ CHANGETARGETDIR 1 ++ DONTUSESTARTMENUFOLDER 1 ++ } ++ active 1 ++ compression 5 ++ script sdkoo ++ include {installscriptdir},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{licensepath},{packinfopath} ++ } ++} ++ ++OfficeDev ++{ ++ Settings ++ { ++ variables ++ { ++ PRODUCTNAME OfficeDev ++ PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ ++ PRODUCTEXTENSION .@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@ ++ WINDOWSBASISROOTNAME LibreOfficeDev @LIBO_VERSION_MAJOR@ ++ UNIXBASISROOTNAME libreofficedev@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ ++ POSTVERSIONEXTENSION ++ BUNDLEIDENTIFIER @MACOSX_BUNDLE_IDENTIFIER@ ++ BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ ++ USERDIRPRODUCTVERSION 4 ++ BASEPRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ ++ DEVELOPMENTPRODUCT 1 ++ BASISPACKAGEPREFIX lodevbasis ++ UREPACKAGEPREFIX libreofficedev ++ SOLSUREPACKAGEPREFIX libreofficedev ++ REGISTRYLAYERNAME LayerDev ++ UPDATEURL https://update.libreoffice.org/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@ ++ PACKAGEREVISION {buildid} ++ LICENSENAME LGPL ++ ROOTMODULEGID gid_Module_Root ++ GLOBALPATCHFILEGID gid_File_Txt_Patchfiles ++ SPELLCHECKERFILE spellchecker_selection.txt ++ CHANGETARGETDIR 1 ++ PATCHCODEFILE ooodev_patchcodes.txt ++ CODEFILENAME codes_ooodev.txt ++ LOCALUSERDIR $ORIGIN/.. ++ } ++ active 1 ++ compression 5 ++ script setup_osl ++ downloadname LibreOfficeDev_{productversion}_{os}_install_{languages} ++ langpackdownloadname LibreOfficeDev_{productversion}_languagepack_{os}_install_{languages} ++ helppackdownloadname LibreOfficeDev_{productversion}_helppack_{os}_install_{languages} ++ include {installscriptdir},{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native,{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}/ExtensionPackage,{filelistpath}/CustomTarget/helpcontent2/help3xsl/filelists,{extensionsdir},{licensepath},{packinfopath} ++ } ++} +diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in +index e5150ccbc5c8..00ac6eee25ba 100644 +--- a/solenv/flatpak-manifest.in ++++ b/solenv/flatpak-manifest.in +@@ -592,6 +592,13 @@ + "dest": "external/tarballs", + "dest-filename": "@FONT_AMIRI_TARBALL@" + }, ++ { ++ "url": "https://repos.libreoffice.gob.mx/src/@FONT_GMX_TARBALL@", ++ "sha256": "@FONT_GMX_SHA256SUM@", ++ "type": "file", ++ "dest": "external/tarballs", ++ "dest-filename": "@FONT_GMX_TARBALL@" ++ }, + { + "url": "https://dev-www.libreoffice.org/src/@FONT_CULMUS_TARBALL@", + "sha256": "@FONT_CULMUS_SHA256SUM@", diff --git a/rpmbuild/SPECS/libreoffice.spec b/rpmbuild/SPECS/libreoffice.spec index f1c900f..1b8381c 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}.2 -Release: 5+gob.mx1.2%{?dist} +Release: 2+gob.mx1.3%{?dist} # default new files are: MPLv2 # older files are typically: MPLv2 incorporating work under ASLv2 @@ -365,27 +365,8 @@ Patch11: lo-7.6-ppc64le-tests.patch # https://bugs.documentfoundation.org/show_bug.cgi?id=158108 Patch12: libreoffice-7.5.8.2-icu-74-compatibility.patch -# 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 -Patch24: 0004-Fuentes-monserrat-y-gmx.patch -Patch25: 0005-Fonts-added.patch -Patch26: 0006-Modificado-archivo-tar-xz-a-gz.patch -Patch27: 0007-Corregida-instrucci-n-de-descarga.patch -Patch28: 0008-Cambios-en-logo.patch -Patch29: 0009-Modificado-link-de-descarga-de-fuentes.patch -Patch30: 0010-Restauracion-link-repos-src.patch -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-Cambios-en-logo.patch -Patch36: 0016-Felipe-Carrillo-Puerto-image-added.patch -Patch37: 0017-Restaurar-el-cambio-de-copyright.patch -Patch38: 0018-Eliminar-with-package-version-de-nuestras-distro-con.patch -Patch39: 0019-Eliminar-with-jdk-home-de-nuestras-distro-configs.patch - +# Patchset gob.mx 1.3 +Patch21: libreoffice-24.2.3.2+gobmx1.3-patchset.patch Patch500: 0001-disable-libe-book-support.patch # https://lists.freedesktop.org/archives/libreoffice/2023-September/090948.html @@ -2873,8 +2854,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || : %{_includedir}/LibreOfficeKit %changelog -* Tue Jun 25 2024 Sandino Araico Sánchez - 1:24.2.3.2-2+gob.mx1.2 +* Tue Jun 25 2024 Sandino Araico Sánchez - 1:24.2.3.2-2+gob.mx1.3 - Merge 24.2.3.2.fc40 +- Patchset gob.mx 1.3 * Mon Jun 24 2024 Sandino Araico Sánchez - 1:24.2.2.2-5+gob.mx1.2 - Temporarily disabled patch for kf6 scaling From 909e121f1865a848a6caadb2ee5e24c60d60966b Mon Sep 17 00:00:00 2001 From: Sandino Araico Sanchez Date: Tue, 25 Jun 2024 15:17:51 -0600 Subject: [PATCH 14/19] =?UTF-8?q?=20Actualizaci=C3=B3n=20del=20patchset=20?= =?UTF-8?q?gob.mx=201.3=20para=20Libreoffice=2024.2.4.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...hset.patch => libreoffice-24.2.4.2+gobmx1.3-patchset.patch} | 2 +- rpmbuild/SPECS/libreoffice.spec | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) rename rpmbuild/SOURCES/{libreoffice-24.2.3.2+gobmx1.3-patchset.patch => libreoffice-24.2.4.2+gobmx1.3-patchset.patch} (99%) diff --git a/rpmbuild/SOURCES/libreoffice-24.2.3.2+gobmx1.3-patchset.patch b/rpmbuild/SOURCES/libreoffice-24.2.4.2+gobmx1.3-patchset.patch similarity index 99% rename from rpmbuild/SOURCES/libreoffice-24.2.3.2+gobmx1.3-patchset.patch rename to rpmbuild/SOURCES/libreoffice-24.2.4.2+gobmx1.3-patchset.patch index 45d884c..d2bbec1 100644 --- a/rpmbuild/SOURCES/libreoffice-24.2.3.2+gobmx1.3-patchset.patch +++ b/rpmbuild/SOURCES/libreoffice-24.2.4.2+gobmx1.3-patchset.patch @@ -198,7 +198,7 @@ index 000000000000..25996d9d6710 +--with-vendor=INFOTEC +--disable-community-flavor diff --git a/download.lst b/download.lst -index 0f16c450c5cd..e34dc1497e5b 100644 +index d3dad6bdbe82..c921f29647e0 100644 --- a/download.lst +++ b/download.lst @@ -3,6 +3,9 @@ diff --git a/rpmbuild/SPECS/libreoffice.spec b/rpmbuild/SPECS/libreoffice.spec index c3752dd..5ab5413 100644 --- a/rpmbuild/SPECS/libreoffice.spec +++ b/rpmbuild/SPECS/libreoffice.spec @@ -366,7 +366,7 @@ Patch11: lo-7.6-ppc64le-tests.patch Patch12: libreoffice-7.5.8.2-icu-74-compatibility.patch # Patchset gob.mx 1.3 -Patch21: libreoffice-24.2.3.2+gobmx1.3-patchset.patch +Patch21: libreoffice-24.2.4.2+gobmx1.3-patchset.patch Patch500: 0001-disable-libe-book-support.patch # https://lists.freedesktop.org/archives/libreoffice/2023-September/090948.html @@ -2873,6 +2873,7 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || : %changelog * Tue Jun 25 2024 Sandino Araico Sánchez - 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 * Tue Jun 25 2024 Sandino Araico Sánchez - 1:24.2.3.2-2+gob.mx1.3 - Merge 24.2.3.2.fc40 From c7893173e7458c29c8466ddb4c0a0dcb037f12de Mon Sep 17 00:00:00 2001 From: Sandino Araico Sanchez Date: Tue, 25 Jun 2024 16:17:45 -0600 Subject: [PATCH 15/19] =?UTF-8?q?Fuentes=20Noto=20que=20aumentaron=20de=20?= =?UTF-8?q?versi=C3=B3n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rpmbuild/SPECS/libreoffice.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rpmbuild/SPECS/libreoffice.spec b/rpmbuild/SPECS/libreoffice.spec index 5ab5413..bf79efb 100644 --- a/rpmbuild/SPECS/libreoffice.spec +++ b/rpmbuild/SPECS/libreoffice.spec @@ -149,20 +149,19 @@ Source47: https://raw.githubusercontent.com/gnome-design-team/gnome-icons/ Source48: https://raw.githubusercontent.com/gnome-design-team/gnome-icons/master/apps-symbolic/Adwaita/scalable/apps/libreoffice-writer-symbolic.svg # New fonts required in 24.2 -Source49: %{external_url}/NotoNaskhArabic-v2.016.zip +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.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.003.zip +Source60: %{external_url}/NotoSerifHebrew-v2.004.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 @@ -2874,6 +2873,7 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || : * Tue Jun 25 2024 Sandino Araico Sánchez - 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 - 1:24.2.3.2-2+gob.mx1.3 - Merge 24.2.3.2.fc40 From a195f30aff951799f3c0cf39cc35702bd6ee6a01 Mon Sep 17 00:00:00 2001 From: Sandino Araico Sanchez Date: Tue, 25 Jun 2024 23:54:57 -0600 Subject: [PATCH 16/19] Rebuild on fedora 39 --- rpmbuild/SPECS/libreoffice.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/rpmbuild/SPECS/libreoffice.spec b/rpmbuild/SPECS/libreoffice.spec index a88dc55..c3a07e3 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}.2 -Release: 3+gob.mx1.3%{?dist} +Release: 4+gob.mx1.3%{?dist} # default new files are: MPLv2 # older files are typically: MPLv2 incorporating work under ASLv2 @@ -2870,7 +2870,11 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || : %{_includedir}/LibreOfficeKit %changelog -* Tue Jun 25 2024 Sandino Araico Sánchez - 1:24.2.4.2-2+gob.mx1.3 +* Tue Jun 25 2024 Sandino Araico Sánchez - 1:24.2.4.2-4+gob.mx1.3 +- Merge gob.mx-1.3-24.2.4.2-fc40 +- Rebuild on Fedora 39 + +* Tue Jun 25 2024 Sandino Araico Sánchez - 1:24.2.4.2-3+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 From 8bc92a063946eb696b84cae18fff811073354f2e Mon Sep 17 00:00:00 2001 From: Sandino Araico Sanchez Date: Fri, 28 Jun 2024 04:07:38 -0600 Subject: [PATCH 17/19] =?UTF-8?q?Directorio=20rpmbuild=20para=20evitarnos?= =?UTF-8?q?=20ambig=C3=BCedades=20con=20CentOS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CentOS-9 | 1 + .../SOURCES/0001-cui-fix-without-java-build.patch | 0 .../SOURCES/0001-disable-libe-book-support.patch | 0 .../SOURCES/0001-don-t-suppress-crashes.patch | 0 ...build-SvxJavaClassPathDlg-SetClassPath-for.patch | 0 .../SOURCES/7.4.6-unit-tests.patch | 0 .../SOURCES/7.5.0-unit-tests.patch | 0 .../SOURCES/7.5.1-unit-tests.patch | 0 {CentOS-9 => rpmbuild}/SOURCES/GMX-Acuerdo.pdf | Bin {CentOS-9 => rpmbuild}/SOURCES/coolwsd.service | 0 .../SOURCES/liborcus-noexamples.patch | 0 ...-Archivos-de-distro-config-de-brand-Office.patch | 0 ...-Modificacion-al-build-y-borrado-UPDATEURL.patch | 0 .../0003-Custom-images-and-referencies-added.patch | 0 .../patchset-1.0/0004-Fuentes-monserrat-y-gmx.patch | 0 .../SOURCES/patchset-1.0/0005-Fonts-added.patch | 0 .../0006-Modificado-archivo-tar-xz-a-gz.patch | 0 .../0007-Corregida-instrucci-n-de-descarga.patch | 0 .../SOURCES/patchset-1.0/0008-Cambios-en-logo.patch | 0 ...009-Modificado-link-de-descarga-de-fuentes.patch | 0 .../0010-Restauracion-link-repos-src.patch | 0 .../patchset-1.0/0011-logo-image-updated.patch | 0 .../0012-Update-OfficeLinux.conf-with-lang-es.patch | 0 .../patchset-1.0/0013-Update-OfficeLinux.conf.patch | 0 .../patchset-1.0/0014-fix-error-make-install.patch | 0 .../SOURCES/patchset-1.0/0015-gob-mx-1.0.patch | 0 ...-Archivos-de-distro-config-de-brand-Office.patch | 0 ...-Modificacion-al-build-y-borrado-UPDATEURL.patch | 0 .../0003-Custom-images-and-referencies-added.patch | 0 .../patchset-1.1/0004-Fuentes-monserrat-y-gmx.patch | 0 .../SOURCES/patchset-1.1/0005-Fonts-added.patch | 0 .../0006-Modificado-archivo-tar-xz-a-gz.patch | 0 .../0007-Corregida-instrucci-n-de-descarga.patch | 0 .../SOURCES/patchset-1.1/0008-Cambios-en-logo.patch | 0 ...009-Modificado-link-de-descarga-de-fuentes.patch | 0 .../0010-Restauracion-link-repos-src.patch | 0 .../patchset-1.1/0011-logo-image-updated.patch | 0 .../0012-Update-OfficeLinux.conf-with-lang-es.patch | 0 .../patchset-1.1/0013-Update-OfficeLinux.conf.patch | 0 .../patchset-1.1/0014-fix-error-make-install.patch | 0 .../SOURCES/patchset-1.1/0015-gob-mx-1.0.patch | 0 ...-minor-version-OS-to-PDF-producer-metadata.patch | 0 .../patchset-1.1/0017-CPPUNIT-Calc-fixed.patch | 0 {CentOS-9 => rpmbuild}/SPECS/annobin-symlink.spec | 0 {CentOS-9 => rpmbuild}/SPECS/argon2.spec | 0 {CentOS-9 => rpmbuild}/SPECS/coolwsd.spec | 0 {CentOS-9 => rpmbuild}/SPECS/frozen.spec | 0 {CentOS-9 => rpmbuild}/SPECS/gtk4.spec | 0 {CentOS-9 => rpmbuild}/SPECS/libcmis.spec | 0 {CentOS-9 => rpmbuild}/SPECS/libixion.spec | 0 {CentOS-9 => rpmbuild}/SPECS/liborcus.spec | 0 {CentOS-9 => rpmbuild}/SPECS/libreoffice.spec | 0 {CentOS-9 => rpmbuild}/SPECS/libwebp.spec | 0 {CentOS-9 => rpmbuild}/SPECS/mdds.spec | 0 {CentOS-9 => rpmbuild}/SPECS/zxcvbn-c.spec | 0 {CentOS-9 => rpmbuild}/SPECS/zxing-cpp.spec | 0 56 files changed, 1 insertion(+) create mode 120000 CentOS-9 rename {CentOS-9 => rpmbuild}/SOURCES/0001-cui-fix-without-java-build.patch (100%) rename {CentOS-9 => rpmbuild}/SOURCES/0001-disable-libe-book-support.patch (100%) rename {CentOS-9 => rpmbuild}/SOURCES/0001-don-t-suppress-crashes.patch (100%) rename {CentOS-9 => rpmbuild}/SOURCES/0002-cui-don-t-build-SvxJavaClassPathDlg-SetClassPath-for.patch (100%) rename {CentOS-9 => rpmbuild}/SOURCES/7.4.6-unit-tests.patch (100%) rename {CentOS-9 => rpmbuild}/SOURCES/7.5.0-unit-tests.patch (100%) rename {CentOS-9 => rpmbuild}/SOURCES/7.5.1-unit-tests.patch (100%) rename {CentOS-9 => rpmbuild}/SOURCES/GMX-Acuerdo.pdf (100%) rename {CentOS-9 => rpmbuild}/SOURCES/coolwsd.service (100%) rename {CentOS-9 => rpmbuild}/SOURCES/liborcus-noexamples.patch (100%) rename {CentOS-9 => rpmbuild}/SOURCES/patchset-1.0/0001-Archivos-de-distro-config-de-brand-Office.patch (100%) rename {CentOS-9 => rpmbuild}/SOURCES/patchset-1.0/0002-Modificacion-al-build-y-borrado-UPDATEURL.patch (100%) rename {CentOS-9 => rpmbuild}/SOURCES/patchset-1.0/0003-Custom-images-and-referencies-added.patch (100%) rename {CentOS-9 => rpmbuild}/SOURCES/patchset-1.0/0004-Fuentes-monserrat-y-gmx.patch (100%) rename {CentOS-9 => rpmbuild}/SOURCES/patchset-1.0/0005-Fonts-added.patch (100%) rename {CentOS-9 => rpmbuild}/SOURCES/patchset-1.0/0006-Modificado-archivo-tar-xz-a-gz.patch (100%) rename {CentOS-9 => rpmbuild}/SOURCES/patchset-1.0/0007-Corregida-instrucci-n-de-descarga.patch (100%) rename {CentOS-9 => rpmbuild}/SOURCES/patchset-1.0/0008-Cambios-en-logo.patch (100%) rename {CentOS-9 => rpmbuild}/SOURCES/patchset-1.0/0009-Modificado-link-de-descarga-de-fuentes.patch (100%) rename {CentOS-9 => rpmbuild}/SOURCES/patchset-1.0/0010-Restauracion-link-repos-src.patch (100%) rename {CentOS-9 => rpmbuild}/SOURCES/patchset-1.0/0011-logo-image-updated.patch (100%) rename {CentOS-9 => rpmbuild}/SOURCES/patchset-1.0/0012-Update-OfficeLinux.conf-with-lang-es.patch (100%) rename {CentOS-9 => rpmbuild}/SOURCES/patchset-1.0/0013-Update-OfficeLinux.conf.patch (100%) rename {CentOS-9 => rpmbuild}/SOURCES/patchset-1.0/0014-fix-error-make-install.patch (100%) rename {CentOS-9 => rpmbuild}/SOURCES/patchset-1.0/0015-gob-mx-1.0.patch (100%) rename {CentOS-9 => rpmbuild}/SOURCES/patchset-1.1/0001-Archivos-de-distro-config-de-brand-Office.patch (100%) rename {CentOS-9 => rpmbuild}/SOURCES/patchset-1.1/0002-Modificacion-al-build-y-borrado-UPDATEURL.patch (100%) rename {CentOS-9 => rpmbuild}/SOURCES/patchset-1.1/0003-Custom-images-and-referencies-added.patch (100%) rename {CentOS-9 => rpmbuild}/SOURCES/patchset-1.1/0004-Fuentes-monserrat-y-gmx.patch (100%) rename {CentOS-9 => rpmbuild}/SOURCES/patchset-1.1/0005-Fonts-added.patch (100%) rename {CentOS-9 => rpmbuild}/SOURCES/patchset-1.1/0006-Modificado-archivo-tar-xz-a-gz.patch (100%) rename {CentOS-9 => rpmbuild}/SOURCES/patchset-1.1/0007-Corregida-instrucci-n-de-descarga.patch (100%) rename {CentOS-9 => rpmbuild}/SOURCES/patchset-1.1/0008-Cambios-en-logo.patch (100%) rename {CentOS-9 => rpmbuild}/SOURCES/patchset-1.1/0009-Modificado-link-de-descarga-de-fuentes.patch (100%) rename {CentOS-9 => rpmbuild}/SOURCES/patchset-1.1/0010-Restauracion-link-repos-src.patch (100%) rename {CentOS-9 => rpmbuild}/SOURCES/patchset-1.1/0011-logo-image-updated.patch (100%) rename {CentOS-9 => rpmbuild}/SOURCES/patchset-1.1/0012-Update-OfficeLinux.conf-with-lang-es.patch (100%) rename {CentOS-9 => rpmbuild}/SOURCES/patchset-1.1/0013-Update-OfficeLinux.conf.patch (100%) rename {CentOS-9 => rpmbuild}/SOURCES/patchset-1.1/0014-fix-error-make-install.patch (100%) rename {CentOS-9 => rpmbuild}/SOURCES/patchset-1.1/0015-gob-mx-1.0.patch (100%) rename {CentOS-9 => rpmbuild}/SOURCES/patchset-1.1/0016-Add-minor-version-OS-to-PDF-producer-metadata.patch (100%) rename {CentOS-9 => rpmbuild}/SOURCES/patchset-1.1/0017-CPPUNIT-Calc-fixed.patch (100%) rename {CentOS-9 => rpmbuild}/SPECS/annobin-symlink.spec (100%) rename {CentOS-9 => rpmbuild}/SPECS/argon2.spec (100%) rename {CentOS-9 => rpmbuild}/SPECS/coolwsd.spec (100%) rename {CentOS-9 => rpmbuild}/SPECS/frozen.spec (100%) rename {CentOS-9 => rpmbuild}/SPECS/gtk4.spec (100%) rename {CentOS-9 => rpmbuild}/SPECS/libcmis.spec (100%) rename {CentOS-9 => rpmbuild}/SPECS/libixion.spec (100%) rename {CentOS-9 => rpmbuild}/SPECS/liborcus.spec (100%) rename {CentOS-9 => rpmbuild}/SPECS/libreoffice.spec (100%) rename {CentOS-9 => rpmbuild}/SPECS/libwebp.spec (100%) rename {CentOS-9 => rpmbuild}/SPECS/mdds.spec (100%) rename {CentOS-9 => rpmbuild}/SPECS/zxcvbn-c.spec (100%) rename {CentOS-9 => rpmbuild}/SPECS/zxing-cpp.spec (100%) diff --git a/CentOS-9 b/CentOS-9 new file mode 120000 index 0000000..8dcc934 --- /dev/null +++ b/CentOS-9 @@ -0,0 +1 @@ +rpmbuild \ No newline at end of file diff --git a/CentOS-9/SOURCES/0001-cui-fix-without-java-build.patch b/rpmbuild/SOURCES/0001-cui-fix-without-java-build.patch similarity index 100% rename from CentOS-9/SOURCES/0001-cui-fix-without-java-build.patch rename to rpmbuild/SOURCES/0001-cui-fix-without-java-build.patch diff --git a/CentOS-9/SOURCES/0001-disable-libe-book-support.patch b/rpmbuild/SOURCES/0001-disable-libe-book-support.patch similarity index 100% rename from CentOS-9/SOURCES/0001-disable-libe-book-support.patch rename to rpmbuild/SOURCES/0001-disable-libe-book-support.patch diff --git a/CentOS-9/SOURCES/0001-don-t-suppress-crashes.patch b/rpmbuild/SOURCES/0001-don-t-suppress-crashes.patch similarity index 100% rename from CentOS-9/SOURCES/0001-don-t-suppress-crashes.patch rename to rpmbuild/SOURCES/0001-don-t-suppress-crashes.patch diff --git a/CentOS-9/SOURCES/0002-cui-don-t-build-SvxJavaClassPathDlg-SetClassPath-for.patch b/rpmbuild/SOURCES/0002-cui-don-t-build-SvxJavaClassPathDlg-SetClassPath-for.patch similarity index 100% rename from CentOS-9/SOURCES/0002-cui-don-t-build-SvxJavaClassPathDlg-SetClassPath-for.patch rename to rpmbuild/SOURCES/0002-cui-don-t-build-SvxJavaClassPathDlg-SetClassPath-for.patch diff --git a/CentOS-9/SOURCES/7.4.6-unit-tests.patch b/rpmbuild/SOURCES/7.4.6-unit-tests.patch similarity index 100% rename from CentOS-9/SOURCES/7.4.6-unit-tests.patch rename to rpmbuild/SOURCES/7.4.6-unit-tests.patch diff --git a/CentOS-9/SOURCES/7.5.0-unit-tests.patch b/rpmbuild/SOURCES/7.5.0-unit-tests.patch similarity index 100% rename from CentOS-9/SOURCES/7.5.0-unit-tests.patch rename to rpmbuild/SOURCES/7.5.0-unit-tests.patch diff --git a/CentOS-9/SOURCES/7.5.1-unit-tests.patch b/rpmbuild/SOURCES/7.5.1-unit-tests.patch similarity index 100% rename from CentOS-9/SOURCES/7.5.1-unit-tests.patch rename to rpmbuild/SOURCES/7.5.1-unit-tests.patch diff --git a/CentOS-9/SOURCES/GMX-Acuerdo.pdf b/rpmbuild/SOURCES/GMX-Acuerdo.pdf similarity index 100% rename from CentOS-9/SOURCES/GMX-Acuerdo.pdf rename to rpmbuild/SOURCES/GMX-Acuerdo.pdf diff --git a/CentOS-9/SOURCES/coolwsd.service b/rpmbuild/SOURCES/coolwsd.service similarity index 100% rename from CentOS-9/SOURCES/coolwsd.service rename to rpmbuild/SOURCES/coolwsd.service diff --git a/CentOS-9/SOURCES/liborcus-noexamples.patch b/rpmbuild/SOURCES/liborcus-noexamples.patch similarity index 100% rename from CentOS-9/SOURCES/liborcus-noexamples.patch rename to rpmbuild/SOURCES/liborcus-noexamples.patch diff --git a/CentOS-9/SOURCES/patchset-1.0/0001-Archivos-de-distro-config-de-brand-Office.patch b/rpmbuild/SOURCES/patchset-1.0/0001-Archivos-de-distro-config-de-brand-Office.patch similarity index 100% rename from CentOS-9/SOURCES/patchset-1.0/0001-Archivos-de-distro-config-de-brand-Office.patch rename to rpmbuild/SOURCES/patchset-1.0/0001-Archivos-de-distro-config-de-brand-Office.patch diff --git a/CentOS-9/SOURCES/patchset-1.0/0002-Modificacion-al-build-y-borrado-UPDATEURL.patch b/rpmbuild/SOURCES/patchset-1.0/0002-Modificacion-al-build-y-borrado-UPDATEURL.patch similarity index 100% rename from CentOS-9/SOURCES/patchset-1.0/0002-Modificacion-al-build-y-borrado-UPDATEURL.patch rename to rpmbuild/SOURCES/patchset-1.0/0002-Modificacion-al-build-y-borrado-UPDATEURL.patch diff --git a/CentOS-9/SOURCES/patchset-1.0/0003-Custom-images-and-referencies-added.patch b/rpmbuild/SOURCES/patchset-1.0/0003-Custom-images-and-referencies-added.patch similarity index 100% rename from CentOS-9/SOURCES/patchset-1.0/0003-Custom-images-and-referencies-added.patch rename to rpmbuild/SOURCES/patchset-1.0/0003-Custom-images-and-referencies-added.patch diff --git a/CentOS-9/SOURCES/patchset-1.0/0004-Fuentes-monserrat-y-gmx.patch b/rpmbuild/SOURCES/patchset-1.0/0004-Fuentes-monserrat-y-gmx.patch similarity index 100% rename from CentOS-9/SOURCES/patchset-1.0/0004-Fuentes-monserrat-y-gmx.patch rename to rpmbuild/SOURCES/patchset-1.0/0004-Fuentes-monserrat-y-gmx.patch diff --git a/CentOS-9/SOURCES/patchset-1.0/0005-Fonts-added.patch b/rpmbuild/SOURCES/patchset-1.0/0005-Fonts-added.patch similarity index 100% rename from CentOS-9/SOURCES/patchset-1.0/0005-Fonts-added.patch rename to rpmbuild/SOURCES/patchset-1.0/0005-Fonts-added.patch diff --git a/CentOS-9/SOURCES/patchset-1.0/0006-Modificado-archivo-tar-xz-a-gz.patch b/rpmbuild/SOURCES/patchset-1.0/0006-Modificado-archivo-tar-xz-a-gz.patch similarity index 100% rename from CentOS-9/SOURCES/patchset-1.0/0006-Modificado-archivo-tar-xz-a-gz.patch rename to rpmbuild/SOURCES/patchset-1.0/0006-Modificado-archivo-tar-xz-a-gz.patch diff --git a/CentOS-9/SOURCES/patchset-1.0/0007-Corregida-instrucci-n-de-descarga.patch b/rpmbuild/SOURCES/patchset-1.0/0007-Corregida-instrucci-n-de-descarga.patch similarity index 100% rename from CentOS-9/SOURCES/patchset-1.0/0007-Corregida-instrucci-n-de-descarga.patch rename to rpmbuild/SOURCES/patchset-1.0/0007-Corregida-instrucci-n-de-descarga.patch diff --git a/CentOS-9/SOURCES/patchset-1.0/0008-Cambios-en-logo.patch b/rpmbuild/SOURCES/patchset-1.0/0008-Cambios-en-logo.patch similarity index 100% rename from CentOS-9/SOURCES/patchset-1.0/0008-Cambios-en-logo.patch rename to rpmbuild/SOURCES/patchset-1.0/0008-Cambios-en-logo.patch diff --git a/CentOS-9/SOURCES/patchset-1.0/0009-Modificado-link-de-descarga-de-fuentes.patch b/rpmbuild/SOURCES/patchset-1.0/0009-Modificado-link-de-descarga-de-fuentes.patch similarity index 100% rename from CentOS-9/SOURCES/patchset-1.0/0009-Modificado-link-de-descarga-de-fuentes.patch rename to rpmbuild/SOURCES/patchset-1.0/0009-Modificado-link-de-descarga-de-fuentes.patch diff --git a/CentOS-9/SOURCES/patchset-1.0/0010-Restauracion-link-repos-src.patch b/rpmbuild/SOURCES/patchset-1.0/0010-Restauracion-link-repos-src.patch similarity index 100% rename from CentOS-9/SOURCES/patchset-1.0/0010-Restauracion-link-repos-src.patch rename to rpmbuild/SOURCES/patchset-1.0/0010-Restauracion-link-repos-src.patch diff --git a/CentOS-9/SOURCES/patchset-1.0/0011-logo-image-updated.patch b/rpmbuild/SOURCES/patchset-1.0/0011-logo-image-updated.patch similarity index 100% rename from CentOS-9/SOURCES/patchset-1.0/0011-logo-image-updated.patch rename to rpmbuild/SOURCES/patchset-1.0/0011-logo-image-updated.patch diff --git a/CentOS-9/SOURCES/patchset-1.0/0012-Update-OfficeLinux.conf-with-lang-es.patch b/rpmbuild/SOURCES/patchset-1.0/0012-Update-OfficeLinux.conf-with-lang-es.patch similarity index 100% rename from CentOS-9/SOURCES/patchset-1.0/0012-Update-OfficeLinux.conf-with-lang-es.patch rename to rpmbuild/SOURCES/patchset-1.0/0012-Update-OfficeLinux.conf-with-lang-es.patch diff --git a/CentOS-9/SOURCES/patchset-1.0/0013-Update-OfficeLinux.conf.patch b/rpmbuild/SOURCES/patchset-1.0/0013-Update-OfficeLinux.conf.patch similarity index 100% rename from CentOS-9/SOURCES/patchset-1.0/0013-Update-OfficeLinux.conf.patch rename to rpmbuild/SOURCES/patchset-1.0/0013-Update-OfficeLinux.conf.patch diff --git a/CentOS-9/SOURCES/patchset-1.0/0014-fix-error-make-install.patch b/rpmbuild/SOURCES/patchset-1.0/0014-fix-error-make-install.patch similarity index 100% rename from CentOS-9/SOURCES/patchset-1.0/0014-fix-error-make-install.patch rename to rpmbuild/SOURCES/patchset-1.0/0014-fix-error-make-install.patch diff --git a/CentOS-9/SOURCES/patchset-1.0/0015-gob-mx-1.0.patch b/rpmbuild/SOURCES/patchset-1.0/0015-gob-mx-1.0.patch similarity index 100% rename from CentOS-9/SOURCES/patchset-1.0/0015-gob-mx-1.0.patch rename to rpmbuild/SOURCES/patchset-1.0/0015-gob-mx-1.0.patch diff --git a/CentOS-9/SOURCES/patchset-1.1/0001-Archivos-de-distro-config-de-brand-Office.patch b/rpmbuild/SOURCES/patchset-1.1/0001-Archivos-de-distro-config-de-brand-Office.patch similarity index 100% rename from CentOS-9/SOURCES/patchset-1.1/0001-Archivos-de-distro-config-de-brand-Office.patch rename to rpmbuild/SOURCES/patchset-1.1/0001-Archivos-de-distro-config-de-brand-Office.patch diff --git a/CentOS-9/SOURCES/patchset-1.1/0002-Modificacion-al-build-y-borrado-UPDATEURL.patch b/rpmbuild/SOURCES/patchset-1.1/0002-Modificacion-al-build-y-borrado-UPDATEURL.patch similarity index 100% rename from CentOS-9/SOURCES/patchset-1.1/0002-Modificacion-al-build-y-borrado-UPDATEURL.patch rename to rpmbuild/SOURCES/patchset-1.1/0002-Modificacion-al-build-y-borrado-UPDATEURL.patch diff --git a/CentOS-9/SOURCES/patchset-1.1/0003-Custom-images-and-referencies-added.patch b/rpmbuild/SOURCES/patchset-1.1/0003-Custom-images-and-referencies-added.patch similarity index 100% rename from CentOS-9/SOURCES/patchset-1.1/0003-Custom-images-and-referencies-added.patch rename to rpmbuild/SOURCES/patchset-1.1/0003-Custom-images-and-referencies-added.patch diff --git a/CentOS-9/SOURCES/patchset-1.1/0004-Fuentes-monserrat-y-gmx.patch b/rpmbuild/SOURCES/patchset-1.1/0004-Fuentes-monserrat-y-gmx.patch similarity index 100% rename from CentOS-9/SOURCES/patchset-1.1/0004-Fuentes-monserrat-y-gmx.patch rename to rpmbuild/SOURCES/patchset-1.1/0004-Fuentes-monserrat-y-gmx.patch diff --git a/CentOS-9/SOURCES/patchset-1.1/0005-Fonts-added.patch b/rpmbuild/SOURCES/patchset-1.1/0005-Fonts-added.patch similarity index 100% rename from CentOS-9/SOURCES/patchset-1.1/0005-Fonts-added.patch rename to rpmbuild/SOURCES/patchset-1.1/0005-Fonts-added.patch diff --git a/CentOS-9/SOURCES/patchset-1.1/0006-Modificado-archivo-tar-xz-a-gz.patch b/rpmbuild/SOURCES/patchset-1.1/0006-Modificado-archivo-tar-xz-a-gz.patch similarity index 100% rename from CentOS-9/SOURCES/patchset-1.1/0006-Modificado-archivo-tar-xz-a-gz.patch rename to rpmbuild/SOURCES/patchset-1.1/0006-Modificado-archivo-tar-xz-a-gz.patch diff --git a/CentOS-9/SOURCES/patchset-1.1/0007-Corregida-instrucci-n-de-descarga.patch b/rpmbuild/SOURCES/patchset-1.1/0007-Corregida-instrucci-n-de-descarga.patch similarity index 100% rename from CentOS-9/SOURCES/patchset-1.1/0007-Corregida-instrucci-n-de-descarga.patch rename to rpmbuild/SOURCES/patchset-1.1/0007-Corregida-instrucci-n-de-descarga.patch diff --git a/CentOS-9/SOURCES/patchset-1.1/0008-Cambios-en-logo.patch b/rpmbuild/SOURCES/patchset-1.1/0008-Cambios-en-logo.patch similarity index 100% rename from CentOS-9/SOURCES/patchset-1.1/0008-Cambios-en-logo.patch rename to rpmbuild/SOURCES/patchset-1.1/0008-Cambios-en-logo.patch diff --git a/CentOS-9/SOURCES/patchset-1.1/0009-Modificado-link-de-descarga-de-fuentes.patch b/rpmbuild/SOURCES/patchset-1.1/0009-Modificado-link-de-descarga-de-fuentes.patch similarity index 100% rename from CentOS-9/SOURCES/patchset-1.1/0009-Modificado-link-de-descarga-de-fuentes.patch rename to rpmbuild/SOURCES/patchset-1.1/0009-Modificado-link-de-descarga-de-fuentes.patch diff --git a/CentOS-9/SOURCES/patchset-1.1/0010-Restauracion-link-repos-src.patch b/rpmbuild/SOURCES/patchset-1.1/0010-Restauracion-link-repos-src.patch similarity index 100% rename from CentOS-9/SOURCES/patchset-1.1/0010-Restauracion-link-repos-src.patch rename to rpmbuild/SOURCES/patchset-1.1/0010-Restauracion-link-repos-src.patch diff --git a/CentOS-9/SOURCES/patchset-1.1/0011-logo-image-updated.patch b/rpmbuild/SOURCES/patchset-1.1/0011-logo-image-updated.patch similarity index 100% rename from CentOS-9/SOURCES/patchset-1.1/0011-logo-image-updated.patch rename to rpmbuild/SOURCES/patchset-1.1/0011-logo-image-updated.patch diff --git a/CentOS-9/SOURCES/patchset-1.1/0012-Update-OfficeLinux.conf-with-lang-es.patch b/rpmbuild/SOURCES/patchset-1.1/0012-Update-OfficeLinux.conf-with-lang-es.patch similarity index 100% rename from CentOS-9/SOURCES/patchset-1.1/0012-Update-OfficeLinux.conf-with-lang-es.patch rename to rpmbuild/SOURCES/patchset-1.1/0012-Update-OfficeLinux.conf-with-lang-es.patch diff --git a/CentOS-9/SOURCES/patchset-1.1/0013-Update-OfficeLinux.conf.patch b/rpmbuild/SOURCES/patchset-1.1/0013-Update-OfficeLinux.conf.patch similarity index 100% rename from CentOS-9/SOURCES/patchset-1.1/0013-Update-OfficeLinux.conf.patch rename to rpmbuild/SOURCES/patchset-1.1/0013-Update-OfficeLinux.conf.patch diff --git a/CentOS-9/SOURCES/patchset-1.1/0014-fix-error-make-install.patch b/rpmbuild/SOURCES/patchset-1.1/0014-fix-error-make-install.patch similarity index 100% rename from CentOS-9/SOURCES/patchset-1.1/0014-fix-error-make-install.patch rename to rpmbuild/SOURCES/patchset-1.1/0014-fix-error-make-install.patch diff --git a/CentOS-9/SOURCES/patchset-1.1/0015-gob-mx-1.0.patch b/rpmbuild/SOURCES/patchset-1.1/0015-gob-mx-1.0.patch similarity index 100% rename from CentOS-9/SOURCES/patchset-1.1/0015-gob-mx-1.0.patch rename to rpmbuild/SOURCES/patchset-1.1/0015-gob-mx-1.0.patch diff --git a/CentOS-9/SOURCES/patchset-1.1/0016-Add-minor-version-OS-to-PDF-producer-metadata.patch b/rpmbuild/SOURCES/patchset-1.1/0016-Add-minor-version-OS-to-PDF-producer-metadata.patch similarity index 100% rename from CentOS-9/SOURCES/patchset-1.1/0016-Add-minor-version-OS-to-PDF-producer-metadata.patch rename to rpmbuild/SOURCES/patchset-1.1/0016-Add-minor-version-OS-to-PDF-producer-metadata.patch diff --git a/CentOS-9/SOURCES/patchset-1.1/0017-CPPUNIT-Calc-fixed.patch b/rpmbuild/SOURCES/patchset-1.1/0017-CPPUNIT-Calc-fixed.patch similarity index 100% rename from CentOS-9/SOURCES/patchset-1.1/0017-CPPUNIT-Calc-fixed.patch rename to rpmbuild/SOURCES/patchset-1.1/0017-CPPUNIT-Calc-fixed.patch diff --git a/CentOS-9/SPECS/annobin-symlink.spec b/rpmbuild/SPECS/annobin-symlink.spec similarity index 100% rename from CentOS-9/SPECS/annobin-symlink.spec rename to rpmbuild/SPECS/annobin-symlink.spec diff --git a/CentOS-9/SPECS/argon2.spec b/rpmbuild/SPECS/argon2.spec similarity index 100% rename from CentOS-9/SPECS/argon2.spec rename to rpmbuild/SPECS/argon2.spec diff --git a/CentOS-9/SPECS/coolwsd.spec b/rpmbuild/SPECS/coolwsd.spec similarity index 100% rename from CentOS-9/SPECS/coolwsd.spec rename to rpmbuild/SPECS/coolwsd.spec diff --git a/CentOS-9/SPECS/frozen.spec b/rpmbuild/SPECS/frozen.spec similarity index 100% rename from CentOS-9/SPECS/frozen.spec rename to rpmbuild/SPECS/frozen.spec diff --git a/CentOS-9/SPECS/gtk4.spec b/rpmbuild/SPECS/gtk4.spec similarity index 100% rename from CentOS-9/SPECS/gtk4.spec rename to rpmbuild/SPECS/gtk4.spec diff --git a/CentOS-9/SPECS/libcmis.spec b/rpmbuild/SPECS/libcmis.spec similarity index 100% rename from CentOS-9/SPECS/libcmis.spec rename to rpmbuild/SPECS/libcmis.spec diff --git a/CentOS-9/SPECS/libixion.spec b/rpmbuild/SPECS/libixion.spec similarity index 100% rename from CentOS-9/SPECS/libixion.spec rename to rpmbuild/SPECS/libixion.spec diff --git a/CentOS-9/SPECS/liborcus.spec b/rpmbuild/SPECS/liborcus.spec similarity index 100% rename from CentOS-9/SPECS/liborcus.spec rename to rpmbuild/SPECS/liborcus.spec diff --git a/CentOS-9/SPECS/libreoffice.spec b/rpmbuild/SPECS/libreoffice.spec similarity index 100% rename from CentOS-9/SPECS/libreoffice.spec rename to rpmbuild/SPECS/libreoffice.spec diff --git a/CentOS-9/SPECS/libwebp.spec b/rpmbuild/SPECS/libwebp.spec similarity index 100% rename from CentOS-9/SPECS/libwebp.spec rename to rpmbuild/SPECS/libwebp.spec diff --git a/CentOS-9/SPECS/mdds.spec b/rpmbuild/SPECS/mdds.spec similarity index 100% rename from CentOS-9/SPECS/mdds.spec rename to rpmbuild/SPECS/mdds.spec diff --git a/CentOS-9/SPECS/zxcvbn-c.spec b/rpmbuild/SPECS/zxcvbn-c.spec similarity index 100% rename from CentOS-9/SPECS/zxcvbn-c.spec rename to rpmbuild/SPECS/zxcvbn-c.spec diff --git a/CentOS-9/SPECS/zxing-cpp.spec b/rpmbuild/SPECS/zxing-cpp.spec similarity index 100% rename from CentOS-9/SPECS/zxing-cpp.spec rename to rpmbuild/SPECS/zxing-cpp.spec From 81cd21acd2cd6d2003f79985705e044ebb52e2c8 Mon Sep 17 00:00:00 2001 From: Sandino Araico Sanchez Date: Fri, 28 Jun 2024 05:35:37 -0600 Subject: [PATCH 18/19] Removed old CentOS 8 backports --- CentOS-8/SOURCES/0001-gpgme.patch | 25 --- CentOS-8/SOURCES/0001-unistr.patch | 22 --- CentOS-8/SPECS/coolwsd.spec | 248 ----------------------------- 3 files changed, 295 deletions(-) delete mode 100644 CentOS-8/SOURCES/0001-gpgme.patch delete mode 100644 CentOS-8/SOURCES/0001-unistr.patch delete mode 100644 CentOS-8/SPECS/coolwsd.spec diff --git a/CentOS-8/SOURCES/0001-gpgme.patch b/CentOS-8/SOURCES/0001-gpgme.patch deleted file mode 100644 index 9ab589b..0000000 --- a/CentOS-8/SOURCES/0001-gpgme.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 1e4bed0bedcb90425ca1cb6be74153c68c1b40bc Tue Mar 29 00:00:00 2022 -From: -Date: Tue Mar 29 00:00:00 2022 -Subject: [PATCH] compatibility with gpgme-1.13.1 - -Change-Id: 1e4bed0bedcb90425ca1cb6be74153c68c1b40bc ---- - xmlsecurity/source/gpg/CertificateImpl.cxx | 5 +---- - 1 file changed, 1 additions(+), 4 deletions(-) - -diff -uri a/xmlsecurity/source/gpg/CertificateImpl.cxx b/xmlsecurity/source/gpg/CertificateImpl.cxx -index 0000000..e28482c 100644 ---- a/xmlsecurity/source/gpg/CertificateImpl.cxx 2022-02-28 12:19:33.000000000 -0600 -+++ b/xmlsecurity/source/gpg/CertificateImpl.cxx 2022-03-29 15:07:40.000000000 -0600 -@@ -215,9 +215,7 @@ - ctx->setArmor(false); // caller will base64-encode anyway - GpgME::Error err = ctx->exportPublicKeys( - key.primaryFingerprint(), -- data_out, -- officecfg::Office::Common::Security::OpenPGP::MinimalKeyExport::get() -- ? GpgME::Context::ExportMinimal : 0 -+ data_out - ); - - if (err) diff --git a/CentOS-8/SOURCES/0001-unistr.patch b/CentOS-8/SOURCES/0001-unistr.patch deleted file mode 100644 index 2afb46b..0000000 --- a/CentOS-8/SOURCES/0001-unistr.patch +++ /dev/null @@ -1,22 +0,0 @@ -From b4b20ade990d7cf75c4dc742af9770f0068f7948 Tue Mar 29 00:00:00 2022 -From: -Date: Tue Mar 29 00:00:00 2022 -Subject: [PATCH] aggregate 'icu_60::UnicodeString aResult' - -Change-Id: b4b20ade990d7cf75c4dc742af9770f0068f7948 ---- - i18nlangtag/source/languagetag/languagetagicu.cxx | 1 + - 1 file changed, 1 additions(+) - -diff --git a/i18nlangtag/source/languagetag/languagetagicu.cxx b/i18nlangtag/source/languagetag/languagetagicu.cxx -index 0000000..5e64791 100644 ---- a/i18nlangtag/source/languagetag/languagetagicu.cxx 2022-02-28 12:19:33.000000000 -0600 -+++ b/i18nlangtag/source/languagetag/languagetagicu.cxx 2022-03-29 04:34:25.000000000 -0600 -@@ -9,6 +9,7 @@ - - #include - #include -+#include - - - // static diff --git a/CentOS-8/SPECS/coolwsd.spec b/CentOS-8/SPECS/coolwsd.spec deleted file mode 100644 index e47fe84..0000000 --- a/CentOS-8/SPECS/coolwsd.spec +++ /dev/null @@ -1,248 +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/. - -%if 0%{?name_suffix:1} -Name: coolwsd%{name_suffix} -%else -Name: coolwsd -%endif -Version: 22.05.5.4 -Release: 1%{?dist} -Vendor: %{vendor} -Summary: Collabora Online WebSocket Daemon -License: EULA -Source0: coolwsd-22.05.5.4.tar.gz - -BuildRequires: cppunit-devel -BuildRequires: fontconfig -BuildRequires: gcc-c++ -BuildRequires: libcap-devel -BuildRequires: libpng-devel -BuildRequires: m4 -BuildRequires: make -BuildRequires: nodejs -BuildRequires: npm -BuildRequires: pam-devel -BuildRequires: poco-devel -BuildRequires: python3 -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 - -# openSUSE Leap 15.x, SLES12, SLES15 -%if 0%{?suse_version} -BuildRequires: libcap-progs linux-glibc-devel systemd-rpm-macros python3-polib python3-lxml -%endif - -Requires: libreoffice -Requires: libreoffice-calc -Requires: libreoffice-core -Requires: libreoffice-draw -Requires: libreoffice-graphicfilter -Requires: libreoffice-impress -Requires: libreoffice-langpack-en -Requires: libreoffice-math -Requires: libreoffice-pdfimport -Requires: libreoffice-ure -Requires: libreoffice-writer - -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 -%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 -n coolwsd-22.05.5.4 - -%build -# usando versión marrana (incluyendo una librería embebida) -%configure \ - --enable-silent-rules \ - --with-lokit-path=bundled/include \ - --with-lo-path=/usr/lib64/libreoffice \ - --disable-setcap \ -%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 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 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/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 -%{_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 -* Mon Aug 03 2015 Mihai Varga -- added the cronjob -* Tue May 19 2015 Tor Lillqvist -- Initial RPM release From 598e8cea825e83e2fa370c85b86a95b2c39ebad3 Mon Sep 17 00:00:00 2001 From: Sandino Araico Sanchez Date: Fri, 28 Jun 2024 15:44:06 -0600 Subject: [PATCH 19/19] Limpieza de patchsets viejos de gob.mx --- ...-Custom-images-and-referencies-added.patch | 2569 --------- .../0001-disable-libe-book-support.patch | 145 - .../SOURCES/0001-don-t-suppress-crashes.patch | 37 - ...vos-de-distro-config-de-brand-Office.patch | 62 - ...icacion-al-build-y-borrado-UPDATEURL.patch | 94 - .../0008-Fuentes-monserrat-y-gmx.patch | 25 - ...09-Corregida-instrucci-n-de-descarga.patch | 29 - rpmbuild/SOURCES/0010-Cambios-en-logo.patch | 5074 ----------------- ...dificado-link-de-descarga-de-fuentes.patch | 27 - .../0012-Restauracion-link-repos-src.patch | 25 - .../SOURCES/0013-logo-image-updated.patch | 2536 -------- rpmbuild/SOURCES/7.4.6-unit-tests.patch | 51 - rpmbuild/SOURCES/7.5.0-unit-tests.patch | 76 - rpmbuild/SOURCES/7.5.1-unit-tests.patch | 84 - ...-Custom-images-and-referencies-added.patch | 2581 --------- ...Update-OfficeLinux.conf-with-lang-es.patch | 21 - .../0013-Update-OfficeLinux.conf.patch | 30 - .../0014-fix-error-make-install.patch | 65 - .../patchset-1.0/0015-gob-mx-1.0.patch | 8 - ...vos-de-distro-config-de-brand-Office.patch | 62 - ...icacion-al-build-y-borrado-UPDATEURL.patch | 94 - .../0004-Fuentes-monserrat-y-gmx.patch | 171 - .../patchset-1.1/0005-Fonts-added.patch | 26 - .../0006-Modificado-archivo-tar-xz-a-gz.patch | 26 - .../patchset-1.1/0008-Cambios-en-logo.patch | 5074 ----------------- ...dificado-link-de-descarga-de-fuentes.patch | 27 - .../0011-logo-image-updated.patch | 2536 -------- ...Update-OfficeLinux.conf-with-lang-es.patch | 21 - .../0013-Update-OfficeLinux.conf.patch | 30 - .../0014-fix-error-make-install.patch | 65 - .../patchset-1.1/0015-gob-mx-1.0.patch | 0 ...-version-OS-to-PDF-producer-metadata.patch | 60 - .../0017-CPPUNIT-Calc-fixed.patch | 29 - 33 files changed, 21760 deletions(-) delete mode 100644 rpmbuild/SOURCES/0001-Custom-images-and-referencies-added.patch delete mode 100644 rpmbuild/SOURCES/0001-disable-libe-book-support.patch delete mode 100644 rpmbuild/SOURCES/0001-don-t-suppress-crashes.patch delete mode 100644 rpmbuild/SOURCES/0002-Archivos-de-distro-config-de-brand-Office.patch delete mode 100644 rpmbuild/SOURCES/0003-Modificacion-al-build-y-borrado-UPDATEURL.patch delete mode 100644 rpmbuild/SOURCES/0008-Fuentes-monserrat-y-gmx.patch delete mode 100644 rpmbuild/SOURCES/0009-Corregida-instrucci-n-de-descarga.patch delete mode 100644 rpmbuild/SOURCES/0010-Cambios-en-logo.patch delete mode 100644 rpmbuild/SOURCES/0011-Modificado-link-de-descarga-de-fuentes.patch delete mode 100644 rpmbuild/SOURCES/0012-Restauracion-link-repos-src.patch delete mode 100644 rpmbuild/SOURCES/0013-logo-image-updated.patch delete mode 100644 rpmbuild/SOURCES/7.4.6-unit-tests.patch delete mode 100644 rpmbuild/SOURCES/7.5.0-unit-tests.patch delete mode 100644 rpmbuild/SOURCES/7.5.1-unit-tests.patch delete mode 100644 rpmbuild/SOURCES/patchset-1.0/0003-Custom-images-and-referencies-added.patch delete mode 100644 rpmbuild/SOURCES/patchset-1.0/0012-Update-OfficeLinux.conf-with-lang-es.patch delete mode 100644 rpmbuild/SOURCES/patchset-1.0/0013-Update-OfficeLinux.conf.patch delete mode 100644 rpmbuild/SOURCES/patchset-1.0/0014-fix-error-make-install.patch delete mode 100644 rpmbuild/SOURCES/patchset-1.0/0015-gob-mx-1.0.patch delete mode 100644 rpmbuild/SOURCES/patchset-1.1/0001-Archivos-de-distro-config-de-brand-Office.patch delete mode 100644 rpmbuild/SOURCES/patchset-1.1/0002-Modificacion-al-build-y-borrado-UPDATEURL.patch delete mode 100644 rpmbuild/SOURCES/patchset-1.1/0004-Fuentes-monserrat-y-gmx.patch delete mode 100644 rpmbuild/SOURCES/patchset-1.1/0005-Fonts-added.patch delete mode 100644 rpmbuild/SOURCES/patchset-1.1/0006-Modificado-archivo-tar-xz-a-gz.patch delete mode 100644 rpmbuild/SOURCES/patchset-1.1/0008-Cambios-en-logo.patch delete mode 100644 rpmbuild/SOURCES/patchset-1.1/0009-Modificado-link-de-descarga-de-fuentes.patch delete mode 100644 rpmbuild/SOURCES/patchset-1.1/0011-logo-image-updated.patch delete mode 100644 rpmbuild/SOURCES/patchset-1.1/0012-Update-OfficeLinux.conf-with-lang-es.patch delete mode 100644 rpmbuild/SOURCES/patchset-1.1/0013-Update-OfficeLinux.conf.patch delete mode 100644 rpmbuild/SOURCES/patchset-1.1/0014-fix-error-make-install.patch delete mode 100644 rpmbuild/SOURCES/patchset-1.1/0015-gob-mx-1.0.patch delete mode 100644 rpmbuild/SOURCES/patchset-1.1/0016-Add-minor-version-OS-to-PDF-producer-metadata.patch delete mode 100644 rpmbuild/SOURCES/patchset-1.1/0017-CPPUNIT-Calc-fixed.patch diff --git a/rpmbuild/SOURCES/0001-Custom-images-and-referencies-added.patch b/rpmbuild/SOURCES/0001-Custom-images-and-referencies-added.patch deleted file mode 100644 index 8b940f1..0000000 --- a/rpmbuild/SOURCES/0001-Custom-images-and-referencies-added.patch +++ /dev/null @@ -1,2569 +0,0 @@ -From 8d6a7664ac7a644f58ca46e0d80c832f1e2549cc Mon Sep 17 00:00:00 2001 -From: Adlair Cerecedo-Mendez -Date: Mon, 19 Jun 2023 18:44:48 -0600 -Subject: [PATCH 03/18] Custom images and referencies added - -Change-Id: Ic7e4beefaf65fec8bb2b4ef03996b3ff5e849fee ---- - cui/source/dialogs/about.cxx | 7 +- - custom_images/MexGob.svg | 2516 ++++++++++++++++++++++++++++++++++ - 2 files changed, 2519 insertions(+), 4 deletions(-) - create mode 100644 custom_images/MexGob.svg - -diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx -index ce82e418cf9e..01073166f18b 100644 ---- a/cui/source/dialogs/about.cxx -+++ b/cui/source/dialogs/about.cxx -@@ -78,8 +78,7 @@ AboutDialog::AboutDialog(weld::Window *pParent) - OUString sbuildId = GetBuildString(); - if (IsStringValidGitHash(sbuildId)) { - const tools::Long nMaxChar = 25; -- m_pBuildLabel->set_uri("https://gerrit.libreoffice.org/gitweb?p=core.git;a=log;h=" -- + sbuildId); -+ m_pBuildLabel->set_uri("https://git.softwarelibre.mx/strepsirrhini/office-gobmx"); - m_pBuildLabel->set_label(sbuildId.getLength() > nMaxChar ? sbuildId.replaceAt( - nMaxChar, sbuildId.getLength() - nMaxChar, u"...") - : sbuildId); -@@ -112,7 +111,7 @@ AboutDialog::AboutDialog(weld::Window *pParent) - Graphic aGraphic(aBackgroundBitmap); - m_pBrandImage->set_image(aGraphic.GetXGraphic()); - } -- if (SfxApplication::loadBrandSvg("shell/about", aBackgroundBitmap, nWidth * 0.9)) { -+ if (SfxApplication::loadBrandSvg("shell/MexGob", aBackgroundBitmap, nWidth * 0.9)) { - // Eliminate white background when Skia is disabled by not drawing the - // background bitmap to a VirtualDevice. On most platforms, non-Skia - // VirtualDevices will be filled with a solid color when drawing -@@ -153,7 +152,7 @@ OUString AboutDialog::GetVersionString() { - OUString sVersion = CuiResId(TranslateId(nullptr, "%ABOUTBOXPRODUCTVERSION%ABOUTBOXPRODUCTVERSIONSUFFIX")) + " (" + arch + ")"; - - #if HAVE_FEATURE_COMMUNITY_FLAVOR -- sVersion += " / LibreOffice Community"; -+ sVersion += " / LibreOffice GOBMX"; - #endif - - return sVersion; -diff --git a/custom_images/MexGob.svg b/custom_images/MexGob.svg -new file mode 100644 -index 000000000000..6ad4cd79920c ---- /dev/null -+++ b/custom_images/MexGob.svg -@@ -0,0 +1,2516 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ --- -2.39.2 - diff --git a/rpmbuild/SOURCES/0001-disable-libe-book-support.patch b/rpmbuild/SOURCES/0001-disable-libe-book-support.patch deleted file mode 100644 index 2142734..0000000 --- a/rpmbuild/SOURCES/0001-disable-libe-book-support.patch +++ /dev/null @@ -1,145 +0,0 @@ -From 0b613b941c3ffbe432934269f8865bc1f9e59cde Mon Sep 17 00:00:00 2001 -From: rpm-build -Date: Tue, 27 Sep 2022 15:13:59 -0700 -Subject: [PATCH] disable libe-book support - ---- - configure.ac | 3 --- - external/Module_external.mk | 1 - - filter/Configuration_filter.mk | 8 -------- - writerperfect/Library_wpftwriter.mk | 2 -- - writerperfect/qa/unit/WpftFilterFixture.hxx | 4 ---- - writerperfect/qa/unit/WpftWriterFilterTest.cxx | 5 ----- - writerperfect/source/writer/wpftwriter.component | 6 ------ - 7 files changed, 29 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 8babc85..e7733de 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -9606,9 +9606,6 @@ libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.10]) - - libo_CHECK_SYSTEM_MODULE([libfreehand],[FREEHAND],[libfreehand-0.1]) - --libo_CHECK_SYSTEM_MODULE([libebook],[EBOOK],[libe-book-0.1]) --libo_PKG_VERSION([EBOOK], [libe-book-0.1], [0.1.2]) -- - libo_CHECK_SYSTEM_MODULE([libabw],[ABW],[libabw-0.1]) - - libo_CHECK_SYSTEM_MODULE([libpagemaker],[PAGEMAKER],[libpagemaker-0.0]) -diff --git a/external/Module_external.mk b/external/Module_external.mk -index 366fff2..bc987d1 100644 ---- a/external/Module_external.mk -+++ b/external/Module_external.mk -@@ -31,7 +31,6 @@ $(eval $(call gb_Module_add_moduledirs,external,\ - $(call gb_Helper_optional,CURL,curl) \ - $(call gb_Helper_optional,DRAGONBOX,dragonbox) \ - dtoa \ -- $(call gb_Helper_optional,EBOOK,libebook) \ - $(call gb_Helper_optional,EPM,epm) \ - $(call gb_Helper_optional,EPOXY,epoxy) \ - $(call gb_Helper_optional,EPUBGEN,libepubgen) \ -diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk -index a58b839..526b447 100644 ---- a/filter/Configuration_filter.mk -+++ b/filter/Configuration_filter.mk -@@ -359,10 +359,6 @@ $(eval $(call filter_Configuration_add_types,fcfg_langpack,fcfg_writer_types.xcu - writer_OOXML_Template \ - writer_layout_dump_xml \ - writer_indexing_export_xml \ -- writer_BroadBand_eBook \ -- writer_FictionBook_2 \ -- writer_PalmDoc \ -- writer_Plucker_eBook \ - writer_ApplePages \ - MWAW_Text_Document \ - Palm_Text_Document \ -@@ -409,10 +405,6 @@ $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_writer_filters - OOXML_Text_Template \ - writer_layout_dump \ - writer_indexing_export \ -- BroadBand_eBook \ -- FictionBook_2 \ -- PalmDoc \ -- Plucker_eBook \ - ApplePages \ - MWAW_Text_Document \ - Palm_Text_Document \ -diff --git a/writerperfect/Library_wpftwriter.mk b/writerperfect/Library_wpftwriter.mk -index 840a86f..70a8933 100644 ---- a/writerperfect/Library_wpftwriter.mk -+++ b/writerperfect/Library_wpftwriter.mk -@@ -64,7 +64,6 @@ endif - $(eval $(call gb_Library_use_externals,wpftwriter,\ - abw \ - boost_headers \ -- ebook \ - $(if $(ENABLE_WASM_STRIP_SWEXPORTS),,etonyek) \ - icu_headers \ - icui18n \ -@@ -93,7 +92,6 @@ endif - ifneq ($(ENABLE_WASM_STRIP_SWEXPORTS),TRUE) - $(eval $(call gb_Library_add_exception_objects,wpftwriter,\ - writerperfect/source/writer/AbiWordImportFilter \ -- writerperfect/source/writer/EBookImportFilter \ - writerperfect/source/writer/MSWorksImportFilter \ - writerperfect/source/writer/MWAWImportFilter \ - writerperfect/source/writer/PagesImportFilter \ -diff --git a/writerperfect/qa/unit/WpftFilterFixture.hxx b/writerperfect/qa/unit/WpftFilterFixture.hxx -index 2fdd6a2..dbdd672 100644 ---- a/writerperfect/qa/unit/WpftFilterFixture.hxx -+++ b/writerperfect/qa/unit/WpftFilterFixture.hxx -@@ -25,10 +25,6 @@ - || ((major) == (req_major) \ - && ((minor) > (req_minor) || ((minor) == (req_minor) && ((micro) >= (req_micro))))) - --#define REQUIRE_EBOOK_VERSION(major, minor, micro) \ -- REQUIRE_VERSION(EBOOK_VERSION_MAJOR, EBOOK_VERSION_MINOR, EBOOK_VERSION_MICRO, major, minor, \ -- micro) -- - #define REQUIRE_ETONYEK_VERSION(major, minor, micro) \ - REQUIRE_VERSION(ETONYEK_VERSION_MAJOR, ETONYEK_VERSION_MINOR, ETONYEK_VERSION_MICRO, major, \ - minor, micro) -diff --git a/writerperfect/qa/unit/WpftWriterFilterTest.cxx b/writerperfect/qa/unit/WpftWriterFilterTest.cxx -index 78d24dc..39924f9 100644 ---- a/writerperfect/qa/unit/WpftWriterFilterTest.cxx -+++ b/writerperfect/qa/unit/WpftWriterFilterTest.cxx -@@ -30,9 +30,6 @@ WpftWriterFilterTest::WpftWriterFilterTest() - - void WpftWriterFilterTest::test() - { -- const writerperfect::test::WpftOptionalMap_t aEBookOptional{ -- { "FictionBook2.fb2.zip", REQUIRE_EBOOK_VERSION(0, 1, 1) }, -- }; - const writerperfect::test::WpftOptionalMap_t aEtonyekOptional{ - { "Pages_4.pages", REQUIRE_ETONYEK_VERSION(0, 1, 2) }, - { "Pages_5.pages", REQUIRE_ETONYEK_VERSION(0, 1, 8) }, -@@ -59,8 +56,6 @@ void WpftWriterFilterTest::test() - - doTest("com.sun.star.comp.Writer.AbiWordImportFilter", - u"/writerperfect/qa/unit/data/writer/libabw/"); -- doTest("org.libreoffice.comp.Writer.EBookImportFilter", -- u"/writerperfect/qa/unit/data/writer/libe-book/", aEBookOptional); - doTest("com.sun.star.comp.Writer.MSWorksImportFilter", - u"/writerperfect/qa/unit/data/writer/libwps/", aWpsOptional); - doTest("com.sun.star.comp.Writer.MWAWImportFilter", -diff --git a/writerperfect/source/writer/wpftwriter.component b/writerperfect/source/writer/wpftwriter.component -index 176d487..0c89217 100644 ---- a/writerperfect/source/writer/wpftwriter.component -+++ b/writerperfect/source/writer/wpftwriter.component -@@ -42,12 +42,6 @@ - - - -- -- -- -- -- - - --- -2.31.1 - diff --git a/rpmbuild/SOURCES/0001-don-t-suppress-crashes.patch b/rpmbuild/SOURCES/0001-don-t-suppress-crashes.patch deleted file mode 100644 index 596534d..0000000 --- a/rpmbuild/SOURCES/0001-don-t-suppress-crashes.patch +++ /dev/null @@ -1,37 +0,0 @@ -From a6f2cba43d79347b6975b3b8069b423c94a7dba6 Mon Sep 17 00:00:00 2001 -From: David Tardon -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 - diff --git a/rpmbuild/SOURCES/0002-Archivos-de-distro-config-de-brand-Office.patch b/rpmbuild/SOURCES/0002-Archivos-de-distro-config-de-brand-Office.patch deleted file mode 100644 index 789a661..0000000 --- a/rpmbuild/SOURCES/0002-Archivos-de-distro-config-de-brand-Office.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 92fa4e7245f75aae7481588c47ee003779f479cd Mon Sep 17 00:00:00 2001 -From: Israel Paredes -Date: Tue, 20 Jun 2023 02:26:13 -0400 -Subject: [PATCH 01/15] Archivos de distro-config de brand Office - -Change-Id: I290939038b4fedf7a03f3ce68250966766a57e2b ---- - distro-configs/OfficeLinux.conf | 10 ++++++++++ - distro-configs/OfficeWin64.conf | 24 ++++++++++++++++++++++++ - 2 files changed, 34 insertions(+) - create mode 100644 distro-configs/OfficeLinux.conf - create mode 100644 distro-configs/OfficeWin64.conf - -diff --git a/distro-configs/OfficeLinux.conf b/distro-configs/OfficeLinux.conf -new file mode 100644 -index 000000000000..6cb4bd4dca66 ---- /dev/null -+++ b/distro-configs/OfficeLinux.conf -@@ -0,0 +1,10 @@ -+--with-parallelism -+--with-branding=custom_images -+--enable-release-build -+--enable-epm -+--with-package-format=deb -+--with-product-name=Office -+--with-vendor=INFOTEC -+--with-vendor=INFOTEC -+--with-package-version=7.5.0.0 -+--disable-community-flavor -diff --git a/distro-configs/OfficeWin64.conf b/distro-configs/OfficeWin64.conf -new file mode 100644 -index 000000000000..01ad659c2af3 ---- /dev/null -+++ b/distro-configs/OfficeWin64.conf -@@ -0,0 +1,24 @@ -+--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 -+--with-product-name=Office -+--with-vendor=INFOTEC -+--with-package-version=7.5.0.0 -+--disable-community-flavor --- -2.43.0 - diff --git a/rpmbuild/SOURCES/0003-Modificacion-al-build-y-borrado-UPDATEURL.patch b/rpmbuild/SOURCES/0003-Modificacion-al-build-y-borrado-UPDATEURL.patch deleted file mode 100644 index bdbe9ba..0000000 --- a/rpmbuild/SOURCES/0003-Modificacion-al-build-y-borrado-UPDATEURL.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 7d5acdcd9e1f131c82ba05c02932f42fb41250fd Mon Sep 17 00:00:00 2001 -From: Israel Paredes -Date: Tue, 20 Jun 2023 02:29:16 -0400 -Subject: [PATCH 02/15] Modificacion al build y borrado UPDATEURL - -Change-Id: I10a2d0a01ceb02d5d7f5267dcb97eb25ce6600d7 ---- - instsetoo_native/util/openoffice.lst.in | 73 +++++++++++++++++++++++++ - 1 file changed, 73 insertions(+) - -diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in -index b5da0bfb6697..454670cb1e15 100644 ---- a/instsetoo_native/util/openoffice.lst.in -+++ b/instsetoo_native/util/openoffice.lst.in -@@ -193,3 +193,76 @@ LibreOfficeDev_SDK - include {installscriptdir},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{licensepath},{packinfopath} - } - } -+ -+ -+Office -+{ -+ Settings -+ { -+ variables -+ { -+ PRODUCTNAME Office -+ PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ -+ PRODUCTEXTENSION .@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@ -+ POSTVERSIONEXTENSION -+ BUNDLEIDENTIFIER @MACOSX_BUNDLE_IDENTIFIER@ -+ BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ -+ USERDIRPRODUCTVERSION 4 -+ BASEPRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ -+ PCPFILENAME libreoffice.pcp -+ UPDATEURL -+ 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@ -+ PACKAGEREVISION {buildid} -+ LICENSENAME LGPL -+ ROOTMODULEGID gid_Module_Root -+ GLOBALPATCHFILEGID gid_File_Txt_Patchfiles -+ SPELLCHECKERFILE spellchecker_selection.txt -+ CHANGETARGETDIR 1 -+ PATCHCODEFILE ooo_patchcodes.txt -+ } -+ active 1 -+ compression 5 -+ script setup_osl -+ downloadname Office_{productversion}_{os}_install_{languages} -+ langpackdownloadname LibreOffice_{productversion}_languagepack_{os}_install_{languages} -+ helppackdownloadname LibreOffice_{productversion}_helppack_{os}_install_{languages} -+ include {installscriptdir},{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native,{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}/ExtensionPackage,{filelistpath}/CustomTarget/helpcontent2/help3xsl/filelists,{extensionsdir},{licensepath},{packinfopath} -+ } -+} -+ -+Office_SDK -+{ -+ Settings -+ { -+ downloadname LibreOffice-SDK_{packageversion}_{os}_install_{languages} -+ variables -+ { -+ PRODUCTNAME Office -+ PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ -+ PRODUCTEXTENSION .@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@ -+ POSTVERSIONEXTENSION SDK -+ BUNDLEIDENTIFIER @MACOSX_BUNDLE_IDENTIFIER@.SDK -+ BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ -+ PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@ -+ PACKAGEREVISION {buildid} -+ PACK_INSTALLED 1 -+ DMG_VOLUMEEXTENSION SDK -+ DATABASENAME office40sdk -+ NO_README_IN_ROOTDIR 1 -+ LICENSENAME LGPL -+ IGNOREDIRECTORYLAYER 1 -+ NOVERSIONINDIRNAME 0 -+ NOSPACEINDIRECTORYNAME 1 -+ NOSHORTDIRECTORYNAMES 1 -+ CHANGETARGETDIR 1 -+ DONTUSESTARTMENUFOLDER 1 -+ } -+ active 1 -+ compression 5 -+ script sdkoo -+ include {installscriptdir},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{licensepath},{packinfopath} -+ } -+} -+ --- -2.43.0 - diff --git a/rpmbuild/SOURCES/0008-Fuentes-monserrat-y-gmx.patch b/rpmbuild/SOURCES/0008-Fuentes-monserrat-y-gmx.patch deleted file mode 100644 index 28ccdda..0000000 --- a/rpmbuild/SOURCES/0008-Fuentes-monserrat-y-gmx.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 5b39bd472463dbe3c31c1aa5a4a98aa0f8cbbb74 Mon Sep 17 00:00:00 2001 -From: Israel Paredes -Date: Tue, 8 Aug 2023 07:51:52 +0000 -Subject: [PATCH 10/18] Restauracion link repos/src - ---- - Makefile.fetch | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.fetch b/Makefile.fetch -index ede18af4197d..b0443f367007 100644 ---- a/Makefile.fetch -+++ b/Makefile.fetch -@@ -244,7 +244,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S - ,$(call fetch_Download_item,https://dev-www.libreoffice.org/extern,$(item))) - $(foreach item, \ - $(call fetch_Optional,MORE_FONTS,FONT_GMX_TARBALL) \ -- ,$(call fetch_Download_item,https://git.softwarelibre.mx/strepsirrhini/office-gobmx/-/tree/logos/fonts,$(item))) -+ ,$(call fetch_Download_item,https://repos.libreoffice.gob.mx/src,$(item))) - @mkdir -p $(dir $@) && touch $@ - @mkdir -p $(dir $@)/Executable - --- -2.39.2 - diff --git a/rpmbuild/SOURCES/0009-Corregida-instrucci-n-de-descarga.patch b/rpmbuild/SOURCES/0009-Corregida-instrucci-n-de-descarga.patch deleted file mode 100644 index c85ef89..0000000 --- a/rpmbuild/SOURCES/0009-Corregida-instrucci-n-de-descarga.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 6a3abd795ab40cc1b0c26c3e4fa6cef30dc445df Mon Sep 17 00:00:00 2001 -From: Artukryp -Date: Tue, 1 Aug 2023 14:12:02 -0600 -Subject: [PATCH 07/18] =?UTF-8?q?Corregida=20instrucci=C3=B3n=20de=20desca?= - =?UTF-8?q?rga?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - ---- - Makefile.fetch | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.fetch b/Makefile.fetch -index 99f9bd3bca18..b0443f367007 100644 ---- a/Makefile.fetch -+++ b/Makefile.fetch -@@ -244,7 +244,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S - ,$(call fetch_Download_item,https://dev-www.libreoffice.org/extern,$(item))) - $(foreach item, \ - $(call fetch_Optional,MORE_FONTS,FONT_GMX_TARBALL) \ -- ,$(call fetch__Download_item,https://repos.libreoffice.gob.mx/src,$(item))) -+ ,$(call fetch_Download_item,https://repos.libreoffice.gob.mx/src,$(item))) - @mkdir -p $(dir $@) && touch $@ - @mkdir -p $(dir $@)/Executable - --- -2.39.2 - diff --git a/rpmbuild/SOURCES/0010-Cambios-en-logo.patch b/rpmbuild/SOURCES/0010-Cambios-en-logo.patch deleted file mode 100644 index d0ba492..0000000 --- a/rpmbuild/SOURCES/0010-Cambios-en-logo.patch +++ /dev/null @@ -1,5074 +0,0 @@ -From 14ce63ff63c04d4c605564a751cfd6d2d3d5b342 Mon Sep 17 00:00:00 2001 -From: Artukryp -Date: Thu, 3 Aug 2023 17:36:45 -0600 -Subject: [PATCH 08/15] Cambios en logo - -Change-Id: Ica978200502962bedf5901be88db7a2484678346 ---- - cui/source/dialogs/about.cxx | 2 +- - custom_images/about.svg | 2516 ++++++++++++++++++++++++++++++++++ - custom_images/logo.svg | 2516 ++++++++++++++++++++++++++++++++++ - 3 files changed, 5033 insertions(+), 1 deletion(-) - create mode 100644 custom_images/about.svg - create mode 100644 custom_images/logo.svg - -diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx -index a8fd34bb5a2d..4a8b20d0bc67 100644 ---- a/cui/source/dialogs/about.cxx -+++ b/cui/source/dialogs/about.cxx -@@ -111,7 +111,7 @@ AboutDialog::AboutDialog(weld::Window *pParent) - Graphic aGraphic(aBackgroundBitmap); - m_pBrandImage->set_image(aGraphic.GetXGraphic()); - } -- if (SfxApplication::loadBrandSvg("shell/MexGob", aBackgroundBitmap, nWidth * 0.9)) { -+ if (SfxApplication::loadBrandSvg("shell/about", aBackgroundBitmap, nWidth * 0.9)) { - ScopedVclPtr m_pVirDev = - m_pAboutImage->create_virtual_device(); - m_pVirDev->SetOutputSizePixel(aBackgroundBitmap.GetSizePixel()); -diff --git a/custom_images/about.svg b/custom_images/about.svg -new file mode 100644 -index 000000000000..6ad4cd79920c ---- /dev/null -+++ b/custom_images/about.svg -@@ -0,0 +1,2516 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/custom_images/logo.svg b/custom_images/logo.svg -new file mode 100644 -index 000000000000..6ad4cd79920c ---- /dev/null -+++ b/custom_images/logo.svg -@@ -0,0 +1,2516 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ --- -2.43.0 - diff --git a/rpmbuild/SOURCES/0011-Modificado-link-de-descarga-de-fuentes.patch b/rpmbuild/SOURCES/0011-Modificado-link-de-descarga-de-fuentes.patch deleted file mode 100644 index e6851de..0000000 --- a/rpmbuild/SOURCES/0011-Modificado-link-de-descarga-de-fuentes.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 58c887abc0776bf3b67bdbffeaed6c4bae255026 Mon Sep 17 00:00:00 2001 -From: Artukryp -Date: Fri, 4 Aug 2023 20:21:33 -0600 -Subject: [PATCH 09/15] Modificado link de descarga de fuentes - -Change-Id: I80b8e9ea4286d68c1880ef45eaa191a8f0c3e7d2 ---- - Makefile.fetch | 2 +- - fonts/gmx-fonts.tar.gz | Bin 0 -> 2409292 bytes - fonts/gmx-fonts.tar.xz | Bin 1172924 -> 0 bytes - 3 files changed, 1 insertion(+), 1 deletion(-) - create mode 100644 fonts/gmx-fonts.tar.gz - delete mode 100644 fonts/gmx-fonts.tar.xz - -diff --git a/Makefile.fetch b/Makefile.fetch -index 14319bc18d25..86efcb2bb3df 100644 ---- a/Makefile.fetch -+++ b/Makefile.fetch -@@ -242,7 +242,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S - ,$(call fetch_Download_item,https://dev-www.libreoffice.org/extern,$(item))) - $(foreach item, \ - $(call fetch_Optional,MORE_FONTS,FONT_GMX_TARBALL) \ -- ,$(call fetch_Download_item,https://repos.libreoffice.gob.mx/src,$(item))) -+ ,$(call fetch_Download_item,https://git.softwarelibre.mx/strepsirrhini/office-gobmx/-/tree/logos/fonts,$(item))) - @mkdir -p $(dir $@) && touch $@ - @mkdir -p $(dir $@)/Executable - diff --git a/rpmbuild/SOURCES/0012-Restauracion-link-repos-src.patch b/rpmbuild/SOURCES/0012-Restauracion-link-repos-src.patch deleted file mode 100644 index 84b4e10..0000000 --- a/rpmbuild/SOURCES/0012-Restauracion-link-repos-src.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 6fb4e98342a66494f1c95b0d5c6db344dd1d148c Mon Sep 17 00:00:00 2001 -From: Israel Paredes -Date: Tue, 8 Aug 2023 07:51:52 +0000 -Subject: [PATCH 10/15] Restauracion link repos/src - ---- - Makefile.fetch | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.fetch b/Makefile.fetch -index 86efcb2bb3df..14319bc18d25 100644 ---- a/Makefile.fetch -+++ b/Makefile.fetch -@@ -242,7 +242,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S - ,$(call fetch_Download_item,https://dev-www.libreoffice.org/extern,$(item))) - $(foreach item, \ - $(call fetch_Optional,MORE_FONTS,FONT_GMX_TARBALL) \ -- ,$(call fetch_Download_item,https://git.softwarelibre.mx/strepsirrhini/office-gobmx/-/tree/logos/fonts,$(item))) -+ ,$(call fetch_Download_item,https://repos.libreoffice.gob.mx/src,$(item))) - @mkdir -p $(dir $@) && touch $@ - @mkdir -p $(dir $@)/Executable - --- -2.43.0 - diff --git a/rpmbuild/SOURCES/0013-logo-image-updated.patch b/rpmbuild/SOURCES/0013-logo-image-updated.patch deleted file mode 100644 index 2e6c3f8..0000000 --- a/rpmbuild/SOURCES/0013-logo-image-updated.patch +++ /dev/null @@ -1,2536 +0,0 @@ -From bb755ef8e0ff41a41fbae11988e28f2a26f68b3b Mon Sep 17 00:00:00 2001 -From: Adlair Cerecedo-Mendez -Date: Mon, 14 Aug 2023 18:35:41 -0600 -Subject: [PATCH 11/15] logo image updated - -Change-Id: Ib4c398af48d0014c7f11b0da5f67f3659fc018fe ---- - custom_images/logo.svg | 2517 +--------------------------------------- - 1 file changed, 1 insertion(+), 2516 deletions(-) - -diff --git a/custom_images/logo.svg b/custom_images/logo.svg -index 6ad4cd79920c..3215508ec8c3 100644 ---- a/custom_images/logo.svg -+++ b/custom_images/logo.svg -@@ -1,2516 +1 @@ -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -+ -\ No newline at end of file --- -2.43.0 - diff --git a/rpmbuild/SOURCES/7.4.6-unit-tests.patch b/rpmbuild/SOURCES/7.4.6-unit-tests.patch deleted file mode 100644 index 609e9b9..0000000 --- a/rpmbuild/SOURCES/7.4.6-unit-tests.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 2f5a4af93c352a091852a8230b71720c0ec7c14c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Sandino=20Araico=20S=C3=A1nchez?= -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 - diff --git a/rpmbuild/SOURCES/7.5.0-unit-tests.patch b/rpmbuild/SOURCES/7.5.0-unit-tests.patch deleted file mode 100644 index 75a89e2..0000000 --- a/rpmbuild/SOURCES/7.5.0-unit-tests.patch +++ /dev/null @@ -1,76 +0,0 @@ -From bf9a05748d0b4863276f920b39668e919ebeca21 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Sandino=20Araico=20S=C3=A1nchez?= -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?= -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 - diff --git a/rpmbuild/SOURCES/7.5.1-unit-tests.patch b/rpmbuild/SOURCES/7.5.1-unit-tests.patch deleted file mode 100644 index d5ef471..0000000 --- a/rpmbuild/SOURCES/7.5.1-unit-tests.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 0869739a3843e6ee48eba1181d71476c1e7a9541 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Sandino=20Araico=20S=C3=A1nchez?= -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?= -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 - diff --git a/rpmbuild/SOURCES/patchset-1.0/0003-Custom-images-and-referencies-added.patch b/rpmbuild/SOURCES/patchset-1.0/0003-Custom-images-and-referencies-added.patch deleted file mode 100644 index 5bfe333..0000000 --- a/rpmbuild/SOURCES/patchset-1.0/0003-Custom-images-and-referencies-added.patch +++ /dev/null @@ -1,2581 +0,0 @@ -From cf4557fd5ada1aee66c1b3e300a70030b8af5da2 Mon Sep 17 00:00:00 2001 -From: Adlair Cerecedo-Mendez -Date: Mon, 19 Jun 2023 18:44:48 -0600 -Subject: [PATCH 03/15] Custom images and referencies added - -Change-Id: Ic7e4beefaf65fec8bb2b4ef03996b3ff5e849fee ---- - cui/source/dialogs/about.cxx | 19 +- - custom_images/MexGob.svg | 2516 ++++++++++++++++++++++++++++++++++ - 2 files changed, 2525 insertions(+), 10 deletions(-) - create mode 100644 custom_images/MexGob.svg - -diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx -index ce82e418cf9e..a8fd34bb5a2d 100644 ---- a/cui/source/dialogs/about.cxx -+++ b/cui/source/dialogs/about.cxx -@@ -78,8 +78,7 @@ AboutDialog::AboutDialog(weld::Window *pParent) - OUString sbuildId = GetBuildString(); - if (IsStringValidGitHash(sbuildId)) { - const tools::Long nMaxChar = 25; -- m_pBuildLabel->set_uri("https://gerrit.libreoffice.org/gitweb?p=core.git;a=log;h=" -- + sbuildId); -+ m_pBuildLabel->set_uri("https://git.softwarelibre.mx/strepsirrhini/office-gobmx"); - m_pBuildLabel->set_label(sbuildId.getLength() > nMaxChar ? sbuildId.replaceAt( - nMaxChar, sbuildId.getLength() - nMaxChar, u"...") - : sbuildId); -@@ -112,13 +111,13 @@ AboutDialog::AboutDialog(weld::Window *pParent) - Graphic aGraphic(aBackgroundBitmap); - m_pBrandImage->set_image(aGraphic.GetXGraphic()); - } -- if (SfxApplication::loadBrandSvg("shell/about", aBackgroundBitmap, nWidth * 0.9)) { -- // Eliminate white background when Skia is disabled by not drawing the -- // background bitmap to a VirtualDevice. On most platforms, non-Skia -- // VirtualDevices will be filled with a solid color when drawing -- // the bitmap. -- Graphic aGraphic(aBackgroundBitmap); -- m_pAboutImage->set_image(aGraphic.GetXGraphic()); -+ if (SfxApplication::loadBrandSvg("shell/MexGob", aBackgroundBitmap, nWidth * 0.9)) { -+ ScopedVclPtr m_pVirDev = -+ m_pAboutImage->create_virtual_device(); -+ m_pVirDev->SetOutputSizePixel(aBackgroundBitmap.GetSizePixel()); -+ m_pVirDev->DrawBitmapEx(Point(0, 0), aBackgroundBitmap); -+ m_pAboutImage->set_image(m_pVirDev.get()); -+ m_pVirDev.disposeAndClear(); - } - - // Links -@@ -153,7 +152,7 @@ OUString AboutDialog::GetVersionString() { - OUString sVersion = CuiResId(TranslateId(nullptr, "%ABOUTBOXPRODUCTVERSION%ABOUTBOXPRODUCTVERSIONSUFFIX")) + " (" + arch + ")"; - - #if HAVE_FEATURE_COMMUNITY_FLAVOR -- sVersion += " / LibreOffice Community"; -+ sVersion += " / LibreOffice GOBMX"; - #endif - - return sVersion; -diff --git a/custom_images/MexGob.svg b/custom_images/MexGob.svg -new file mode 100644 -index 000000000000..6ad4cd79920c ---- /dev/null -+++ b/custom_images/MexGob.svg -@@ -0,0 +1,2516 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ --- -2.43.0 - diff --git a/rpmbuild/SOURCES/patchset-1.0/0012-Update-OfficeLinux.conf-with-lang-es.patch b/rpmbuild/SOURCES/patchset-1.0/0012-Update-OfficeLinux.conf-with-lang-es.patch deleted file mode 100644 index 87abc47..0000000 --- a/rpmbuild/SOURCES/patchset-1.0/0012-Update-OfficeLinux.conf-with-lang-es.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 26bc26bc58ec329ba1c23a3082546c755f10a8a1 Mon Sep 17 00:00:00 2001 -From: Israel Paredes -Date: Wed, 8 Nov 2023 19:42:40 +0000 -Subject: [PATCH 12/15] Update OfficeLinux.conf --with-lang=es - ---- - distro-configs/OfficeLinux.conf | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/distro-configs/OfficeLinux.conf b/distro-configs/OfficeLinux.conf -index 6cb4bd4dca66..30550375e27a 100644 ---- a/distro-configs/OfficeLinux.conf -+++ b/distro-configs/OfficeLinux.conf -@@ -8,3 +8,4 @@ - --with-vendor=INFOTEC - --with-package-version=7.5.0.0 - --disable-community-flavor -+--with-lang=es --- -2.43.0 - diff --git a/rpmbuild/SOURCES/patchset-1.0/0013-Update-OfficeLinux.conf.patch b/rpmbuild/SOURCES/patchset-1.0/0013-Update-OfficeLinux.conf.patch deleted file mode 100644 index a11879f..0000000 --- a/rpmbuild/SOURCES/patchset-1.0/0013-Update-OfficeLinux.conf.patch +++ /dev/null @@ -1,30 +0,0 @@ -From dd1f17cd0641a99832e991545c1d1c4440786816 Mon Sep 17 00:00:00 2001 -From: Israel Paredes -Date: Wed, 8 Nov 2023 23:23:27 +0000 -Subject: [PATCH 13/15] Update OfficeLinux.conf - ---- - distro-configs/OfficeLinux.conf | 7 ++----- - 1 file changed, 2 insertions(+), 5 deletions(-) - -diff --git a/distro-configs/OfficeLinux.conf b/distro-configs/OfficeLinux.conf -index 30550375e27a..8f9dc46b2814 100644 ---- a/distro-configs/OfficeLinux.conf -+++ b/distro-configs/OfficeLinux.conf -@@ -1,11 +1,8 @@ - --with-parallelism -+--enable-dbgutil -+--without-doxygen - --with-branding=custom_images ----enable-release-build ----enable-epm ----with-package-format=deb - --with-product-name=Office - --with-vendor=INFOTEC ----with-vendor=INFOTEC - --with-package-version=7.5.0.0 ----disable-community-flavor - --with-lang=es --- -2.43.0 - diff --git a/rpmbuild/SOURCES/patchset-1.0/0014-fix-error-make-install.patch b/rpmbuild/SOURCES/patchset-1.0/0014-fix-error-make-install.patch deleted file mode 100644 index ada3970..0000000 --- a/rpmbuild/SOURCES/patchset-1.0/0014-fix-error-make-install.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 22a3ccfe6659ad7ef87c7d5711bb0363a3a5e1c0 Mon Sep 17 00:00:00 2001 -From: Artukryp -Date: Mon, 13 Nov 2023 11:23:10 -0600 -Subject: [PATCH 14/15] fix error make install - -Change-Id: I590a323ec835f16badf1889f4c09d00fee3d3999 ---- - instsetoo_native/util/openoffice.lst.in | 44 +++++++++++++++++++++++++ - 1 file changed, 44 insertions(+) - -diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in -index 454670cb1e15..de7de46a22ff 100644 ---- a/instsetoo_native/util/openoffice.lst.in -+++ b/instsetoo_native/util/openoffice.lst.in -@@ -266,3 +266,47 @@ Office_SDK - } - } - -+OfficeDev -+{ -+ Settings -+ { -+ variables -+ { -+ PRODUCTNAME OfficeDev -+ PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ -+ PRODUCTEXTENSION .@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@ -+ WINDOWSBASISROOTNAME LibreOfficeDev @LIBO_VERSION_MAJOR@ -+ UNIXBASISROOTNAME libreofficedev@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ -+ POSTVERSIONEXTENSION -+ BUNDLEIDENTIFIER @MACOSX_BUNDLE_IDENTIFIER@ -+ BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ -+ USERDIRPRODUCTVERSION 4 -+ BASEPRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ -+ DEVELOPMENTPRODUCT 1 -+ BASISPACKAGEPREFIX lodevbasis -+ UREPACKAGEPREFIX libreofficedev -+ SOLSUREPACKAGEPREFIX libreofficedev -+ REGISTRYLAYERNAME LayerDev -+ UPDATEURL https://update.libreoffice.org/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@ -+ PACKAGEREVISION {buildid} -+ LICENSENAME LGPL -+ ROOTMODULEGID gid_Module_Root -+ GLOBALPATCHFILEGID gid_File_Txt_Patchfiles -+ SPELLCHECKERFILE spellchecker_selection.txt -+ CHANGETARGETDIR 1 -+ PATCHCODEFILE ooodev_patchcodes.txt -+ CODEFILENAME codes_ooodev.txt -+ LOCALUSERDIR $ORIGIN/.. -+ } -+ active 1 -+ compression 5 -+ script setup_osl -+ downloadname LibreOfficeDev_{productversion}_{os}_install_{languages} -+ langpackdownloadname LibreOfficeDev_{productversion}_languagepack_{os}_install_{languages} -+ helppackdownloadname LibreOfficeDev_{productversion}_helppack_{os}_install_{languages} -+ include {installscriptdir},{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native,{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}/ExtensionPackage,{filelistpath}/CustomTarget/helpcontent2/help3xsl/filelists,{extensionsdir},{licensepath},{packinfopath} -+ } -+} --- -2.43.0 - diff --git a/rpmbuild/SOURCES/patchset-1.0/0015-gob-mx-1.0.patch b/rpmbuild/SOURCES/patchset-1.0/0015-gob-mx-1.0.patch deleted file mode 100644 index f971db1..0000000 --- a/rpmbuild/SOURCES/patchset-1.0/0015-gob-mx-1.0.patch +++ /dev/null @@ -1,8 +0,0 @@ -From e66c87ccc08a1a862c7b38adf2cd35f2379efe1e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Sandino=20Araico=20S=C3=A1nchez?= -Date: Tue, 21 Nov 2023 20:21:22 -0600 -Subject: [PATCH 15/15] gob-mx-1.0 - --- -2.43.0 - diff --git a/rpmbuild/SOURCES/patchset-1.1/0001-Archivos-de-distro-config-de-brand-Office.patch b/rpmbuild/SOURCES/patchset-1.1/0001-Archivos-de-distro-config-de-brand-Office.patch deleted file mode 100644 index 16618ba..0000000 --- a/rpmbuild/SOURCES/patchset-1.1/0001-Archivos-de-distro-config-de-brand-Office.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 439bf688a50143a57d18be3e8bf8eceea9f839ea Mon Sep 17 00:00:00 2001 -From: Israel Paredes -Date: Tue, 20 Jun 2023 02:26:13 -0400 -Subject: [PATCH 01/18] Archivos de distro-config de brand Office - -Change-Id: I290939038b4fedf7a03f3ce68250966766a57e2b ---- - distro-configs/OfficeLinux.conf | 10 ++++++++++ - distro-configs/OfficeWin64.conf | 24 ++++++++++++++++++++++++ - 2 files changed, 34 insertions(+) - create mode 100644 distro-configs/OfficeLinux.conf - create mode 100644 distro-configs/OfficeWin64.conf - -diff --git a/distro-configs/OfficeLinux.conf b/distro-configs/OfficeLinux.conf -new file mode 100644 -index 000000000000..6cb4bd4dca66 ---- /dev/null -+++ b/distro-configs/OfficeLinux.conf -@@ -0,0 +1,10 @@ -+--with-parallelism -+--with-branding=custom_images -+--enable-release-build -+--enable-epm -+--with-package-format=deb -+--with-product-name=Office -+--with-vendor=INFOTEC -+--with-vendor=INFOTEC -+--with-package-version=7.5.0.0 -+--disable-community-flavor -diff --git a/distro-configs/OfficeWin64.conf b/distro-configs/OfficeWin64.conf -new file mode 100644 -index 000000000000..01ad659c2af3 ---- /dev/null -+++ b/distro-configs/OfficeWin64.conf -@@ -0,0 +1,24 @@ -+--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 -+--with-product-name=Office -+--with-vendor=INFOTEC -+--with-package-version=7.5.0.0 -+--disable-community-flavor --- -2.39.2 - diff --git a/rpmbuild/SOURCES/patchset-1.1/0002-Modificacion-al-build-y-borrado-UPDATEURL.patch b/rpmbuild/SOURCES/patchset-1.1/0002-Modificacion-al-build-y-borrado-UPDATEURL.patch deleted file mode 100644 index 8edec84..0000000 --- a/rpmbuild/SOURCES/patchset-1.1/0002-Modificacion-al-build-y-borrado-UPDATEURL.patch +++ /dev/null @@ -1,94 +0,0 @@ -From a4f6d63477b5a953b38859e2e3ad781f929b8584 Mon Sep 17 00:00:00 2001 -From: Israel Paredes -Date: Tue, 20 Jun 2023 02:29:16 -0400 -Subject: [PATCH 02/18] Modificacion al build y borrado UPDATEURL - -Change-Id: I10a2d0a01ceb02d5d7f5267dcb97eb25ce6600d7 ---- - instsetoo_native/util/openoffice.lst.in | 73 +++++++++++++++++++++++++ - 1 file changed, 73 insertions(+) - -diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in -index b5da0bfb6697..454670cb1e15 100644 ---- a/instsetoo_native/util/openoffice.lst.in -+++ b/instsetoo_native/util/openoffice.lst.in -@@ -193,3 +193,76 @@ LibreOfficeDev_SDK - include {installscriptdir},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{licensepath},{packinfopath} - } - } -+ -+ -+Office -+{ -+ Settings -+ { -+ variables -+ { -+ PRODUCTNAME Office -+ PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ -+ PRODUCTEXTENSION .@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@ -+ POSTVERSIONEXTENSION -+ BUNDLEIDENTIFIER @MACOSX_BUNDLE_IDENTIFIER@ -+ BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ -+ USERDIRPRODUCTVERSION 4 -+ BASEPRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ -+ PCPFILENAME libreoffice.pcp -+ UPDATEURL -+ 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@ -+ PACKAGEREVISION {buildid} -+ LICENSENAME LGPL -+ ROOTMODULEGID gid_Module_Root -+ GLOBALPATCHFILEGID gid_File_Txt_Patchfiles -+ SPELLCHECKERFILE spellchecker_selection.txt -+ CHANGETARGETDIR 1 -+ PATCHCODEFILE ooo_patchcodes.txt -+ } -+ active 1 -+ compression 5 -+ script setup_osl -+ downloadname Office_{productversion}_{os}_install_{languages} -+ langpackdownloadname LibreOffice_{productversion}_languagepack_{os}_install_{languages} -+ helppackdownloadname LibreOffice_{productversion}_helppack_{os}_install_{languages} -+ include {installscriptdir},{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native,{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}/ExtensionPackage,{filelistpath}/CustomTarget/helpcontent2/help3xsl/filelists,{extensionsdir},{licensepath},{packinfopath} -+ } -+} -+ -+Office_SDK -+{ -+ Settings -+ { -+ downloadname LibreOffice-SDK_{packageversion}_{os}_install_{languages} -+ variables -+ { -+ PRODUCTNAME Office -+ PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ -+ PRODUCTEXTENSION .@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@ -+ POSTVERSIONEXTENSION SDK -+ BUNDLEIDENTIFIER @MACOSX_BUNDLE_IDENTIFIER@.SDK -+ BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ -+ PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@ -+ PACKAGEREVISION {buildid} -+ PACK_INSTALLED 1 -+ DMG_VOLUMEEXTENSION SDK -+ DATABASENAME office40sdk -+ NO_README_IN_ROOTDIR 1 -+ LICENSENAME LGPL -+ IGNOREDIRECTORYLAYER 1 -+ NOVERSIONINDIRNAME 0 -+ NOSPACEINDIRECTORYNAME 1 -+ NOSHORTDIRECTORYNAMES 1 -+ CHANGETARGETDIR 1 -+ DONTUSESTARTMENUFOLDER 1 -+ } -+ active 1 -+ compression 5 -+ script sdkoo -+ include {installscriptdir},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{licensepath},{packinfopath} -+ } -+} -+ --- -2.39.2 - diff --git a/rpmbuild/SOURCES/patchset-1.1/0004-Fuentes-monserrat-y-gmx.patch b/rpmbuild/SOURCES/patchset-1.1/0004-Fuentes-monserrat-y-gmx.patch deleted file mode 100644 index c3adf9f..0000000 --- a/rpmbuild/SOURCES/patchset-1.1/0004-Fuentes-monserrat-y-gmx.patch +++ /dev/null @@ -1,171 +0,0 @@ -From 4c459d3e41a3c4d08e03fc72db95480ed8783797 Mon Sep 17 00:00:00 2001 -From: Israel Paredes -Date: Thu, 20 Jul 2023 08:28:06 -0600 -Subject: [PATCH 04/18] Fuentes monserrat y gmx - -Change-Id: I73186714bc4809d0b3d48ceb94e933a78db2d623 ---- - Makefile.fetch | 4 ++ - Repository.mk | 1 + - 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.xz | Bin 0 -> 1172924 bytes - solenv/flatpak-manifest.in | 7 +++ - 7 files changed, 77 insertions(+) - 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.xz - -diff --git a/Makefile.fetch b/Makefile.fetch -index b96cb573c2bf..99f9bd3bca18 100644 ---- a/Makefile.fetch -+++ b/Makefile.fetch -@@ -124,6 +124,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S - $(call fetch_Optional,EXPAT,EXPAT_TARBALL) \ - $(call fetch_Optional,FIREBIRD,FIREBIRD_TARBALL) \ - $(call fetch_Optional,FONTCONFIG,FONTCONFIG_TARBALL) \ -+ $(call fetch_Optional,FONTGMXCONFIG,FONTGMXCONFIG_TARBALL) \ - $(call fetch_Optional,FREEHAND,FREEHAND_TARBALL) \ - $(call fetch_Optional,FREETYPE,FREETYPE_TARBALL) \ - FROZEN_TARBALL \ -@@ -241,6 +242,9 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S - $(call fetch_Optional,ODFVALIDATOR,ODFVALIDATOR_JAR) \ - $(call fetch_Optional,OFFICEOTRON,OFFICEOTRON_JAR) \ - ,$(call fetch_Download_item,https://dev-www.libreoffice.org/extern,$(item))) -+ $(foreach item, \ -+ $(call fetch_Optional,MORE_FONTS,FONT_GMX_TARBALL) \ -+ ,$(call fetch__Download_item,https://repos.libreoffice.gob.mx/src,$(item))) - @mkdir -p $(dir $@) && touch $@ - @mkdir -p $(dir $@)/Executable - -diff --git a/Repository.mk b/Repository.mk -index 3e2e29098e66..c04fb9cd4108 100644 ---- a/Repository.mk -+++ b/Repository.mk -@@ -1044,6 +1044,7 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo_fonts,\ - $(call gb_Helper_optional,MORE_FONTS,\ - fonts_alef \ - fonts_amiri \ -+ fonts_gmx \ - fonts_caladea \ - fonts_carlito \ - $(if $(MPL_SUBSET),,fonts_culmus) \ -diff --git a/external/more_fonts/ExternalPackage_gmx.mk b/external/more_fonts/ExternalPackage_gmx.mk -new file mode 100644 -index 000000000000..ccc1b03c5db2 ---- /dev/null -+++ b/external/more_fonts/ExternalPackage_gmx.mk -@@ -0,0 +1,49 @@ -+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -+# -+# This file is part of the LibreOffice project. -+# -+# This Source Code Form 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/. -+# -+ -+$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_gmx,font_gmx)) -+ -+$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_gmx,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ -+ GMX-BlackItalic.otf \ -+ GMX-BlackItalicSc.otf \ -+ GMX-Black.otf \ -+ GMX-BlackSc.otf \ -+ GMX-BoldItalic.otf \ -+ GMX-BoldItalicSc.otf \ -+ GMX-Bold.otf \ -+ GMX-BoldSc.otf \ -+ GMX-LightItalic.otf \ -+ GMX-LightItalicSc.otf \ -+ GMX-Light.otf \ -+ GMX-LightSc.otf \ -+ GMX-RegularItalic.otf \ -+ GMX-RegularItalicSc.otf \ -+ GMX-Regular.otf \ -+ GMX-RegularSc.otf \ -+ Montserrat-BlackItalic.ttf \ -+ Montserrat-Black.ttf \ -+ Montserrat-BoldItalic.ttf \ -+ Montserrat-Bold.ttf \ -+ Montserrat-ExtraBoldItalic.ttf \ -+ Montserrat-ExtraBold.ttf \ -+ Montserrat-ExtraLightItalic.ttf \ -+ Montserrat-ExtraLight.ttf \ -+ Montserrat-Italic.ttf \ -+ Montserrat-LightItalic.ttf \ -+ Montserrat-Light.ttf \ -+ Montserrat-MediumItalic.ttf \ -+ Montserrat-Medium.ttf \ -+ Montserrat-Regular.ttf \ -+ Montserrat-SemiBoldItalic.ttf \ -+ Montserrat-SemiBold.ttf \ -+ Montserrat-ThinItalic.ttf \ -+ Montserrat-Thin.ttf \ -+)) -+ -+# vim: set noet sw=4 ts=4: -\ No newline at end of file -diff --git a/external/more_fonts/Module_more_fonts.mk b/external/more_fonts/Module_more_fonts.mk -index e17af9a15141..b85f7468528f 100644 ---- a/external/more_fonts/Module_more_fonts.mk -+++ b/external/more_fonts/Module_more_fonts.mk -@@ -12,6 +12,7 @@ $(eval $(call gb_Module_Module,more_fonts)) - $(eval $(call gb_Module_add_targets,more_fonts,\ - ExternalPackage_alef \ - ExternalPackage_amiri \ -+ ExternalPackage_gmx \ - ExternalPackage_caladea \ - ExternalPackage_carlito \ - $(if $(MPL_SUBSET),,ExternalPackage_culmus) \ -@@ -39,6 +40,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\ - ExternalPackage_scheherazade \ - UnpackedTarball_alef \ - UnpackedTarball_amiri \ -+ UnpackedTarball_gmx \ - UnpackedTarball_caladea \ - UnpackedTarball_carlito \ - $(if $(MPL_SUBSET),,UnpackedTarball_culmus) \ -diff --git a/external/more_fonts/UnpackedTarball_gmx.mk b/external/more_fonts/UnpackedTarball_gmx.mk -new file mode 100644 -index 000000000000..ac8020494d7e ---- /dev/null -+++ b/external/more_fonts/UnpackedTarball_gmx.mk -@@ -0,0 +1,14 @@ -+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -+# -+# This file is part of the LibreOffice project. -+# -+# This Source Code Form 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/. -+# -+ -+$(eval $(call gb_UnpackedTarball_UnpackedTarball,font_gmx)) -+ -+$(eval $(call gb_UnpackedTarball_set_tarball,font_gmx,$(FONT_GMX_TARBALL))) -+ -+# vim: set noet sw=4 ts=4: -\ No newline at end of file -diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in -index a8d8b88394a8..89a2a6b63e3c 100644 ---- a/solenv/flatpak-manifest.in -+++ b/solenv/flatpak-manifest.in -@@ -590,6 +590,13 @@ - "dest": "external/tarballs", - "dest-filename": "@FONT_AMIRI_TARBALL@" - }, -+ { -+ "url": "https://repos.libreoffice.gob.mx/src/@FONT_GMX_TARBALL@", -+ "sha256": "@FONT_GMX_SHA256SUM@", -+ "type": "file", -+ "dest": "external/tarballs", -+ "dest-filename": "@FONT_GMX_TARBALL@" -+ }, - { - "url": "https://dev-www.libreoffice.org/src/@FONT_CULMUS_TARBALL@", - "sha256": "@FONT_CULMUS_SHA256SUM@", --- -2.39.2 - diff --git a/rpmbuild/SOURCES/patchset-1.1/0005-Fonts-added.patch b/rpmbuild/SOURCES/patchset-1.1/0005-Fonts-added.patch deleted file mode 100644 index fbe1da0..0000000 --- a/rpmbuild/SOURCES/patchset-1.1/0005-Fonts-added.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 2113fc78a62a38827221225aaa4734e2af417499 Mon Sep 17 00:00:00 2001 -From: Adlair Cerecedo-Mendez -Date: Mon, 17 Jul 2023 21:13:49 -0600 -Subject: [PATCH 05/18] Fonts added - -Change-Id: I32fb8011dd391d35c34627713cb38e5432927c7e ---- - .git-hooks/pre-commit | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/.git-hooks/pre-commit b/.git-hooks/pre-commit -index 521ed202b9ac..bdb5022849a6 100755 ---- a/.git-hooks/pre-commit -+++ b/.git-hooks/pre-commit -@@ -426,7 +426,7 @@ while () - } - my $size = `git cat-file -s :$_`; - # For now let's say large is 500KB -- my $limit = 500; -+ my $limit = 10000; - if ($size > $limit * 1024) - { - print "Error: Attempt to add a large file: $_, pleasy try to fit into $limit KB.\n"; --- -2.39.2 - diff --git a/rpmbuild/SOURCES/patchset-1.1/0006-Modificado-archivo-tar-xz-a-gz.patch b/rpmbuild/SOURCES/patchset-1.1/0006-Modificado-archivo-tar-xz-a-gz.patch deleted file mode 100644 index 80fda0c..0000000 --- a/rpmbuild/SOURCES/patchset-1.1/0006-Modificado-archivo-tar-xz-a-gz.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 3564089ff7f4e618a52be93d2bff34cf911d7b3a Mon Sep 17 00:00:00 2001 -From: Artukryp -Date: Mon, 31 Jul 2023 20:23:12 -0600 -Subject: [PATCH 06/18] Modificado archivo tar xz a gz - ---- - download.lst | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/download.lst b/download.lst -index 302e27ce3371..94875f843058 100644 ---- a/download.lst -+++ b/download.lst -@@ -3,6 +3,9 @@ - # There is a script solenv/bin/generate-flatpak-manifest.sh to substitute the variables, - # so upgrading to a new version only requires changes in download.lst. - -+FONT_GMX_TARBALL := gmx-fonts.tar.gz -+FONT_GMX_SHA256SUM := -+# - ABW_SHA256SUM := e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed - ABW_TARBALL := libabw-0.1.3.tar.xz - # three static lines --- -2.39.2 - diff --git a/rpmbuild/SOURCES/patchset-1.1/0008-Cambios-en-logo.patch b/rpmbuild/SOURCES/patchset-1.1/0008-Cambios-en-logo.patch deleted file mode 100644 index 53a8ecf..0000000 --- a/rpmbuild/SOURCES/patchset-1.1/0008-Cambios-en-logo.patch +++ /dev/null @@ -1,5074 +0,0 @@ -From 6e573dc3c83437278f4d1f5bf1419c91f811ebb7 Mon Sep 17 00:00:00 2001 -From: Artukryp -Date: Thu, 3 Aug 2023 17:36:45 -0600 -Subject: [PATCH 08/18] Cambios en logo - -Change-Id: Ica978200502962bedf5901be88db7a2484678346 ---- - cui/source/dialogs/about.cxx | 2 +- - custom_images/about.svg | 2516 ++++++++++++++++++++++++++++++++++ - custom_images/logo.svg | 2516 ++++++++++++++++++++++++++++++++++ - 3 files changed, 5033 insertions(+), 1 deletion(-) - create mode 100644 custom_images/about.svg - create mode 100644 custom_images/logo.svg - -diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx -index 01073166f18b..496cc16676c2 100644 ---- a/cui/source/dialogs/about.cxx -+++ b/cui/source/dialogs/about.cxx -@@ -111,7 +111,7 @@ AboutDialog::AboutDialog(weld::Window *pParent) - Graphic aGraphic(aBackgroundBitmap); - m_pBrandImage->set_image(aGraphic.GetXGraphic()); - } -- if (SfxApplication::loadBrandSvg("shell/MexGob", aBackgroundBitmap, nWidth * 0.9)) { -+ if (SfxApplication::loadBrandSvg("shell/about", aBackgroundBitmap, nWidth * 0.9)) { - // Eliminate white background when Skia is disabled by not drawing the - // background bitmap to a VirtualDevice. On most platforms, non-Skia - // VirtualDevices will be filled with a solid color when drawing -diff --git a/custom_images/about.svg b/custom_images/about.svg -new file mode 100644 -index 000000000000..6ad4cd79920c ---- /dev/null -+++ b/custom_images/about.svg -@@ -0,0 +1,2516 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/custom_images/logo.svg b/custom_images/logo.svg -new file mode 100644 -index 000000000000..6ad4cd79920c ---- /dev/null -+++ b/custom_images/logo.svg -@@ -0,0 +1,2516 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ --- -2.39.2 - diff --git a/rpmbuild/SOURCES/patchset-1.1/0009-Modificado-link-de-descarga-de-fuentes.patch b/rpmbuild/SOURCES/patchset-1.1/0009-Modificado-link-de-descarga-de-fuentes.patch deleted file mode 100644 index a259665..0000000 --- a/rpmbuild/SOURCES/patchset-1.1/0009-Modificado-link-de-descarga-de-fuentes.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 8c17c500df9200c842e90751c8dd64ff5059e58b Mon Sep 17 00:00:00 2001 -From: Artukryp -Date: Fri, 4 Aug 2023 20:21:33 -0600 -Subject: [PATCH 09/18] Modificado link de descarga de fuentes - -Change-Id: I80b8e9ea4286d68c1880ef45eaa191a8f0c3e7d2 ---- - Makefile.fetch | 2 +- - fonts/gmx-fonts.tar.gz | Bin 0 -> 2409292 bytes - fonts/gmx-fonts.tar.xz | Bin 1172924 -> 0 bytes - 3 files changed, 1 insertion(+), 1 deletion(-) - create mode 100644 fonts/gmx-fonts.tar.gz - delete mode 100644 fonts/gmx-fonts.tar.xz - -diff --git a/Makefile.fetch b/Makefile.fetch -index b0443f367007..ede18af4197d 100644 ---- a/Makefile.fetch -+++ b/Makefile.fetch -@@ -244,7 +244,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S - ,$(call fetch_Download_item,https://dev-www.libreoffice.org/extern,$(item))) - $(foreach item, \ - $(call fetch_Optional,MORE_FONTS,FONT_GMX_TARBALL) \ -- ,$(call fetch_Download_item,https://repos.libreoffice.gob.mx/src,$(item))) -+ ,$(call fetch_Download_item,https://git.softwarelibre.mx/strepsirrhini/office-gobmx/-/tree/logos/fonts,$(item))) - @mkdir -p $(dir $@) && touch $@ - @mkdir -p $(dir $@)/Executable - diff --git a/rpmbuild/SOURCES/patchset-1.1/0011-logo-image-updated.patch b/rpmbuild/SOURCES/patchset-1.1/0011-logo-image-updated.patch deleted file mode 100644 index 1a2a862..0000000 --- a/rpmbuild/SOURCES/patchset-1.1/0011-logo-image-updated.patch +++ /dev/null @@ -1,2536 +0,0 @@ -From 908f246483f5588a181df2428fbfc248935474d1 Mon Sep 17 00:00:00 2001 -From: Adlair Cerecedo-Mendez -Date: Mon, 14 Aug 2023 18:35:41 -0600 -Subject: [PATCH 11/18] logo image updated - -Change-Id: Ib4c398af48d0014c7f11b0da5f67f3659fc018fe ---- - custom_images/logo.svg | 2517 +--------------------------------------- - 1 file changed, 1 insertion(+), 2516 deletions(-) - -diff --git a/custom_images/logo.svg b/custom_images/logo.svg -index 6ad4cd79920c..3215508ec8c3 100644 ---- a/custom_images/logo.svg -+++ b/custom_images/logo.svg -@@ -1,2516 +1 @@ -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -+ -\ No newline at end of file --- -2.39.2 - diff --git a/rpmbuild/SOURCES/patchset-1.1/0012-Update-OfficeLinux.conf-with-lang-es.patch b/rpmbuild/SOURCES/patchset-1.1/0012-Update-OfficeLinux.conf-with-lang-es.patch deleted file mode 100644 index c5750a9..0000000 --- a/rpmbuild/SOURCES/patchset-1.1/0012-Update-OfficeLinux.conf-with-lang-es.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 3776d246c8aaa46a6ff233e1ce9ea1712c06818e Mon Sep 17 00:00:00 2001 -From: Israel Paredes -Date: Wed, 8 Nov 2023 19:42:40 +0000 -Subject: [PATCH 12/18] Update OfficeLinux.conf --with-lang=es - ---- - distro-configs/OfficeLinux.conf | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/distro-configs/OfficeLinux.conf b/distro-configs/OfficeLinux.conf -index 6cb4bd4dca66..30550375e27a 100644 ---- a/distro-configs/OfficeLinux.conf -+++ b/distro-configs/OfficeLinux.conf -@@ -8,3 +8,4 @@ - --with-vendor=INFOTEC - --with-package-version=7.5.0.0 - --disable-community-flavor -+--with-lang=es --- -2.39.2 - diff --git a/rpmbuild/SOURCES/patchset-1.1/0013-Update-OfficeLinux.conf.patch b/rpmbuild/SOURCES/patchset-1.1/0013-Update-OfficeLinux.conf.patch deleted file mode 100644 index 238da89..0000000 --- a/rpmbuild/SOURCES/patchset-1.1/0013-Update-OfficeLinux.conf.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 183e1b54c959e3d1c1b3e00646689c011ebed810 Mon Sep 17 00:00:00 2001 -From: Israel Paredes -Date: Wed, 8 Nov 2023 23:23:27 +0000 -Subject: [PATCH 13/18] Update OfficeLinux.conf - ---- - distro-configs/OfficeLinux.conf | 7 ++----- - 1 file changed, 2 insertions(+), 5 deletions(-) - -diff --git a/distro-configs/OfficeLinux.conf b/distro-configs/OfficeLinux.conf -index 30550375e27a..8f9dc46b2814 100644 ---- a/distro-configs/OfficeLinux.conf -+++ b/distro-configs/OfficeLinux.conf -@@ -1,11 +1,8 @@ - --with-parallelism -+--enable-dbgutil -+--without-doxygen - --with-branding=custom_images ----enable-release-build ----enable-epm ----with-package-format=deb - --with-product-name=Office - --with-vendor=INFOTEC ----with-vendor=INFOTEC - --with-package-version=7.5.0.0 ----disable-community-flavor - --with-lang=es --- -2.39.2 - diff --git a/rpmbuild/SOURCES/patchset-1.1/0014-fix-error-make-install.patch b/rpmbuild/SOURCES/patchset-1.1/0014-fix-error-make-install.patch deleted file mode 100644 index 21e5ce4..0000000 --- a/rpmbuild/SOURCES/patchset-1.1/0014-fix-error-make-install.patch +++ /dev/null @@ -1,65 +0,0 @@ -From c3f7bf02d9b70a46695e6f854a261a596824ddcd Mon Sep 17 00:00:00 2001 -From: Artukryp -Date: Mon, 13 Nov 2023 11:23:10 -0600 -Subject: [PATCH 14/18] fix error make install - -Change-Id: I590a323ec835f16badf1889f4c09d00fee3d3999 ---- - instsetoo_native/util/openoffice.lst.in | 44 +++++++++++++++++++++++++ - 1 file changed, 44 insertions(+) - -diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in -index 454670cb1e15..de7de46a22ff 100644 ---- a/instsetoo_native/util/openoffice.lst.in -+++ b/instsetoo_native/util/openoffice.lst.in -@@ -266,3 +266,47 @@ Office_SDK - } - } - -+OfficeDev -+{ -+ Settings -+ { -+ variables -+ { -+ PRODUCTNAME OfficeDev -+ PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ -+ PRODUCTEXTENSION .@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@ -+ WINDOWSBASISROOTNAME LibreOfficeDev @LIBO_VERSION_MAJOR@ -+ UNIXBASISROOTNAME libreofficedev@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ -+ POSTVERSIONEXTENSION -+ BUNDLEIDENTIFIER @MACOSX_BUNDLE_IDENTIFIER@ -+ BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ -+ USERDIRPRODUCTVERSION 4 -+ BASEPRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ -+ DEVELOPMENTPRODUCT 1 -+ BASISPACKAGEPREFIX lodevbasis -+ UREPACKAGEPREFIX libreofficedev -+ SOLSUREPACKAGEPREFIX libreofficedev -+ REGISTRYLAYERNAME LayerDev -+ UPDATEURL https://update.libreoffice.org/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@ -+ PACKAGEREVISION {buildid} -+ LICENSENAME LGPL -+ ROOTMODULEGID gid_Module_Root -+ GLOBALPATCHFILEGID gid_File_Txt_Patchfiles -+ SPELLCHECKERFILE spellchecker_selection.txt -+ CHANGETARGETDIR 1 -+ PATCHCODEFILE ooodev_patchcodes.txt -+ CODEFILENAME codes_ooodev.txt -+ LOCALUSERDIR $ORIGIN/.. -+ } -+ active 1 -+ compression 5 -+ script setup_osl -+ downloadname LibreOfficeDev_{productversion}_{os}_install_{languages} -+ langpackdownloadname LibreOfficeDev_{productversion}_languagepack_{os}_install_{languages} -+ helppackdownloadname LibreOfficeDev_{productversion}_helppack_{os}_install_{languages} -+ include {installscriptdir},{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native,{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}/ExtensionPackage,{filelistpath}/CustomTarget/helpcontent2/help3xsl/filelists,{extensionsdir},{licensepath},{packinfopath} -+ } -+} --- -2.39.2 - diff --git a/rpmbuild/SOURCES/patchset-1.1/0015-gob-mx-1.0.patch b/rpmbuild/SOURCES/patchset-1.1/0015-gob-mx-1.0.patch deleted file mode 100644 index e69de29..0000000 diff --git a/rpmbuild/SOURCES/patchset-1.1/0016-Add-minor-version-OS-to-PDF-producer-metadata.patch b/rpmbuild/SOURCES/patchset-1.1/0016-Add-minor-version-OS-to-PDF-producer-metadata.patch deleted file mode 100644 index 6142371..0000000 --- a/rpmbuild/SOURCES/patchset-1.1/0016-Add-minor-version-OS-to-PDF-producer-metadata.patch +++ /dev/null @@ -1,60 +0,0 @@ -From ed8a0ebfc1d6cfebc45db69064b56c7215638654 Mon Sep 17 00:00:00 2001 -From: Octavio Alvarez -Date: Thu, 1 Feb 2024 07:55:21 +0000 -Subject: [PATCH 16/18] Add minor version / OS to PDF producer metadata. - -Change-Id: Idca8cd73217779ab8cc8283e19ae8989d03434be ---- - filter/source/pdf/pdfexport.cxx | 13 ++++++++++++- - vcl/qa/cppunit/pdfexport/pdfexport2.cxx | 1 - - 2 files changed, 12 insertions(+), 2 deletions(-) - -diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx -index 7d07f8182bdc..b6ff5fc7a95e 100644 ---- a/filter/source/pdf/pdfexport.cxx -+++ b/filter/source/pdf/pdfexport.cxx -@@ -65,6 +65,8 @@ - - #include - -+#include -+ - using namespace ::com::sun::star; - using namespace ::com::sun::star::io; - using namespace ::com::sun::star::uno; -@@ -505,10 +507,19 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >& - if (!aProducerOverride.isEmpty()) - aContext.DocumentInfo.Producer = aProducerOverride; - else -+ { -+ OUString arch; -+ auto const ok = rtl::Bootstrap::get("_ARCH", arch); -+ assert(ok); (void) ok; - aContext.DocumentInfo.Producer = - utl::ConfigManager::getProductName() + - " " + -- utl::ConfigManager::getProductVersion(); -+ utl::ConfigManager::getAboutBoxProductVersion() + -+ " (" + arch + ")"; -+ #if HAVE_FEATURE_COMMUNITY_FLAVOR -+ aContext.DocumentInfo.Producer += " / LibreOffice Community"; -+ #endif -+ } - } - - aContext.DocumentInfo.Creator = aCreator; -diff --git a/vcl/qa/cppunit/pdfexport/pdfexport2.cxx b/vcl/qa/cppunit/pdfexport/pdfexport2.cxx -index d2811f32fbd4..4d6c06c40057 100644 ---- a/vcl/qa/cppunit/pdfexport/pdfexport2.cxx -+++ b/vcl/qa/cppunit/pdfexport/pdfexport2.cxx -@@ -4311,7 +4311,6 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest2, testPdfImageEncryption) - aMediaDescriptor["FilterName"] <<= OUString("writer_pdf_Export"); - uno::Sequence aFilterData = { - comphelper::makePropertyValue("EncryptFile", true), -- comphelper::makePropertyValue("DocumentOpenPassword", OUString("secret")), - }; - aMediaDescriptor["FilterData"] <<= aFilterData; - xStorable->storeToURL(maTempFile.GetURL(), aMediaDescriptor.getAsConstPropertyValueList()); --- -2.39.2 - diff --git a/rpmbuild/SOURCES/patchset-1.1/0017-CPPUNIT-Calc-fixed.patch b/rpmbuild/SOURCES/patchset-1.1/0017-CPPUNIT-Calc-fixed.patch deleted file mode 100644 index 1c403da..0000000 --- a/rpmbuild/SOURCES/patchset-1.1/0017-CPPUNIT-Calc-fixed.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 3b71303250467c0122af5fe3874e93bbf5e548c3 Mon Sep 17 00:00:00 2001 -From: Adlair Cerecedo-Mendez -Date: Fri, 12 Jan 2024 17:04:55 -0600 -Subject: [PATCH 17/18] CPPUNIT Calc - fixed - -Change-Id: I44c20706730c444e229e8f5eb17f2a9b7fca33ab ---- - sc/qa/unit/subsequent_export_test4.cxx | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/sc/qa/unit/subsequent_export_test4.cxx b/sc/qa/unit/subsequent_export_test4.cxx -index 95c7057aef2d..dc8a9073a1e7 100644 ---- a/sc/qa/unit/subsequent_export_test4.cxx -+++ b/sc/qa/unit/subsequent_export_test4.cxx -@@ -820,10 +820,7 @@ CPPUNIT_TEST_FIXTURE(ScExportTest4, testTdf147088) - - ScDocument* pDoc = getScDoc(); - -- // Without the fix in place, this test would have failed with -- // - Expected: _xffff_ -- // - Actual : -- CPPUNIT_ASSERT_EQUAL(OUString("_xffff_"), pDoc->GetString(0, 0, 0)); -+ CPPUNIT_ASSERT_EQUAL(static_cast(0), pDoc->GetPrintRangeCount(0)); - } - - CPPUNIT_TEST_FIXTURE(ScExportTest4, testTdf84874) --- -2.39.2 -