From 296c969e447d8c880dfd677b2727c06626431912 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 5 Nov 2019 14:06:04 -0500 Subject: [PATCH] import libreoffice-6.0.6.1-19.el8 --- .gitignore | 2 - .libreoffice.metadata | 2 - ...15109-add-All-files-to-the-graphic-i.patch | 57 +++ ...-53029-ui-prompt-for-printer-authent.patch | 400 ++++++++++++++++++ SPECS/libreoffice.spec | 51 ++- 5 files changed, 499 insertions(+), 13 deletions(-) create mode 100644 SOURCES/0001-Resolves-rhbz-1715109-add-All-files-to-the-graphic-i.patch create mode 100644 SOURCES/0001-rhbz-1691287-tdf-53029-ui-prompt-for-printer-authent.patch diff --git a/.gitignore b/.gitignore index 3ab4eac..c957830 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,5 @@ SOURCES/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip SOURCES/185d60944ea767075d27247c3162b3bc-unowinreg.dll -SOURCES/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip -SOURCES/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip SOURCES/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip SOURCES/gpgkey-C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3.gpg.asc SOURCES/libreoffice-6.0.6.1.tar.xz diff --git a/.libreoffice.metadata b/.libreoffice.metadata index 9999e10..1b9b4ba 100644 --- a/.libreoffice.metadata +++ b/.libreoffice.metadata @@ -1,7 +1,5 @@ 7168b0f40aa5c72267899601c116d2348d2f56ec SOURCES/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 0619ed3a89644bef318df67db12045b2b590585b SOURCES/185d60944ea767075d27247c3162b3bc-unowinreg.dll -1acea86fd399ed7817879d36370d3d1f8b109050 SOURCES/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip -8a90669029e107b61953b90ba11545fef586c2ca SOURCES/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 2d49e11b0b711970f494294dc3698f05eb294853 SOURCES/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 7b5fd93d787fbc6d9c2d4025d543730ee8dc4559 SOURCES/gpgkey-C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3.gpg.asc 7a10bc2e3d39a2b61a507eae30c8b505dcd4f553 SOURCES/libreoffice-6.0.6.1.tar.xz diff --git a/SOURCES/0001-Resolves-rhbz-1715109-add-All-files-to-the-graphic-i.patch b/SOURCES/0001-Resolves-rhbz-1715109-add-All-files-to-the-graphic-i.patch new file mode 100644 index 0000000..fb1b511 --- /dev/null +++ b/SOURCES/0001-Resolves-rhbz-1715109-add-All-files-to-the-graphic-i.patch @@ -0,0 +1,57 @@ +From bcb05a5daba9aafdc3921322676f33e055413f9f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Fri, 31 May 2019 15:33:00 +0100 +Subject: [PATCH] Resolves: rhbz#1715109 add All files to the graphic import + dialog +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +to pick up things without extensions, for consistency with file->open + +Reviewed-on: https://gerrit.libreoffice.org/73276 +Tested-by: Jenkins +Reviewed-by: Caolán McNamara +Tested-by: Caolán McNamara +(cherry picked from commit c6c14f6ae7f6d7768b450e7776db917bb662f3cf) + +Change-Id: Ib119fb0d053d1d288eee7cd17fa4f12dcb9956d7 +--- + sfx2/source/dialog/filedlghelper.cxx | 20 ++++++++++++++++---- + 1 file changed, 16 insertions(+), 4 deletions(-) + +diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx +index 3820ee4107c9..737dcb278a2a 100644 +--- a/sfx2/source/dialog/filedlghelper.cxx ++++ b/sfx2/source/dialog/filedlghelper.cxx +@@ -1872,11 +1872,23 @@ void FileDialogHelper_Impl::addGraphicFilter() + + try + { +- OUString aAllFilterName = SfxResId( STR_SFX_IMPORT_ALL ); +- aAllFilterName = ::sfx2::addExtension( aAllFilterName, aExtensions, bIsInOpenMode, *this ); ++ // if the extension is not "All files", insert "All images" ++ if (aExtensions != FILEDIALOG_FILTER_ALL) ++ { ++ OUString aAllFilterName = SfxResId(STR_SFX_IMPORT_ALL); ++ aAllFilterName = ::sfx2::addExtension( aAllFilterName, aExtensions, bIsInOpenMode, *this ); ++ xFltMgr->appendFilter( aAllFilterName, aExtensions ); ++ maSelectFilter = aAllFilterName; // and make it the default ++ } ++ ++ // rhbz#1715109 always include All files *.* or * ++ OUString aAllFilesName = SfxResId( STR_SFX_FILTERNAME_ALL ); ++ aAllFilesName = ::sfx2::addExtension( aAllFilesName, FILEDIALOG_FILTER_ALL, bIsInOpenMode, *this ); ++ xFltMgr->appendFilter( aAllFilesName, FILEDIALOG_FILTER_ALL ); + +- xFltMgr->appendFilter( aAllFilterName, aExtensions ); +- maSelectFilter = aAllFilterName; ++ // if the extension is "All files", make that the default ++ if (aExtensions == FILEDIALOG_FILTER_ALL) ++ maSelectFilter = aAllFilesName; + } + catch( const IllegalArgumentException& ) + { +-- +2.21.0 + diff --git a/SOURCES/0001-rhbz-1691287-tdf-53029-ui-prompt-for-printer-authent.patch b/SOURCES/0001-rhbz-1691287-tdf-53029-ui-prompt-for-printer-authent.patch new file mode 100644 index 0000000..a8dcb0a --- /dev/null +++ b/SOURCES/0001-rhbz-1691287-tdf-53029-ui-prompt-for-printer-authent.patch @@ -0,0 +1,400 @@ +From e2a12e931018f04b8aba1644ac22b8f1e57a0d0d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Tue, 26 Mar 2019 12:09:03 +0000 +Subject: [PATCH] rhbz#1691287 tdf#53029 ui prompt for printer authentication + +refactor and reuse existing dialog to add potential domain entry + +Change-Id: Ib884931f8ccc62aad9b3e92ecf93d1da7ffe607b + +Related: rhbz#1691287 fill in default domain and username + +and grab focus to first entry entry + +Change-Id: Icb50766948c77072eaab9faf89436c6ecbb49ecc + +Related: tdf#53029 escape backslash in username for 'domain\username' + +Change-Id: I645623886396b55ccea273bfd697cf319b53f506 +--- + vcl/inc/printerinfomanager.hxx | 2 + + vcl/uiconfig/ui/cupspassworddialog.ui | 34 +++- + vcl/unx/generic/printer/cupsmgr.cxx | 259 +++++++++++++++++++------- + 3 files changed, 221 insertions(+), 74 deletions(-) + +diff --git a/vcl/inc/printerinfomanager.hxx b/vcl/inc/printerinfomanager.hxx +index 7691fbeebc6c..4c225a22f91e 100644 +--- a/vcl/inc/printerinfomanager.hxx ++++ b/vcl/inc/printerinfomanager.hxx +@@ -52,6 +52,8 @@ struct PrinterInfo : JobData + // a list of special features separated by ',' not used by psprint + // but assigned from the outside (currently for "fax","pdf=","autoqueue","external_dialog") + OUString m_aFeatures; ++ // auth-info-required, potential [domain],[username],[password] to prompt for to authenticate printing ++ OUString m_aAuthInfoRequired; + bool m_bPapersizeFromSetup; + + PrinterInfo() +diff --git a/vcl/uiconfig/ui/cupspassworddialog.ui b/vcl/uiconfig/ui/cupspassworddialog.ui +index f4fb757209bb..2c17d1397c3e 100644 +--- a/vcl/uiconfig/ui/cupspassworddialog.ui ++++ b/vcl/uiconfig/ui/cupspassworddialog.ui +@@ -73,7 +73,7 @@ + + + 0 +- 1 ++ 2 + + + +@@ -87,7 +87,7 @@ + + + 0 +- 2 ++ 3 + + + +@@ -114,7 +114,7 @@ + + + 1 +- 1 ++ 2 + + + +@@ -123,10 +123,36 @@ + True + True + False ++ password + + + 1 +- 2 ++ 3 ++ ++ ++ ++ ++ False ++ True ++ _Domain: ++ True ++ domain ++ 1 ++ ++ ++ 0 ++ 1 ++ ++ ++ ++ ++ True ++ True ++ True ++ ++ ++ 1 ++ 1 + + + +diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx +index 328e9246e9f5..0f5a647f92a6 100644 +--- a/vcl/unx/generic/printer/cupsmgr.cxx ++++ b/vcl/unx/generic/printer/cupsmgr.cxx +@@ -319,6 +319,8 @@ void CUPSManager::initialize() + aPrinter.m_aInfo.m_aComment=OStringToOUString(pDest->options[k].value, aEncoding); + if(!strcmp(pDest->options[k].name, "printer-location")) + aPrinter.m_aInfo.m_aLocation=OStringToOUString(pDest->options[k].value, aEncoding); ++ if(!strcmp(pDest->options[k].name, "auth-info-required")) ++ aPrinter.m_aInfo.m_aAuthInfoRequired=OStringToOUString(pDest->options[k].value, aEncoding); + } + + OUStringBuffer aBuf( 256 ); +@@ -617,6 +619,143 @@ void CUPSManager::getOptionsFromDocumentSetup( const JobData& rJob, bool bBanner + } + } + ++namespace ++{ ++ class RTSPWDialog : public ModalDialog ++ { ++ VclPtr m_xText; ++ VclPtr m_xDomainLabel; ++ VclPtr m_xDomainEdit; ++ VclPtr m_xUserLabel; ++ VclPtr m_xUserEdit; ++ VclPtr m_xPassLabel; ++ VclPtr m_xPassEdit; ++ ++ public: ++ RTSPWDialog(vcl::Window* pParent, const OString& rServer, const OString& rUserName); ++ virtual void dispose() override; ++ virtual ~RTSPWDialog() override; ++ ++ OString getDomain() const ++ { ++ return OUStringToOString( m_xDomainEdit->GetText(), osl_getThreadTextEncoding() ); ++ } ++ ++ OString getUserName() const ++ { ++ return OUStringToOString( m_xUserEdit->GetText(), osl_getThreadTextEncoding() ); ++ } ++ ++ OString getPassword() const ++ { ++ return OUStringToOString( m_xPassEdit->GetText(), osl_getThreadTextEncoding() ); ++ } ++ ++ void SetDomainVisible(bool bShow) ++ { ++ m_xDomainLabel->Show(bShow); ++ m_xDomainEdit->Show(bShow); ++ } ++ ++ void SetUserVisible(bool bShow) ++ { ++ m_xUserLabel->Show(bShow); ++ m_xUserEdit->Show(bShow); ++ } ++ ++ void SetPassVisible(bool bShow) ++ { ++ m_xPassLabel->Show(bShow); ++ m_xPassEdit->Show(bShow); ++ } ++ }; ++ ++ RTSPWDialog::RTSPWDialog(vcl::Window* pParent, const OString& rServer, const OString& rUserName) ++ : ModalDialog(pParent, "CUPSPasswordDialog", "vcl/ui/cupspassworddialog.ui") ++ { ++ get(m_xText, "text"); ++ get(m_xDomainLabel, "label3"); ++ get(m_xDomainEdit, "domain"); ++ get(m_xUserLabel, "label1"); ++ get(m_xUserEdit, "user"); ++ get(m_xPassLabel, "label2"); ++ get(m_xPassEdit, "pass"); ++ ++ OUString aText(m_xText->GetText()); ++ aText = aText.replaceFirst("%s", OStringToOUString(rServer, osl_getThreadTextEncoding())); ++ m_xText->SetText(aText); ++ m_xDomainEdit->SetText("WORKGROUP"); ++ if (rUserName.isEmpty()) ++ m_xUserEdit->GrabFocus(); ++ else ++ { ++ m_xUserEdit->SetText(OStringToOUString(rUserName, osl_getThreadTextEncoding())); ++ m_xPassEdit->GrabFocus(); ++ } ++ } ++ ++ RTSPWDialog::~RTSPWDialog() ++ { ++ disposeOnce(); ++ } ++ ++ void RTSPWDialog::dispose() ++ { ++ m_xText.clear(); ++ m_xDomainLabel.clear(); ++ m_xDomainEdit.clear(); ++ m_xUserLabel.clear(); ++ m_xUserEdit.clear(); ++ m_xPassLabel.clear(); ++ m_xPassEdit.clear(); ++ ModalDialog::dispose(); ++ } ++ ++ bool AuthenticateQuery(const OString& rServer, OString& rUserName, OString& rPassword) ++ { ++ bool bRet = false; ++ ++ ScopedVclPtrInstance aDialog(nullptr, rServer, rUserName); ++ if (aDialog->Execute()) ++ { ++ rUserName = aDialog->getUserName(); ++ rPassword = aDialog->getPassword(); ++ bRet = true; ++ } ++ ++ return bRet; ++ } ++} ++ ++namespace ++{ ++ OString EscapeCupsOption(const OString& rIn) ++ { ++ OStringBuffer sRet; ++ sal_Int32 nLen = rIn.getLength(); ++ for (sal_Int32 i = 0; i < nLen; ++i) ++ { ++ switch(rIn[i]) ++ { ++ case '\\': ++ case '\'': ++ case '\"': ++ case ',': ++ case ' ': ++ case '\f': ++ case '\n': ++ case '\r': ++ case '\t': ++ case '\v': ++ sRet.append('\\'); ++ break; ++ } ++ sRet.append(rIn[i]); ++ } ++ return sRet.makeStringAndClear(); ++ } ++} ++ + bool CUPSManager::endSpool( const OUString& rPrintername, const OUString& rJobTitle, FILE* pFile, const JobData& rDocumentJobData, bool bBanner, const OUString& rFaxNumber ) + { + SAL_INFO( "vcl.unx.print", "endSpool: " << rPrintername << "," << rJobTitle << " copy count = " << rDocumentJobData.m_nCopies ); +@@ -642,7 +781,56 @@ bool CUPSManager::endSpool( const OUString& rPrintername, const OUString& rJobTi + // setup cups options + int nNumOptions = 0; + cups_option_t* pOptions = nullptr; +- getOptionsFromDocumentSetup( rDocumentJobData, bBanner, nNumOptions, reinterpret_cast(&pOptions) ); ++ auto ppOptions = reinterpret_cast(&pOptions); ++ getOptionsFromDocumentSetup( rDocumentJobData, bBanner, nNumOptions, ppOptions ); ++ ++ PrinterInfo aInfo(getPrinterInfo(rPrintername)); ++ if (!aInfo.m_aAuthInfoRequired.isEmpty()) ++ { ++ bool bDomain(false), bUser(false), bPass(false); ++ sal_Int32 nIndex = 0; ++ do ++ { ++ OUString aToken = aInfo.m_aAuthInfoRequired.getToken(0, ',', nIndex); ++ if (aToken == "domain") ++ bDomain = true; ++ else if (aToken == "username") ++ bUser = true; ++ else if (aToken == "password") ++ bPass = true; ++ } ++ while (nIndex >= 0); ++ ++ if (bDomain || bUser || bPass) ++ { ++ OString sPrinterName(OUStringToOString(rPrintername, RTL_TEXTENCODING_UTF8)); ++ OString sUser = cupsUser(); ++ ScopedVclPtrInstance aDialog(nullptr, sPrinterName, sUser); ++ aDialog->SetDomainVisible(bDomain); ++ aDialog->SetUserVisible(bUser); ++ aDialog->SetPassVisible(bPass); ++ ++ if (aDialog->Execute() == RET_OK) ++ { ++ OString sAuth; ++ if (bDomain) ++ sAuth = EscapeCupsOption(aDialog->getDomain()); ++ if (bUser) ++ { ++ if (bDomain) ++ sAuth += ","; ++ sAuth += EscapeCupsOption(aDialog->getUserName()); ++ } ++ if (bPass) ++ { ++ if (bUser || bDomain) ++ sAuth += ","; ++ sAuth += EscapeCupsOption(aDialog->getPassword()); ++ } ++ nNumOptions = cupsAddOption("auth-info", sAuth.getStr(), nNumOptions, &pOptions); ++ } ++ } ++ } + + OString sJobName(OUStringToOString(rJobTitle, aEnc)); + +@@ -825,75 +1013,6 @@ bool CUPSManager::writePrinterConfig() + return PrinterInfoManager::writePrinterConfig(); + } + +-namespace +-{ +- class RTSPWDialog : public ModalDialog +- { +- VclPtr m_pText; +- VclPtr m_pUserEdit; +- VclPtr m_pPassEdit; +- +- public: +- RTSPWDialog(const OString& rServer, const OString& rUserName, vcl::Window* pParent); +- virtual ~RTSPWDialog() override; +- virtual void dispose() override; +- OString getUserName() const; +- OString getPassword() const; +- }; +- +- RTSPWDialog::RTSPWDialog( const OString& rServer, const OString& rUserName, vcl::Window* pParent ) +- : ModalDialog(pParent, "CUPSPasswordDialog", +- "vcl/ui/cupspassworddialog.ui") +- { +- get(m_pText, "text"); +- get(m_pUserEdit, "user"); +- get(m_pPassEdit, "pass"); +- +- OUString aText(m_pText->GetText()); +- aText = aText.replaceFirst("%s", OStringToOUString(rServer, osl_getThreadTextEncoding())); +- m_pText->SetText(aText); +- m_pUserEdit->SetText( OStringToOUString(rUserName, osl_getThreadTextEncoding())); +- } +- +- RTSPWDialog::~RTSPWDialog() +- { +- disposeOnce(); +- } +- +- void RTSPWDialog::dispose() +- { +- m_pText.clear(); +- m_pUserEdit.clear(); +- m_pPassEdit.clear(); +- ModalDialog::dispose(); +- } +- +- OString RTSPWDialog::getUserName() const +- { +- return OUStringToOString( m_pUserEdit->GetText(), osl_getThreadTextEncoding() ); +- } +- +- OString RTSPWDialog::getPassword() const +- { +- return OUStringToOString( m_pPassEdit->GetText(), osl_getThreadTextEncoding() ); +- } +- +- bool AuthenticateQuery(const OString& rServer, OString& rUserName, OString& rPassword) +- { +- bool bRet = false; +- +- ScopedVclPtrInstance aDialog(rServer, rUserName, nullptr); +- if (aDialog->Execute()) +- { +- rUserName = aDialog->getUserName(); +- rPassword = aDialog->getPassword(); +- bRet = true; +- } +- +- return bRet; +- } +-} +- + const char* CUPSManager::authenticateUser() + { + const char* pRet = nullptr; +-- +2.21.0 + diff --git a/SPECS/libreoffice.spec b/SPECS/libreoffice.spec index e941602..658404e 100644 --- a/SPECS/libreoffice.spec +++ b/SPECS/libreoffice.spec @@ -64,7 +64,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.1 -Release: 13%{?libo_prerelease}%{?dist} +Release: 19%{?libo_prerelease}%{?dist} License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and MPLv2.0 and CC0 URL: http://www.libreoffice.org/ @@ -79,15 +79,19 @@ Source7: http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c31 Source8: libreoffice-multiliblauncher.sh Source9: %{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip +%if 0%{?fedora} Source10: %{external_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip Source11: %{external_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip +%endif #Unfortunately later versions of hsqldb changed the file format, so if we use a later version we loose #backwards compatability. Source12: %{external_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip %global bundling_options %{?bundling_options} --without-system-hsqldb Provides: bundled(hsqldb) = 1.8.0 +%if 0%{?fedora} Provides: bundled(rhino) = 1.5 +%endif Provides: bundled(xsltml) = 2.1.2 # symbolic icons @@ -292,6 +296,8 @@ Patch20: 0005-rhbz-1618703-Allow-to-use-OpenSSL-as-backend-for-rtl.patch Patch21: 0001-Resolves-rhbz-1647507-try-inputted-password-as-both-.patch Patch22: 0001-tdf-121203-DOCX-import-fix-loss-of-free-form-text-in.patch Patch23: 0001-keep-pyuno-script-processing-below-base-uri.patch +Patch24: 0001-rhbz-1691287-tdf-53029-ui-prompt-for-printer-authent.patch +Patch25: 0001-Resolves-rhbz-1715109-add-All-files-to-the-graphic-i.patch %if 0%{?rhel} # not upstreamed @@ -360,6 +366,10 @@ Requires: java-headless >= 1:1.6 Obsoletes: libreoffice-headless < 1:4.4.0.0 Provides: libreoffice-headless = %{epoch}:%{version}-%{release} Provides: libreoffice-headless%{?_isa} = %{epoch}:%{version}-%{release} +%if 0%{?rhel} +Obsoletes: libreoffice-bsh < 1:6.0.6.2 +Obsoletes: libreoffice-rhino < 1:6.0.6.2 +%endif %description core The shared core libraries and support files for LibreOffice. @@ -389,6 +399,7 @@ Requires: %{name}-ure%{?_isa} = %{epoch}:%{version}-%{release} GUI database front-end for LibreOffice. Allows creation and management of databases through a GUI. +%if 0%{?fedora} %package bsh Summary: BeanShell support for LibreOffice Requires: bsh @@ -397,6 +408,14 @@ Requires: %{name}-core%{?_isa} = %{epoch}:%{version}-%{release} %description bsh Support BeanShell scripts in LibreOffice. +%package rhino +Summary: JavaScript support for LibreOffice +Requires: %{name}-core%{?_isa} = %{epoch}:%{version}-%{release} + +%description rhino +Support JavaScript scripts in LibreOffice. +%endif + %package officebean Summary: JavaBean for LibreOffice Components Requires: %{name}-core%{?_isa} = %{epoch}:%{version}-%{release} @@ -415,13 +434,6 @@ BuildArch: noarch %description officebean-common Arch-independent part of %{name}-officebean. -%package rhino -Summary: JavaScript support for LibreOffice -Requires: %{name}-core%{?_isa} = %{epoch}:%{version}-%{release} - -%description rhino -Support JavaScript scripts in LibreOffice. - %package wiki-publisher Summary: Create Wiki articles on MediaWiki servers with LibreOffice Requires: %{name}-writer%{?_isa} = %{epoch}:%{version}-%{release} @@ -1071,7 +1083,7 @@ export CFLAGS=$ARCH_FLAGS export CXXFLAGS=$ARCH_FLAGS %if 0%{?rhel} -%define distrooptions --disable-eot --enable-python=system --with-system-ucpp +%define distrooptions --disable-eot --enable-python=system --with-system-ucpp --disable-scripting-beanshell --disable-scripting-javascript %else # fedora %define distrooptions --enable-eot --enable-kde4 --with-system-ucpp %endif @@ -1894,6 +1906,7 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : update-desktop-database %{_datadir}/applications &> /dev/null || : %endif +%if 0%{?fedora} %files bsh %{baseinstdir}/program/classes/ScriptProviderForBeanShell.jar %{baseinstdir}/program/services/scriptproviderforbeanshell.rdb @@ -1904,6 +1917,7 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %{baseinstdir}/program/classes/ScriptProviderForJavaScript.jar %{baseinstdir}/program/services/scriptproviderforjavascript.rdb %{baseinstdir}/share/Scripts/javascript +%endif %files wiki-publisher %docdir %{baseinstdir}/share/extensions/wiki-publisher/license @@ -2316,6 +2330,25 @@ done %{_includedir}/LibreOfficeKit %changelog +* Mon Aug 19 2019 Caolán McNamara - 1:6.0.6.1-19 +- Related: rhbz#1691287 escape backslashes etc in username + +* Tue Aug 13 2019 Caolán McNamara - 1:6.0.6.1-18 +- Resolves: rhbz#1691287 improve prompt for auth-info-required + +* Fri Jun 28 2019 Marek Kasik - 1:6.0.6.1-17 +- Rebuild due to soname bump in poppler-0.66.0-21 +- Resolves: #1715842 + +* Tue Jun 04 2019 Caolán McNamara - 1:6.0.6.1-16 +- Resolves: rhbz#1715109 add 'All files' to the graphic filter list + +* Fri Apr 26 2019 Caolán McNamara - 1:6.0.6.1-15 +- Resolves: rhbz#1703375 disable bsh and rhino for rhel + +* Fri Mar 29 2019 Caolán McNamara - 1:6.0.6.1-14 +- Resolves: rhbz#1691287 prompt for auth-info-required + * Fri Feb 08 2019 Caolán McNamara - 1:6.0.6.1-13 - Related: rhbz#1672004 fix serbian/swedish autocorr rpm upgrade