From 335310489e02809dd979f8e97c2c0ddc90ef524e Mon Sep 17 00:00:00 2001 From: Caolan McNamara Date: Thu, 30 Aug 2007 10:46:18 +0000 Subject: [PATCH] next version, build from source --- .cvsignore | 3 +-- hunspell-de.nobuildhash.patch | 11 +++++++++++ hunspell-de.spec | 35 +++++++++++++++++++++++------------ sources | 3 +-- 4 files changed, 36 insertions(+), 16 deletions(-) create mode 100644 hunspell-de.nobuildhash.patch diff --git a/.cvsignore b/.cvsignore index ec5dc53..2b77957 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -de_CH-20051213.zip -de_DE-20051213.zip +igerman98-20070829.tar.bz2 diff --git a/hunspell-de.nobuildhash.patch b/hunspell-de.nobuildhash.patch new file mode 100644 index 0000000..4370416 --- /dev/null +++ b/hunspell-de.nobuildhash.patch @@ -0,0 +1,11 @@ +--- igerman98-20070829/Makefile.orig 2007-08-30 10:56:38.000000000 +0100 ++++ igerman98-20070829/Makefile 2007-08-30 10:57:15.000000000 +0100 +@@ -61,7 +61,7 @@ + #ZIP_OPTS = -j -r -9 -X + ZIP = 7z + ZIP_OPTS = a -tzip -mx=9 +-BUILDHASH = buildhash ++BUILDHASH = true + + ISPELL = ispell + HUNSPELL_BIN = hunspell diff --git a/hunspell-de.spec b/hunspell-de.spec index 543976d..3d41fb6 100644 --- a/hunspell-de.spec +++ b/hunspell-de.spec @@ -1,15 +1,16 @@ Name: hunspell-de Summary: German hunspell dictionaries -%define upstreamid 20051213 +%define upstreamid 20070829 Version: 0.%{upstreamid} -Release: 2%{?dist} -Source0: http://j3e.de/hunspell/de_DE-%{upstreamid}.zip -Source1: http://j3e.de/hunspell/de_CH-%{upstreamid}.zip +Release: 1%{?dist} +Source: http://www.j3e.de/ispell/igerman98/dict/igerman98-%{upstreamid}.tar.bz2 Group: Applications/Text URL: http://j3e.de/hunspell/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: GPLv2 BuildArch: noarch +BuildRequires: /usr/bin/ispell +Patch1: hunspell-de.nobuildhash.patch Requires: hunspell @@ -17,20 +18,26 @@ Requires: hunspell German (Germany, Switzerland, etc.) hunspell dictionaries. %prep -%setup -q -c -n hunspell-de -unzip -q -o %{SOURCE1} +%setup -q -n igerman98-%{upstreamid} +%patch1 -p1 -b .nobuildhash.patch %build -tr -d '\r' < README_de_DE.txt > README_de_DE.txt.new +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 +tr -d '\r' < README_de_AT.txt > README_de_AT.txt.new tr -d '\r' < README_de_CH.txt > README_de_CH.txt.new -mv -f README_de_DE.txt.new README_de_DE.txt +tr -d '\r' < README_de_DE.txt > README_de_DE.txt.new +mv -f README_de_AT.txt.new README_de_AT.txt mv -f README_de_CH.txt.new README_de_CH.txt +mv -f README_de_DE.txt.new README_de_DE.txt %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell -chmod -x * -cp -p *.dic *.aff $RPM_BUILD_ROOT/%{_datadir}/myspell +cd hunspell +cp -p de_??.dic de_??.aff $RPM_BUILD_ROOT/%{_datadir}/myspell pushd $RPM_BUILD_ROOT/%{_datadir}/myspell/ de_DE_aliases="de_BE de_LU" @@ -50,11 +57,15 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc README_de_DE.txt README_de_CH.txt COPYING_OASIS COPYING +%doc hunspell/README_de_??.txt hunspell/COPYING_OASIS hunspell/COPYING hunspell/Copyright %{_datadir}/myspell/* %changelog -* Fri Aug 03 2006 Caolan McNamara - 0.20051213-2 +* Thu Aug 30 2007 Caolan McNamara - 0.20070829-1 +- latest version +- build from canonical source + +* Fri Aug 03 2007 Caolan McNamara - 0.20051213-2 - clarify license version * Thu Dec 07 2006 Caolan McNamara - 0.20051213-1 diff --git a/sources b/sources index b7583c4..ba05e71 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -4e0fbf25d39993d708ff1c250cda47e8 de_CH-20051213.zip -b6256f5abb2c5347b7fb15516902da04 de_DE-20051213.zip +d6056209d12ff2332938deb09617bc73 igerman98-20070829.tar.bz2