From 93204639d1fb3d8030b3c1b17c3426b7026e88ee Mon Sep 17 00:00:00 2001 From: Nicolas Mailhot Date: Tue, 28 Apr 2020 11:46:40 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20Workaround=20Fedora=20problems?= =?UTF-8?q?=20created=20by=20rpm=20commit=2093604e2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + fonts-rpm-macros.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d3a2b7b..48fa12c 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /fonts-rpm-macros-2.0.3.tar.gz /fonts-rpm-macros-2.0.4.tar.gz /fonts-rpm-macros-2.0.5.tar.gz +/fonts-rpm-macros-3.0.1.tar.gz diff --git a/fonts-rpm-macros.spec b/fonts-rpm-macros.spec index 6a63516..2d4d523 100644 --- a/fonts-rpm-macros.spec +++ b/fonts-rpm-macros.spec @@ -1,6 +1,6 @@ # SPDX-License-Identifier: MIT %global forgeurl https://pagure.io/fonts-rpm-macros -Version: 2.0.5 +Version: 3.0.1 %forgemeta #https://src.fedoraproject.org/rpms/redhat-rpm-config/pull-request/51 @@ -88,7 +88,7 @@ macros provided by fonts-rpm-macros to create fonts packages. %writevars -f rpm/macros.d/macros.fonts-srpm _fontbasedir _fontconfig_masterdir _fontconfig_confdir _fontconfig_templatedir for template in templates/rpm/*\.spec ; do target=$(echo "${template}" | sed "s|^\(.*\)\.spec$|\1-bare.spec|g") - grep -v '^#' "${template}" > "${target}" + grep -v '^%%dnl' "${template}" > "${target}" touch -r "${template}" "${target}" done @@ -146,6 +146,10 @@ install -m 0755 -vp bin/* %{buildroot}%{_bindir} %doc %{ftcgtemplatedir}/*txt %changelog +* Mon Apr 27 2020 Nicolas Mailhot +- 3.0.1-1 +🐞 Workaround Fedora problems created by rpm commit 93604e2 + * Fri Apr 3 2020 Nicolas Mailhot - 2.0.5-1 ✅ do not add empty urls to appstream files diff --git a/sources b/sources index 9195efd..76ae7b2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fonts-rpm-macros-2.0.5.tar.gz) = f3cb2a85c982100d001d905306868c05061a585e8b4ebb95062e9ddbee257b2b75318c1d1616cc37baa3b6644ba8e6712fb63566b1d04606013c13ac64d068f6 +SHA512 (fonts-rpm-macros-3.0.1.tar.gz) = cd04456b06e306efae7c64c97dcf2354e9163adb3a92d9ba0c1cffc8cf27b5f1c9e576d0a0d3f72ca51b50eb6e3777f35ad2f3bb5f0d90ff1ae13960ade52f63