From 53aa2419e80ace6937b198307483418d2aeafe149a47d20ca2ae34bf99292679 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 25 Jul 2008 14:47:10 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/aspell?expand=0&rev=8 --- aspell-0.60.5.tar.bz2 | 3 -- aspell-0.60.6.tar.bz2 | 3 ++ aspell-duplicate_name.patch | 13 ------ aspell-gcc4_3.patch | 80 ------------------------------------- aspell.changes | 7 ++++ aspell.spec | 26 +++++++----- 6 files changed, 26 insertions(+), 106 deletions(-) delete mode 100644 aspell-0.60.5.tar.bz2 create mode 100644 aspell-0.60.6.tar.bz2 delete mode 100644 aspell-duplicate_name.patch delete mode 100644 aspell-gcc4_3.patch diff --git a/aspell-0.60.5.tar.bz2 b/aspell-0.60.5.tar.bz2 deleted file mode 100644 index a4a068d..0000000 --- a/aspell-0.60.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:be46c7b2b5e97d7f8fa55aaec08c53b844a7bd146fb07bddcdd0b2e18881e737 -size 1139037 diff --git a/aspell-0.60.6.tar.bz2 b/aspell-0.60.6.tar.bz2 new file mode 100644 index 0000000..8d9454a --- /dev/null +++ b/aspell-0.60.6.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a2629ad31dfb7944e8df46ef7c99edfded815838a42df6206eca23e61b8505de +size 1194066 diff --git a/aspell-duplicate_name.patch b/aspell-duplicate_name.patch deleted file mode 100644 index 62820e8..0000000 --- a/aspell-duplicate_name.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: aspell-0.60.4/modules/speller/default/affix.hpp -=================================================================== ---- modules/speller/default/affix.hpp.orig -+++ modules/speller/default/affix.hpp -@@ -107,7 +107,7 @@ namespace aspeller { - { - return expand(word,aff,buf,0); - } -- WordAff * expand_suffix(ParmString word, const unsigned char * new_aff, -+ WordAff * expand_suffix(ParmString word, const unsigned char * aff, - ObjStack &, int limit = INT_MAX, - unsigned char * new_aff = 0, WordAff * * * l = 0, - ParmString orig_word = 0) const; diff --git a/aspell-gcc4_3.patch b/aspell-gcc4_3.patch deleted file mode 100644 index 3a11646..0000000 --- a/aspell-gcc4_3.patch +++ /dev/null @@ -1,80 +0,0 @@ ---- common/string.hpp -+++ common/string.hpp -@@ -492,7 +492,7 @@ - - namespace std - { -- template<> static inline void swap(acommon::String & x, acommon::String & y) {return x.swap(y);} -+ template<> inline void swap(acommon::String & x, acommon::String & y) {return x.swap(y);} - } - - #endif ---- common/string_map.cpp -+++ common/string_map.cpp -@@ -37,7 +37,12 @@ - i->second = buffer_.dup(i->second); - } - } -- -+ -+ // this requires hash-t.hpp -+ PosibErr StringMap::remove(ParmStr key) -+ { -+ return lookup_.erase(key); -+ } - - class StringMapEnumeration : public StringPairEnumeration { - StringMap::CIter_ i; ---- common/string_map.hpp -+++ common/string_map.hpp -@@ -96,7 +96,7 @@ - } - - // removes an element. Returns true if the element existed. -- PosibErr remove(ParmStr key) {return lookup_.erase(key);} -+ PosibErr remove(ParmStr key); - - // looks up an element. Returns null if the element did not exist. - // returns an empty string if the element exists but has a null value ---- modules/speller/default/affix.cpp -+++ modules/speller/default/affix.cpp -@@ -193,7 +193,7 @@ - typedef const Conds * Value; - typedef const char * Key; - static const bool is_multi = false; -- hash hfun; -+ acommon::hash hfun; - size_t hash(const char * s) {return hfun(s);} - bool equal(const char * x, const char * y) {return strcmp(x,y) == 0;} - const char * key(const Conds * c) {return c->str;} ---- modules/speller/default/readonly_ws.cpp -+++ modules/speller/default/readonly_ws.cpp -@@ -726,7 +726,7 @@ - struct WordLookupParms { - const char * block_begin; - WordLookupParms() {} -- typedef Vector Vector; -+ typedef acommon::Vector Vector; - typedef u32int Value; - typedef const char * Key; - static const bool is_multi = false; ---- prog/aspell.cpp -+++ prog/aspell.cpp -@@ -1882,7 +1882,7 @@ - typedef SML_WordEntry Value; - typedef const char * Key; - static const bool is_multi = false; -- hash hash; -+ acommon::hash hash; - bool equal(Key x, Key y) {return strcmp(x,y) == 0;} - Key key(const Value & v) {return v.word;} - }; -@@ -2033,7 +2033,7 @@ - typedef CML_Entry Value; - typedef const char * Key; - static const bool is_multi = true; -- hash hash; -+ acommon::hash hash; - bool equal(Key x, Key y) {return strcmp(x,y) == 0;} - Key key(const Value & v) {return v.word;} - }; diff --git a/aspell.changes b/aspell.changes index 4fc97ba..e228433 100644 --- a/aspell.changes +++ b/aspell.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Jul 25 10:37:20 CEST 2008 - lmichnovic@suse.cz + +- update to version 0.60.6 + * bugfix release +- obsoletes *duplicate_name.patch, *gcc4_3.patch + ------------------------------------------------------------------- Thu Apr 10 12:54:45 CEST 2008 - ro@suse.de diff --git a/aspell.spec b/aspell.spec index 55dab28..5c4086a 100644 --- a/aspell.spec +++ b/aspell.spec @@ -1,5 +1,5 @@ # -# spec file for package aspell (Version 0.60.5) +# spec file for package aspell (Version 0.60.6) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -20,16 +20,16 @@ Recommends: aspell-en Obsoletes: pspell PreReq: %install_info_prereq AutoReqProv: on -Version: 0.60.5 -Release: 76 +Version: 0.60.6 +Release: 1 Summary: A Free and Open Source Spell Checker Url: http://aspell.net/ Source: aspell-%{version}.tar.bz2 Patch1: aspell-strict-aliasing.patch -Patch2: aspell-duplicate_name.patch +#Patch2: aspell-duplicate_name.patch Patch3: aspell-quotes.patch Patch4: aspell-epmty_file.patch -Patch5: aspell-gcc4_3.patch +#Patch5: aspell-gcc4_3.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -63,17 +63,16 @@ to develop applications that require these. %prep %setup -q %patch1 -%patch2 %patch3 %patch4 -%patch5 %build -%{suse_update_config} -rm aclocal.m4 -rm -f missing # Get newest from automake +#%{suse_update_config} +#rm aclocal.m4 +#rm -f missing # Get newest from automake gettextize -f autoreconf -fi +libtoolize -f CFLAGS="$RPM_OPT_FLAGS" \ CXXFLAGS="$RPM_OPT_FLAGS" \ ./configure --prefix=%{_prefix} \ @@ -85,6 +84,9 @@ CXXFLAGS="$RPM_OPT_FLAGS" \ # dictionary files depend on endian, needs fix, then posible # --enable-pkgdatadir=%{_prefix}/share/aspell-0.60 \ # --enable-dict-dir=%{_prefix}/share/aspell-0.60 \ +# +# hack for non expanded $echo +sed -i 's/\$echo/echo/g' libtool make %{?jobs:-j%jobs} %install @@ -144,6 +146,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libpspell.so %changelog +* Fri Jul 25 2008 lmichnovic@suse.cz +- update to version 0.60.6 + * bugfix release +- obsoletes *duplicate_name.patch, *gcc4_3.patch * Thu Apr 10 2008 ro@suse.de - added baselibs.conf file to build xxbit packages for multilib support