Accepting request 780929 from LibreOffice:Factory
- Update to version 0.9.18+git20200221.5e5521e bsc#1160265: * Ignore dylibs * Removed dependency on six * Bugfixes for Python * Added Python 3 port of foma2js.perl * Better py3 compatibility * Add test for apply_down(). * Get apply_up() working. * Add simple Python tests. * Port FST.encode() to use correct types for Python 3. * Add Python six 1.11.0 module. * Added TextWrangler codeless language modules. * add object files and many temp files to .gitignore * remove SVN_REV var in Makefile - Remove upstream merged patch: * foma-fix-sizeof.patch OBS-URL: https://build.opensuse.org/request/show/780929 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/foma?expand=0&rev=3
This commit is contained in:
commit
163cc96346
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:80855b348f534f9fb026b043d14e501d07b13c5edc1ea5ba52a1e9572c215fb4
|
|
||||||
size 136220
|
|
3
foma-0.9.18+git20200221.5e5521e.tar.xz
Normal file
3
foma-0.9.18+git20200221.5e5521e.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:98d8b28aedff8c2a842e343d1f6291786ad62bebdf33df95e7af7a1fef47763f
|
||||||
|
size 139180
|
@ -1,16 +0,0 @@
|
|||||||
https://bugzilla.opensuse.org/show_bug.cgi?id=1109949
|
|
||||||
https://github.com/mhulden/foma/pull/78
|
|
||||||
|
|
||||||
Index: foma-0.9.18+git20170507.07bb944/foma/rewrite.c
|
|
||||||
===================================================================
|
|
||||||
--- foma-0.9.18+git20170507.07bb944.orig/foma/rewrite.c
|
|
||||||
+++ foma-0.9.18+git20170507.07bb944/foma/rewrite.c
|
|
||||||
@@ -103,7 +103,7 @@ struct fsm *fsm_rewrite(struct rewrite_s
|
|
||||||
rb = xxcalloc(1, sizeof(struct rewrite_batch));
|
|
||||||
rb->rewrite_set = all_rules;
|
|
||||||
rb->num_rules = num_rules;
|
|
||||||
- rb->namestrings = xxmalloc(sizeof rb->namestrings * num_rules);
|
|
||||||
+ rb->namestrings = xxmalloc(sizeof *rb->namestrings * num_rules);
|
|
||||||
for (i = 0; i < rb->num_rules; i++) {
|
|
||||||
sprintf(rb->namestrings[i], "@#%04i@", i+1);
|
|
||||||
}
|
|
20
foma.changes
20
foma.changes
@ -1,3 +1,23 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Mar 02 12:07:36 UTC 2020 - tchvatal@suse.com
|
||||||
|
|
||||||
|
- Update to version 0.9.18+git20200221.5e5521e bsc#1160265:
|
||||||
|
* Ignore dylibs
|
||||||
|
* Removed dependency on six
|
||||||
|
* Bugfixes for Python
|
||||||
|
* Added Python 3 port of foma2js.perl
|
||||||
|
* Better py3 compatibility
|
||||||
|
* Add test for apply_down().
|
||||||
|
* Get apply_up() working.
|
||||||
|
* Add simple Python tests.
|
||||||
|
* Port FST.encode() to use correct types for Python 3.
|
||||||
|
* Add Python six 1.11.0 module.
|
||||||
|
* Added TextWrangler codeless language modules.
|
||||||
|
* add object files and many temp files to .gitignore
|
||||||
|
* remove SVN_REV var in Makefile
|
||||||
|
- Remove upstream merged patch:
|
||||||
|
* foma-fix-sizeof.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Sep 27 09:00:24 UTC 2018 - Bernhard Wiedemann <bwiedemann@suse.com>
|
Thu Sep 27 09:00:24 UTC 2018 - Bernhard Wiedemann <bwiedemann@suse.com>
|
||||||
|
|
||||||
|
13
foma.spec
13
foma.spec
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package foma
|
# spec file for package foma
|
||||||
#
|
#
|
||||||
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
|
# Copyright (c) 2020 SUSE LLC
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -18,16 +18,14 @@
|
|||||||
|
|
||||||
%define libname libfoma0
|
%define libname libfoma0
|
||||||
Name: foma
|
Name: foma
|
||||||
Version: 0.9.18+git20180511.bad2f09
|
Version: 0.9.18+git20200221.5e5521e
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Finite-state compiler and C library
|
Summary: Finite-state compiler and C library
|
||||||
License: Apache-2.0
|
License: Apache-2.0
|
||||||
Group: Productivity/Text/Utilities
|
|
||||||
URL: https://fomafst.github.io/
|
URL: https://fomafst.github.io/
|
||||||
# Source must be from git tarball has different license than git, no idea why
|
# Source must be from git tarball has different license than git, no idea why
|
||||||
Source0: foma-%{version}.tar.xz
|
Source0: foma-%{version}.tar.xz
|
||||||
Patch0: foma-harden-build.patch
|
Patch0: foma-harden-build.patch
|
||||||
Patch1: foma-fix-sizeof.patch
|
|
||||||
BuildRequires: bison
|
BuildRequires: bison
|
||||||
BuildRequires: flex
|
BuildRequires: flex
|
||||||
BuildRequires: ncurses-devel
|
BuildRequires: ncurses-devel
|
||||||
@ -44,7 +42,6 @@ use of foma, it is sufficiently generic to use for a large number of purposes.
|
|||||||
|
|
||||||
%package -n %{libname}
|
%package -n %{libname}
|
||||||
Summary: Finite-state C library
|
Summary: Finite-state C library
|
||||||
Group: System/Libraries
|
|
||||||
|
|
||||||
%description -n %{libname}
|
%description -n %{libname}
|
||||||
The library contains efficient implementations of all classical
|
The library contains efficient implementations of all classical
|
||||||
@ -56,7 +53,6 @@ rules, etc.
|
|||||||
|
|
||||||
%package devel
|
%package devel
|
||||||
Summary: Finite-state C library development files and headers
|
Summary: Finite-state C library development files and headers
|
||||||
Group: Development/Libraries/C and C++
|
|
||||||
Requires: %{libname} = %{version}
|
Requires: %{libname} = %{version}
|
||||||
|
|
||||||
%description devel
|
%description devel
|
||||||
@ -65,14 +61,13 @@ Finite-state C library development files and headers for %{name}.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q -n %{name}-%{version}/%{name}
|
%setup -q -n %{name}-%{version}/%{name}
|
||||||
%patch0 -p2
|
%patch0 -p2
|
||||||
%patch1 -p2
|
sed -i '/^CFLAGS/c\CFLAGS = %{optflags} -fcommon -Wl,--as-needed -D_GNU_SOURCE -std=c99 -fvisibility=hidden -fPIC' Makefile
|
||||||
sed -i '/^CFLAGS/c\CFLAGS = %{optflags} -Wl,--as-needed -D_GNU_SOURCE -std=c99 -fvisibility=hidden -fPIC' Makefile
|
|
||||||
sed -i '/^LDFLAGS/c\LDFLAGS = -lreadline -lz -lreadline -fpic' Makefile
|
sed -i '/^LDFLAGS/c\LDFLAGS = -lreadline -lz -lreadline -fpic' Makefile
|
||||||
sed -i '/^FLOOKUPLDFLAGS/c\FLOOKUPLDFLAGS = libfoma.a -lz -fpic' Makefile
|
sed -i '/^FLOOKUPLDFLAGS/c\FLOOKUPLDFLAGS = libfoma.a -lz -fpic' Makefile
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# hand written Makefile that gets to be quite PITA
|
# hand written Makefile that gets to be quite PITA
|
||||||
make -j1
|
%make_build -j1
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%make_install \
|
%make_install \
|
||||||
|
Loading…
Reference in New Issue
Block a user