- updated to 1.2.1

- removed obsolete DESTDIR,apertium32 patches

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

diff --git a/apertium-dict-es-ca-DESTDIR.patch b/apertium-dict-es-ca-DESTDIR.patch
deleted file mode 100644 (file)
index 6549a8a..0000000
--- a/apertium-dict-es-ca-DESTDIR.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- apertium-es-ca-1.2.0/Makefile.am.orig      2009-10-15 12:51:50.000000000 +0200
-+++ apertium-es-ca-1.2.0/Makefile.am   2010-12-15 20:29:27.578120259 +0100
-@@ -229,14 +229,14 @@
- install-data-local:
-       apertium-gen-modes modes.xml apertium-$(PREFIX1)
-       cp *.mode modes/
--      $(INSTALL_DATA) $(PREFVAR1)$(PREFIX1).mode $(apertium_es_modesdir)
--      $(INSTALL_DATA) $(PREFVAR1)$(PREFIX2).mode $(apertium_es_modesdir)
--      $(INSTALL_DATA) $(PREFVAR2)$(PREFIX1).mode $(apertium_es_modesdir)
--      $(INSTALL_DATA) $(PREFVAR2)$(PREFIX2).mode $(apertium_es_modesdir)
--      $(INSTALL_DATA) es-ca_valencia.mode $(apertium_es_modesdir)     
--      $(INSTALL_DATA) $(PREFVAR1)$(PREFIX1)-multi.mode $(apertium_es_modesdir)
--      $(INSTALL_DATA) $(PREFVAR1)$(PREFIX2)-multi.mode $(apertium_es_modesdir)
--      $(INSTALL_DATA) $(BASENAME).trules-$(PREFIX2).xml $(BASENAME).trules-$(PREFIX1).xml $(apertium_es_cadir)
-+      $(INSTALL_DATA) $(PREFVAR1)$(PREFIX1).mode $(DESTDIR)$(apertium_es_modesdir)
-+      $(INSTALL_DATA) $(PREFVAR1)$(PREFIX2).mode $(DESTDIR)$(apertium_es_modesdir)
-+      $(INSTALL_DATA) $(PREFVAR2)$(PREFIX1).mode $(DESTDIR)$(apertium_es_modesdir)
-+      $(INSTALL_DATA) $(PREFVAR2)$(PREFIX2).mode $(DESTDIR)$(apertium_es_modesdir)
-+      $(INSTALL_DATA) es-ca_valencia.mode $(DESTDIR)$(apertium_es_modesdir)   
-+      $(INSTALL_DATA) $(PREFVAR1)$(PREFIX1)-multi.mode $(DESTDIR)$(apertium_es_modesdir)
-+      $(INSTALL_DATA) $(PREFVAR1)$(PREFIX2)-multi.mode $(DESTDIR)$(apertium_es_modesdir)
-+      $(INSTALL_DATA) $(BASENAME).trules-$(PREFIX2).xml $(BASENAME).trules-$(PREFIX1).xml $(DESTDIR)$(apertium_es_cadir)
- 
- CLEANFILES = -rf $(TARGETS) modes $(PREFVAR2)$(PREFIX1).automorf.bin $(PREFVAR2)$(PREFIX1).autobil.bin \
-               $(PREFVAR2)$(PREFIX2).automorf.bin $(PREFVAR2)$(PREFIX2).autobil.bin \

diff --git a/apertium-dict-es-ca-apertium32.patch b/apertium-dict-es-ca-apertium32.patch
deleted file mode 100644 (file)
index 276848b..0000000
--- a/apertium-dict-es-ca-apertium32.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- apertium-es-ca-1.2.0/configure.ac.orig     2009-10-15 11:36:01.000000000 +0200
-+++ apertium-es-ca-1.2.0/configure.ac  2010-12-15 19:17:18.554114393 +0100
-@@ -27,8 +27,14 @@
-               APERTIUM_VER=30
-           ],
-           [
--              PKG_CHECK_MODULES(APERTIUM, apertium-3.1 >= 3.1.0)
-+              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
-+            ])
-           ])
-       ])
-   ])

diff --git a/apertium-dict-es-ca.spec b/apertium-dict-es-ca.spec
index c1f9fe3848afcc9df4391109ec88ffcdcf0fe7ff..59047e053544143f8e0c81a9f6bef79e85fda409 100644 (file)
--- a/apertium-dict-es-ca.spec
+++ b/apertium-dict-es-ca.spec
@@ -2,14 +2,12 @@ Summary:      Spanish-Catalan language pair for Apertium
 Summary(pl.UTF-8):     Para języków hiszpański-kataloński dla Apertium
 %define        lpair   es-ca
 Name:          apertium-dict-%{lpair}
-Version:       1.2.0
+Version:       1.2.1
 Release:       1
 License:       GPL v2+
 Group:         Applications/Text
 Source0:       http://downloads.sourceforge.net/apertium/apertium-%{lpair}-%{version}.tar.gz
-# Source0-md5: 0cc9676a152947adf703ec81b67654bf
-Patch0:                %{name}-DESTDIR.patch
-Patch1:                %{name}-apertium32.patch
+# Source0-md5: 31f0195404dc84c7ea4002522f25d569
 URL:           http://www.apertium.org/
 BuildRequires: apertium-devel >= 3.2.0
 BuildRequires: autoconf >= 2.52
@@ -32,8 +30,6 @@ oznaczania części mowy w obu językach.
 
 %prep
 %setup -q -n apertium-%{lpair}-%{version}
-%patch0 -p1
-%patch1 -p1
 
 %build
 %{__aclocal}