diff --git a/muparser-2.2.2.tar.bz2 b/muparser-2.2.2.tar.bz2 deleted file mode 100644 index 2637ebf..0000000 --- a/muparser-2.2.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:55e3f1bd167d48c0e86c26b413e0ebcc6cb5aa0c7dabc065d93a5590056f3e26 -size 1393987 diff --git a/muparser-2.2.3.tar.xz b/muparser-2.2.3.tar.xz new file mode 100644 index 0000000..76f31ca --- /dev/null +++ b/muparser-2.2.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5c19d9781324f7d5c2ac2905fb3b3f56338543d4d5f2a0c5dddd4631becc99e2 +size 755572 diff --git a/muparser.changes b/muparser.changes index 5aa319b..b671343 100644 --- a/muparser.changes +++ b/muparser.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Jan 25 04:15:00 UTC 2013 - jengelh@inai.de + +- Update to new upstream release 2.2.3 +* fixed issue 3509860: Callbacks of functions with string + parameters were called twice +- Remove muparser-fix-ac.diff, muparser-fix-undef.diff + (merged upstream) + ------------------------------------------------------------------- Thu Nov 29 19:03:48 UTC 2012 - jengelh@inai.de diff --git a/muparser.spec b/muparser.spec index 05cb8f8..1c16a24 100644 --- a/muparser.spec +++ b/muparser.spec @@ -1,7 +1,7 @@ # # spec file for package muparser # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,14 +21,13 @@ Name: muparser Summary: A math parser library License: MIT Group: Productivity/Scientific/Math -Version: 2.2.2 +Version: 2.2.3 Release: 0 Url: http://muparser.beltoforion.de/ +#DL-URL: http://downloads.sf.net/muparser/muparser_v2_2_3.zip # quilt does not like zips very much. downloaded and repackaged. -Source: %name-%version.tar.bz2 -Patch1: muparser-fix-ac.diff -Patch2: muparser-fix-undef.diff +Source: %name-%version.tar.xz Patch3: muparser-optflags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf @@ -36,6 +35,7 @@ BuildRequires: automake BuildRequires: gcc-c++ BuildRequires: libtool BuildRequires: pkgconfig +BuildRequires: xz %description muParser is an extensible high performance math parser library written in @@ -63,7 +63,7 @@ precalculating constant parts of the expression. %prep %setup -q -%patch -P 1 -P 2 -P 3 -p1 +%patch -P 3 -p1 %build sh build/autoconf/acregen.sh diff --git a/prepare-tar.sh b/prepare-tar.sh new file mode 100644 index 0000000..1ae3d3d --- /dev/null +++ b/prepare-tar.sh @@ -0,0 +1,12 @@ +#!/bin/sh -ex + +in="2_2_3"; +out="2.2.3"; +wget -c "http://downloads.sf.net/muparser/muparser_v$in.zip"; +unzip "muparser_v$in.zip"; +mv "muparser_v$in" "muparser-$out"; +find "muparser-$out" -type f "(" -iname "*.dll" -o -iname "*.lib" ")" \ + -print -delete; +tar --owner=root --group=root --use=xz -cf \ + "muparser-$out.tar.xz" "muparser-$out"; +rm -Rf "muparser-$out";