rpms
/
ghc-rpm-macros
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cabal-tweak-drop-dep: quote grep pattern to allow whitespace

This commit is contained in:
Jens Petersen 2018-01-29 22:21:31 +01:00
parent 811c5a99f0
commit ca7fad4882
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cabal-tweak-drop-dep
View File

@ -22,7 +22,7 @@ if [ ! -f $CABALFILE.orig ]; then
BACKUP=.orig BACKUP=.orig
fi fi
if grep $DEP $CABALFILE | sed -e "s/$DEP//" | grep -q -e "[A-Za-z]"; then if grep "$DEP" $CABALFILE | sed -e "s/$DEP//" | grep -q -e "[A-Za-z]"; then
echo "$0: deleting whole $DEP lines not safe - try more precise pattern" echo "$0: deleting whole $DEP lines not safe - try more precise pattern"
exit 1 exit 1
fi fi

5
ghc-rpm-macros.spec
View File

@ -10,7 +10,7 @@
#%%global without_hscolour 1 #%%global without_hscolour 1
Name: ghc-rpm-macros Name: ghc-rpm-macros
Version: 1.8.5 Version: 1.8.6
Release: 1%{?dist} Release: 1%{?dist}
Summary: RPM macros for building Haskell packages for GHC Summary: RPM macros for building Haskell packages for GHC
@ -162,6 +162,9 @@ EOF
%changelog %changelog
* Mon Jan 29 2018 Jens Petersen <petersen@redhat.com> - 1.8.6-1
- cabal-tweak-drop-dep: quote grep pattern to allow whitespace
* Sun Jan 28 2018 Jens Petersen <petersen@redhat.com> - 1.8.5-1 * Sun Jan 28 2018 Jens Petersen <petersen@redhat.com> - 1.8.5-1
- re-enable _ghcdynlibdir (for ghc-8.2) - re-enable _ghcdynlibdir (for ghc-8.2)