Resolves: rhbz#1316359 grep 2.23 broke the build

This commit is contained in:
Michael Stahl 2016-04-01 18:48:28 +02:00
parent 48718f698e
commit aafbb14222
2 changed files with 33 additions and 2 deletions

25
grep-locale.patch Normal file
View File

@ -0,0 +1,25 @@
--- igerman98-20151222/bin/hunspell-capmain.orig 2016-04-01 17:36:32.497611769 +0200
+++ igerman98-20151222/bin/hunspell-capmain 2016-04-01 17:36:37.473620960 +0200
@@ -1,7 +1,7 @@
#!/bin/sh
-LC_ALL=C
+LC_ALL=en_US.iso885915
# try setting LANG=de_DE and see how much glibc sucks here...
-LANG=C
+LANG=en_US.iso885915
set -x
INFILE=$1
--- igerman98-20151222/Makefile.orig 2016-04-01 18:07:44.910063554 +0200
+++ igerman98-20151222/Makefile 2016-04-01 18:08:22.191131148 +0200
@@ -116,8 +116,8 @@
# (like for de_DE) would be used, we don't need that anyway. See
# http://mail.nl.linux.org/linux-utf8/2003-11/msg00041.html
-LANG=C
-LC_ALL=C
+LANG=en_US.iso885915
+LC_ALL=en_US.iso885915
LC_COLLATE=C

View File

@ -2,7 +2,7 @@ Name: hunspell-de
Summary: German hunspell dictionaries
%global upstreamid 20151222
Version: 0.%{upstreamid}
Release: 3%{?dist}
Release: 4%{?dist}
Source: http://www.j3e.de/ispell/igerman98/dict/igerman98-%{upstreamid}.tar.bz2
URL: http://www.j3e.de/ispell/igerman98
License: GPLv2 or GPLv3
@ -12,15 +12,18 @@ BuildRequires: aspell, hunspell
Requires: hunspell
Supplements: (hunspell and langpacks-de)
Patch0: grep-locale.patch
%description
German (Germany, Switzerland, etc.) hunspell dictionaries.
%prep
%setup -q -n igerman98-%{upstreamid}
%patch0 -p1
sed -i -e "s/AFFIX_EXPANDER = ispell/AFFIX_EXPANDER = aspell/g" Makefile
%build
LC_ALL=en_US.iso885915 make hunspell/de_AT.dic hunspell/de_AT.aff \
make hunspell/de_AT.dic hunspell/de_AT.aff \
hunspell/de_CH.dic hunspell/de_CH.aff \
hunspell/de_DE.dic hunspell/de_DE.aff
cd hunspell
@ -59,6 +62,9 @@ popd
%{_datadir}/myspell/*
%changelog
* Fri Apr 01 2016 Michael Stahl <mstahl@redhat.com> - 0.20151222-4
- Resolves: rhbz#1316359 grep 2.23 broke the build
* Fri Feb 19 2016 Parag Nemade <pnemade AT redhat DOT com> - 0.20151222-3
- Add Supplements: tag for langpacks naming guidelines
- Clean the specfile to follow current packaging guidelines