- updated to 3.4.0

- updated opt patch
- removed obsolete DESTDIR,pcre patches

diff --git a/apertium-DESTDIR.patch b/apertium-DESTDIR.patch
deleted file mode 100644 (file)
index a5423d6..0000000
--- a/apertium-DESTDIR.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- apertium-3.2.0/Makefile.am.orig    2010-02-28 18:24:47.000000000 +0100
-+++ apertium-3.2.0/Makefile.am 2010-11-28 08:46:21.531102452 +0100
-@@ -9,5 +9,4 @@
- EXTRA_DIST=autogen.sh README-MODES
- 
- install-data-local:
--      mkdir -p $(modesdir)
--      $(INSTALL_DATA) README-MODES  $(modesdir)/README
-+      mkdir -p $(DESTDIR)$(modesdir)

diff --git a/apertium-opt.patch b/apertium-opt.patch
index 90ad024494a70cce6fa333169091771b12edd050..6e11b9a05e50efb98bf4d25bd09e3f37795de7cc 100644 (file)
--- a/apertium-opt.patch
+++ b/apertium-opt.patch
@@ -1,5 +1,5 @@
---- apertium-3.2.0/configure.ac.orig   2010-03-14 16:14:34.000000000 +0100
-+++ apertium-3.2.0/configure.ac        2010-11-28 08:07:17.219099937 +0100
+--- 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.
@@ -26,7 +26,7 @@
 -  CXXFLAGS="$CXXFLAGS -Wall -ansi -fomit-frame-pointer"
 -else
 -  if test x$MinGW = xyes
--  then 
+-  then
 -    AC_MSG_RESULT([MinGW])
 -    CFLAGS="$CFLAGS -Wall -march=i686 -O3 -DMINGW -fomit-frame-pointer \
 -              -funroll-loops -I/include -L/lib"
@@ -35,7 +35,7 @@
 -    CPPFLAGS="$CPPFLAGS -I/include"
 -  else
 -    if test x$Cygwin = xyes
--    then 
+-    then
 -      AC_MSG_RESULT([Cygwin])
 -      CFLAGS="$CFLAGS -Wall -march=i686 -O3 -fomit-frame-pointer \
 -           -funroll-loops"
@@ -62,7 +62,7 @@
 -          CXXFLAGS="-Wall -ansi -O3 $CXXFLAGS"
 -        fi
 -      fi
--    fi    
+-    fi
 -  fi
 -fi
 -

diff --git a/apertium.spec b/apertium.spec
index 9ee5e7c0860c310c6505a1287460aeae97f1d2b8..6133713c669fbefb8309290618665865462edf9b 100644 (file)
--- a/apertium.spec
+++ b/apertium.spec
@@ -1,26 +1,29 @@
 Summary:       lttoolbox-based translation modules generator
 Summary(pl.UTF-8):     Oparty na pakiecie lttoolbox generator modułów tłumaczących
 Name:          apertium
-Version:       3.2.0
-Release:       5
+Version:       3.4.0
+Release:       1
 License:       GPL v2+
 Group:         Applications/Text
 Source0:       http://downloads.sourceforge.net/apertium/%{name}-%{version}.tar.gz
-# Source0-md5: 803562e5ea0a5cd9ccb5ea79cca0d76d
+# Source0-md5: 5aa356d4840d6ffb1490a3b6639930bd
 Patch0:                %{name}-opt.patch
-Patch1:                %{name}-DESTDIR.patch
-Patch2:                pcre.patch
 URL:           http://www.apertium.org/
 BuildRequires: autoconf >= 2.52
 BuildRequires: automake
+BuildRequires: bash
+BuildRequires: flex
 BuildRequires: libstdc++-devel
 BuildRequires: libtool >= 2:1.5
 BuildRequires: libxml2-devel >= 1:2.6.17
-BuildRequires: lttoolbox-devel >= 3.2.0
+BuildRequires: libxml2-progs >= 1:2.6.17
+BuildRequires: libxslt-progs
+BuildRequires: lttoolbox-devel >= 3.3.1
 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:      pcre-cxx >= 6.4
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -39,7 +42,7 @@ Group:                Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 Requires:      libstdc++-devel
 Requires:      libxml2-devel >= 1:2.6.17
-Requires:      apertium-devel >= 3.2.0
+Requires:      lttoolbox-devel >= 3.3.1
 Requires:      pcre-cxx-devel >= 6.4
 
 %description devel
@@ -63,8 +66,6 @@ Statyczna biblioteka apertium.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -93,8 +94,8 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS ChangeLog NEWS README README-MODES
 %attr(755,root,root) %{_bindir}/apertium
 %attr(755,root,root) %{_bindir}/apertium-*
-%attr(755,root,root) %{_libdir}/libapertium3-3.2.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libapertium3-3.2.so.0
+%attr(755,root,root) %{_libdir}/libapertium3-3.4.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libapertium3-3.4.so.0
 %{_datadir}/apertium
 %{_mandir}/man1/apertium.1*
 %{_mandir}/man1/apertium-*.1*
@@ -103,8 +104,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libapertium3.so
 %{_libdir}/libapertium3.la
-%{_includedir}/apertium-3.2
-%{_pkgconfigdir}/apertium-3.2.pc
+%{_includedir}/apertium-3.4
+%{_pkgconfigdir}/apertium.pc
+%{_aclocaldir}/apertium.m4
 
 %files static
 %defattr(644,root,root,755)

diff --git a/pcre.patch b/pcre.patch
deleted file mode 100644 (file)
index 9a345f8..0000000
--- a/pcre.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- apertium-3.2.0/configure.ac.wiget  2012-03-30 18:46:44.322626887 +0200
-+++ apertium-3.2.0/configure.ac        2012-03-30 18:47:01.332626607 +0200
-@@ -122,7 +122,7 @@ AC_CHECK_FUNCS(strcasecmp)
- if test x$(uname) != xDarwin;
- then 
- AC_CHECK_HEADER(pcreposix.h,
--  AC_CHECK_LIB(pcre, pcre_info,[
-+  AC_CHECK_LIB(pcre, pcre_fullinfo,[
-   LIBS="$LIBS -lpcreposix -lpcre"
-   no_comp_check=yes],
-   AC_MSG_ERROR([*** unable to locate pcre library ***])),