- updated to 1.1.0

- updated DESTDIR patch
- removed obsolete apertium32 patch

Changed files:
    apertium-dict-es-pt-DESTDIR.patch -> 1.2
    apertium-dict-es-pt-apertium32.patch -> 1.2
    apertium-dict-es-pt.spec -> 1.2

diff --git a/apertium-dict-es-pt-DESTDIR.patch b/apertium-dict-es-pt-DESTDIR.patch
index be75169ff5d21905709b89fb5a597701a643951a..d5114274f8a16d7b6a96d30bbe2141f9f52445a4 100644 (file)
--- a/apertium-dict-es-pt-DESTDIR.patch
+++ b/apertium-dict-es-pt-DESTDIR.patch
@@ -1,17 +1,22 @@
---- apertium-es-pt-1.0.3/Makefile.am.orig      2007-10-02 10:38:51.000000000 +0200
-+++ apertium-es-pt-1.0.3/Makefile.am   2011-01-02 16:14:23.185906558 +0100
-@@ -128,10 +128,10 @@
+--- apertium-es-pt-1.1.0/Makefile.am.orig      2011-06-10 14:34:50.000000000 +0200
++++ apertium-es-pt-1.1.0/Makefile.am   2011-09-21 17:12:13.150058167 +0200
+@@ -128,14 +128,14 @@
+       $(PREFIX1).prob $(PREFIX2).prob \
+       $(PREFIX2).t1x $(PREFIX1).t1x \
+       $(PREFIX1b).t1x $(PREFIX1b).t1x.bin \
+-      $(PREFIX2).t1x.bin $(PREFIX1).t1x.bin $(PREFIX1).mode $(PREFIX2).mode $(PREFIX1b).mode
++      $(PREFIX2).t1x.bin $(PREFIX1).t1x.bin
  
  install-data-local:
-       $(prefix)/bin/apertium-gen-modes modes.xml apertium-$(PREFIX1)
+       apertium-gen-modes modes.xml apertium-$(PREFIX1)
 -      $(INSTALL_DATA) $(PREFIX1).mode $(apertium_es_modesdir)
 -      $(INSTALL_DATA) $(PREFIX1b).mode $(apertium_es_modesdir)
 -      $(INSTALL_DATA) $(PREFIX2).mode $(apertium_es_modesdir)
--      $(INSTALL_DATA) $(BASENAME).trules-$(PREFIX2).xml $(BASENAME).trules-$(PREFIX1).xml trules-$(PREFIX1b).xml $(apertium_es_ptdir)
+-      $(INSTALL_DATA) $(BASENAME).$(PREFIX2).t1x $(BASENAME).$(PREFIX1).t1x $(PREFIX1b).t1x $(apertium_es_ptdir)
 +      $(INSTALL_DATA) $(PREFIX1).mode $(DESTDIR)$(apertium_es_modesdir)
 +      $(INSTALL_DATA) $(PREFIX1b).mode $(DESTDIR)$(apertium_es_modesdir)
 +      $(INSTALL_DATA) $(PREFIX2).mode $(DESTDIR)$(apertium_es_modesdir)
-+      $(INSTALL_DATA) $(BASENAME).trules-$(PREFIX2).xml $(BASENAME).trules-$(PREFIX1).xml trules-$(PREFIX1b).xml $(DESTDIR)$(apertium_es_ptdir)
++      $(INSTALL_DATA) $(BASENAME).$(PREFIX2).t1x $(BASENAME).$(PREFIX1).t1x $(PREFIX1b).t1x $(DESTDIR)$(apertium_es_ptdir)
  
  
  CLEANFILES = -rf $(TARGETS) pt.dix pt_BR.dix es-pt.dix es-pt_BR.dix  modes

diff --git a/apertium-dict-es-pt-apertium32.patch b/apertium-dict-es-pt-apertium32.patch
deleted file mode 100644 (file)
index f81f602..0000000
--- a/apertium-dict-es-pt-apertium32.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- apertium-es-pt-1.0.3/configure.ac.orig     2007-10-02 12:39:06.000000000 +0200
-+++ apertium-es-pt-1.0.3/configure.ac  2011-01-02 16:12:01.093898177 +0100
-@@ -10,9 +10,12 @@
- AC_PROG_AWK
- AC_CONFIG_HEADER([config])
- 
--PKG_CHECK_MODULES(APERTIUM, apertium-3.0 >= 3.0.0)
--
--APERTIUM_VER=30
-+PKG_CHECK_MODULES(APERTIUM, apertium-3.0 >= 3.0.0,[APERTIUM_VER=30],
-+      [PKG_CHECK_MODULES(APERTIUM, apertium-3.1 >= 3.1.0,[APERTIUM_VER=31],
-+              [
-+               PKG_CHECK_MODULES(APERTIUM, apertium-3.2 >= 3.2.0)
-+               APERTIUM_VER=32
-+              ])])
- 
- AC_SUBST(APERTIUM_VER)
- 

diff --git a/apertium-dict-es-pt.spec b/apertium-dict-es-pt.spec
index f4b4b1ab4767fc81eab67392fa05b13e5b93d530..9e5b68c529712852b9954d1988c1530b2c5f1da0 100644 (file)
--- a/apertium-dict-es-pt.spec
+++ b/apertium-dict-es-pt.spec
@@ -2,14 +2,13 @@ Summary:      Spanish-Portuguese language pair for Apertium
 Summary(pl.UTF-8):     Para języków hiszpański-portugalski dla Apertium
 %define        lpair   es-pt
 Name:          apertium-dict-%{lpair}
-Version:       1.0.3
+Version:       1.1.0
 Release:       1
 License:       GPL v2+
 Group:         Applications/Text
 Source0:       http://downloads.sourceforge.net/apertium/apertium-%{lpair}-%{version}.tar.gz
-# Source0-md5: 0549493582ed682c6369b6a3ab3f09b5
+# Source0-md5: 10a20c2b9737f89fbb0d878d790a4dda
 Patch0:                %{name}-DESTDIR.patch
-Patch1:                %{name}-apertium32.patch
 URL:           http://www.apertium.org/
 BuildRequires: apertium-devel >= 3.2.0
 BuildRequires: autoconf >= 2.52
@@ -33,7 +32,6 @@ oznaczania części mowy w obu językach.
 %prep
 %setup -q -n apertium-%{lpair}-%{version}
 %patch0 -p1
-%patch1 -p1
 
 %build
 %{__aclocal}
@@ -51,9 +49,6 @@ install -d $RPM_BUILD_ROOT%{_datadir}/apertium/modes
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-# not needed here (see modes subdir) and contain wrong (builddir) paths
-%{__rm} $RPM_BUILD_ROOT%{_datadir}/apertium/apertium-%{lpair}/*.mode
-
 %clean
 rm -rf $RPM_BUILD_ROOT