- updated to 3.4.2

- removed obsolete opt patch

diff --git a/apertium-opt.patch b/apertium-opt.patch
deleted file mode 100644 (file)
index 6e11b9a..0000000
--- a/apertium-opt.patch
+++ /dev/null
@@ -1,71 +0,0 @@
---- apertium-3.4.0/configure.ac.orig   2015-12-25 10:31:10.304799071 +0100
-+++ apertium-3.4.0/configure.ac        2015-12-25 10:33:43.264792644 +0100
-@@ -54,68 +54,6 @@
- 
- # Checks for programs.
- 
--AC_MSG_CHECKING([Compilation architecture: PPC, i686, x86_64, Other])
--if test x$(which arch) = x
--then ARCH=$($(which uname) -m)
--else ARCH=$($(which arch))
--fi
--
--case "${target_os}" in
--  mingw*)
--    MinGW=yes
--  ;;
--  cygwin*)
--    Cygwin=yes
--  ;;
--esac
--
--if test x$ARCH = xppc
--then
--  AC_MSG_RESULT([PowerPC])
--  CFLAGS="$CFLAGS -Wall -ansi -fomit-frame-pointer"
--  CXXFLAGS="$CXXFLAGS -Wall -ansi -fomit-frame-pointer"
--else
--  if test x$MinGW = xyes
--  then
--    AC_MSG_RESULT([MinGW])
--    CFLAGS="$CFLAGS -Wall -march=i686 -O3 -DMINGW -fomit-frame-pointer \
--              -funroll-loops -I/include -L/lib"
--    CXXFLAGS="$CXXFLAGS -Wall -march=i686 -O3 \
--            -fomit-frame-pointer -funroll-loops -I/include -L/lib"
--    CPPFLAGS="$CPPFLAGS -I/include"
--  else
--    if test x$Cygwin = xyes
--    then
--      AC_MSG_RESULT([Cygwin])
--      CFLAGS="$CFLAGS -Wall -march=i686 -O3 -fomit-frame-pointer \
--           -funroll-loops"
--      CXXFLAGS="$CXXFLAGS -Wall -march=i686 -O3 \
--              -fomit-frame-pointer -funroll-loops"
--      CPPFLAGS="$CPPFLAGS"
--    else
--      if test x$ARCH = xi686
--      then
--        AC_MSG_RESULT([i686])
--        CFLAGS="$CFLAGS -Wall -ansi -march=i686 -O3 -fomit-frame-pointer -funroll-loops"
--        CXXFLAGS="$CXXFLAGS -Wall -ansi -march=i686 -O3 \
--                -fomit-frame-pointer -funroll-loops"
--      else
--        if test x$ARCH = xx86_64
--        then
--          AC_MSG_RESULT([x86_64])
--          CFLAGS="-Wall -ansi -O3 -mtune=nocona -fomit-frame-pointer -funroll-loops $CFLAGS"
--          CXXFLAGS="-Wall -ansi -O3 -mtune=nocona \
--                  -fomit-frame-pointer -funroll-loops $CXXFLAGS"
--        else
--          AC_MSG_RESULT([Other])
--          CFLAGS="-Wall -ansi -O3 $CFLAGS"
--          CXXFLAGS="-Wall -ansi -O3 $CXXFLAGS"
--        fi
--      fi
--    fi
--  fi
--fi
--
- AC_PROG_CXX
- AC_PROG_LIBTOOL
- AM_SANITY_CHECK

diff --git a/apertium.spec b/apertium.spec
index 6133713c669fbefb8309290618665865462edf9b..e4fbf6cf72558ec28a780b36adbc65b312745bd7 100644 (file)
--- a/apertium.spec
+++ b/apertium.spec
@@ -1,13 +1,12 @@
 Summary:       lttoolbox-based translation modules generator
 Summary(pl.UTF-8):     Oparty na pakiecie lttoolbox generator modułów tłumaczących
 Name:          apertium
-Version:       3.4.0
+Version:       3.4.2
 Release:       1
 License:       GPL v2+
 Group:         Applications/Text
 Source0:       http://downloads.sourceforge.net/apertium/%{name}-%{version}.tar.gz
-# Source0-md5: 5aa356d4840d6ffb1490a3b6639930bd
-Patch0:                %{name}-opt.patch
+# Source0-md5: c739b10e0a69c43e98590b1c064bcf89
 URL:           http://www.apertium.org/
 BuildRequires: autoconf >= 2.52
 BuildRequires: automake
@@ -18,12 +17,12 @@ BuildRequires:      libtool >= 2:1.5
 BuildRequires: libxml2-devel >= 1:2.6.17
 BuildRequires: libxml2-progs >= 1:2.6.17
 BuildRequires: libxslt-progs
-BuildRequires: lttoolbox-devel >= 3.3.1
+BuildRequires: lttoolbox-devel >= 3.3.3
 BuildRequires: pcre-cxx-devel >= 6.4
 BuildRequires: pkgconfig >= 1:0.15
 Requires:      libxml2 >= 1:2.6.17
 Requires:      libxslt-progs
-Requires:      lttoolbox >= 3.3.1
+Requires:      lttoolbox >= 3.3.3
 Requires:      pcre-cxx >= 6.4
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -42,7 +41,7 @@ Group:                Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 Requires:      libstdc++-devel
 Requires:      libxml2-devel >= 1:2.6.17
-Requires:      lttoolbox-devel >= 3.3.1
+Requires:      lttoolbox-devel >= 3.3.3
 Requires:      pcre-cxx-devel >= 6.4
 
 %description devel
@@ -65,7 +64,6 @@ Statyczna biblioteka apertium.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %{__libtoolize}