[packages/apertium-dict-es-ro] - updated to 0.7.3 - updated apertium32 patch (now it adds apertium 3.3+ support) - removed obsolete
qboosh
qboosh at pld-linux.org
Tue Dec 29 17:38:32 CET 2015
commit d5fd520e79de71988b9eaa3769b9a38dac9e73c1
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Tue Dec 29 17:40:16 2015 +0100
- updated to 0.7.3
- updated apertium32 patch (now it adds apertium 3.3+ support)
- removed obsolete DESTDIR,fix,install patches
apertium-dict-es-ro-DESTDIR.patch | 14 ----------
apertium-dict-es-ro-apertium32.patch | 29 +++++++++++--------
apertium-dict-es-ro-fix.patch | 54 ------------------------------------
apertium-dict-es-ro-install.patch | 11 --------
apertium-dict-es-ro.spec | 15 ++--------
5 files changed, 20 insertions(+), 103 deletions(-)
---
diff --git a/apertium-dict-es-ro.spec b/apertium-dict-es-ro.spec
index a40c61f..ef992bd 100644
--- a/apertium-dict-es-ro.spec
+++ b/apertium-dict-es-ro.spec
@@ -2,16 +2,13 @@ Summary: Spanish-Romanian language pair for Apertium
Summary(pl.UTF-8): Para języków hiszpański-rumuński dla Apertium
%define lpair es-ro
Name: apertium-dict-%{lpair}
-Version: 0.7.1
+Version: 0.7.3
Release: 1
License: GPL v3
Group: Applications/Text
Source0: http://downloads.sourceforge.net/apertium/apertium-%{lpair}-%{version}.tar.gz
-# Source0-md5: 9de6e21ddf8dfb65a6b09b430e8ab600
-Patch0: %{name}-DESTDIR.patch
-Patch1: %{name}-apertium32.patch
-Patch2: %{name}-fix.patch
-Patch3: %{name}-install.patch
+# Source0-md5: f3897699ee1875b1517d2871370b3b49
+Patch0: %{name}-apertium32.patch
URL: http://www.apertium.org/
BuildRequires: apertium-devel >= 3.2.0
BuildRequires: autoconf >= 2.52
@@ -35,9 +32,6 @@ oznaczania części mowy w obu językach.
%prep
%setup -q -n apertium-%{lpair}-%{version}
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
%build
%{__aclocal}
@@ -55,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
diff --git a/apertium-dict-es-ro-DESTDIR.patch b/apertium-dict-es-ro-DESTDIR.patch
deleted file mode 100644
index ab351d6..0000000
--- a/apertium-dict-es-ro-DESTDIR.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- apertium-es-ro-0.7.1/Makefile.am.orig 2007-10-11 21:06:30.000000000 +0200
-+++ apertium-es-ro-0.7.1/Makefile.am 2011-01-02 12:27:14.809901529 +0100
-@@ -91,8 +91,8 @@
- install-data-local:
- apertium-gen-modes modes.xml apertium-$(PREFIX1)
- # spanish -> romanian is not currently functional ~fmt
--# $(INSTALL_DATA) $(PREFIX1).mode $(apertium_es_modesdir)
-- $(INSTALL_DATA) $(PREFIX2).mode $(apertium_es_modesdir)
-- $(INSTALL_DATA) $(BASENAME).trules-$(PREFIX2).xml $(BASENAME).trules-$(PREFIX1).xml $(apertium_es_rodir)
-+# $(INSTALL_DATA) $(PREFIX1).mode $(DESTDIR)$(apertium_es_modesdir)
-+ $(INSTALL_DATA) $(PREFIX2).mode $(DESTDIR)$(apertium_es_modesdir)
-+ $(INSTALL_DATA) $(BASENAME).trules-$(PREFIX2).xml $(BASENAME).trules-$(PREFIX1).xml $(DESTDIR)$(apertium_es_rodir)
-
- CLEANFILES = -rf $(TARGETS) modes
diff --git a/apertium-dict-es-ro-apertium32.patch b/apertium-dict-es-ro-apertium32.patch
index 2e91e5d..85ed027 100644
--- a/apertium-dict-es-ro-apertium32.patch
+++ b/apertium-dict-es-ro-apertium32.patch
@@ -1,12 +1,17 @@
---- apertium-es-ro-0.7.1/configure.ac.orig 2007-10-11 21:06:44.000000000 +0200
-+++ apertium-es-ro-0.7.1/configure.ac 2011-01-02 11:19:51.217906558 +0100
-@@ -13,6 +13,8 @@
- AC_CONFIG_HEADER([config])
-
- PKG_CHECK_MODULES(apertium, [dnl
-- apertium-3.0 >= required_apertium_version])
-+ apertium-3.0 >= required_apertium_version],,
-+ [PKG_CHECK_MODULES(apertium, [apertium-3.1 >= 3.1.0],,
-+ [PKG_CHECK_MODULES(apertium, [apertium-3.2 >= 3.2.0])])])
-
- AC_OUTPUT([Makefile])
+--- apertium-es-ro-0.7.3/configure.ac.orig 2015-12-29 16:58:02.972654803 +0100
++++ apertium-es-ro-0.7.3/configure.ac 2015-12-29 17:16:25.705941861 +0100
+@@ -32,8 +32,13 @@
+ APERTIUM_VER=31
+ ],
+ [
+- PKG_CHECK_MODULES(APERTIUM, apertium-3.2 >= 3.2.0)
++ PKG_CHECK_MODULES(APERTIUM, apertium-3.2 >= 3.2.0,
++ [
+ APERTIUM_VER=32
++ ],
++ [PKG_CHECK_MODULES(APERTUM, apertium >= 3.3.0)
++ APERTIUM_VER=3
++ ])
+ ])
+ ])
+ ])
diff --git a/apertium-dict-es-ro-fix.patch b/apertium-dict-es-ro-fix.patch
deleted file mode 100644
index 52bed12..0000000
--- a/apertium-dict-es-ro-fix.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- apertium-es-ro-0.7.1/apertium-es-ro.trules-ro-es.xml.orig 2007-10-11 21:04:49.000000000 +0200
-+++ apertium-es-ro-0.7.1/apertium-es-ro.trules-ro-es.xml 2011-01-02 14:57:38.409901529 +0100
-@@ -4545,8 +4545,6 @@
- <clip pos="3" side="sl" part="a_case"/>
- <lit-tag v="nom"/>
- </equal>
-- </and>
-- <and>
- <equal>
- <clip pos="4" side="sl" part="a_def"/>
- <lit-tag v="def"/>
-@@ -4676,8 +4674,6 @@
- <clip pos="2" side="sl" part="a_case"/>
- <lit-tag v="nom"/>
- </equal>
-- </and>
-- <and>
- <equal>
- <clip pos="3" side="sl" part="a_def"/>
- <lit-tag v="def"/>
-@@ -4984,8 +4980,6 @@
- <clip pos="2" side="sl" part="a_case"/>
- <lit-tag v="nom"/>
- </equal>
-- </and>
-- <and>
- <equal>
- <clip pos="3" side="sl" part="a_def"/>
- <lit-tag v="def"/>
-@@ -5115,8 +5109,6 @@
- <clip pos="2" side="sl" part="a_case"/>
- <lit-tag v="nom"/>
- </equal>
-- </and>
-- <and>
- <equal>
- <clip pos="3" side="sl" part="a_def"/>
- <lit-tag v="def"/>
-@@ -5758,6 +5750,7 @@
- <choose>
- <when>
- <test>
-+ <and>
- <equal>
- <clip pos="1" side="sl" part="a_case"/>
- <lit-tag v="nom"/>
-@@ -5766,6 +5759,7 @@
- <clip pos="1" side="sl" part="a_def"/>
- <lit-tag v="def"/>
- </equal>
-+ </and>
- </test>
- <call-macro n="modcase">
- <with-param pos="1"/>
diff --git a/apertium-dict-es-ro-install.patch b/apertium-dict-es-ro-install.patch
deleted file mode 100644
index 41b5391..0000000
--- a/apertium-dict-es-ro-install.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- apertium-es-ro-0.7.1/Makefile.am.orig 2011-01-02 14:58:35.629905720 +0100
-+++ apertium-es-ro-0.7.1/Makefile.am 2011-01-02 15:10:59.653898177 +0100
-@@ -86,7 +86,7 @@
- $(PREFIX1).autopgen.bin $(PREFIX2).autopgen.bin \
- $(PREFIX1).prob $(PREFIX2).prob trules-$(PREFIX1).xml \
- trules-$(PREFIX2).xml trules-$(PREFIX1).bin \
-- trules-$(PREFIX2).bin $(PREFIX1).mode $(PREFIX2).mode
-+ trules-$(PREFIX2).bin $(PREFIX2).mode
-
- install-data-local:
- apertium-gen-modes modes.xml apertium-$(PREFIX1)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/apertium-dict-es-ro.git/commitdiff/d5fd520e79de71988b9eaa3769b9a38dac9e73c1
More information about the pld-cvs-commit
mailing list