From a170a75475a99170adfb8865cfc0c8e8059ac13b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 7 Mar 2016 09:35:39 +0100 Subject: scl-utils: fix grep usage in macros.scl #1315051 --- macros.scl-filesystem | 2 +- scl-utils.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/macros.scl-filesystem b/macros.scl-filesystem index 3c418cd..1e51cf9 100644 --- a/macros.scl-filesystem +++ b/macros.scl-filesystem @@ -295,7 +295,7 @@ ln -snf usr/%{_lib} %{_lib} %endif sed -n -f %{buildroot}/iso_639.sed /usr/share/xml/iso-codes/iso_639.xml >%{buildroot}/iso_639.tab sed -n -f %{buildroot}/iso_3166.sed /usr/share/xml/iso-codes/iso_3166.xml >%{buildroot}/iso_3166.tab -grep -v "^$" %{buildroot}/iso_639.tab | grep -v "^#" | while read a b c d ; do +grep -av "^$" %{buildroot}/iso_639.tab | grep -av "^#" | while read a b c d ; do [[ "$d" =~ "^Reserved" ]] && continue [[ "$d" =~ "^No linguistic" ]] && continue locale=$c diff --git a/scl-utils.spec b/scl-utils.spec index 2b9f02e..37703e5 100644 --- a/scl-utils.spec +++ b/scl-utils.spec @@ -3,7 +3,7 @@ Name: scl-utils Epoch: 1 Version: 2.0.1 -Release: 8%{dist} +Release: 9%{dist} Summary: Utilities for alternative packaging License: GPLv2+ @@ -84,6 +84,9 @@ rm -rf %buildroot %{_rpmconfigdir}/brp-scl-python-bytecompile %changelog +* Mon Mar 7 2016 Remi Collet - 1:2.0.1-9 +- fix grep usage in macros.scl #1315051 + * Sun Mar 6 2016 Remi Collet - 1:2.0.1-8 - F24 build -- cgit