From 04f7d5cbbe9c95af4ebf9cd8619abf4760dac746 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Tue, 12 Mar 2019 12:33:02 +0000 Subject: [PATCH] resolve merge conflict vs f30 --- libreoffice.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index 4a0c694..ccf492a 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -54,7 +54,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.2 -Release: 2%{?libo_prerelease}%{?dist} +Release: 3%{?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/ @@ -2120,9 +2120,12 @@ done %{_includedir}/LibreOfficeKit %changelog -* Tue Mar 12 2019 Caolán McNamara - 1:6.2.1.2-2 +* Tue Mar 12 2019 Caolán McNamara - 1:6.2.1.2-3 - currency menu too narrow +* Thu Mar 07 2019 Caolán McNamara - 1:6.2.1.2-2 +- bump n-v-r + * Sat Mar 02 2019 Caolán McNamara - 1:6.2.1.2-1 - latest stable