diff --git a/marisa-0.2.4.tar.gz b/marisa-0.2.4.tar.gz deleted file mode 100644 index c8b3754..0000000 Binary files a/marisa-0.2.4.tar.gz and /dev/null differ diff --git a/marisa-0.2.6.tar.gz b/marisa-0.2.6.tar.gz new file mode 100644 index 0000000..9c1070d Binary files /dev/null and b/marisa-0.2.6.tar.gz differ diff --git a/marisa.spec b/marisa.spec index dab7957..ef35feb 100644 --- a/marisa.spec +++ b/marisa.spec @@ -1,13 +1,14 @@ Name: marisa -Version: 0.2.4 -Release: 41 +Version: 0.2.6 +Release: 1 Summary: Matching Algorithm with Recursively Implemented StorAge License: BSD-2-Clause or LGPL-2.1-or-later -URL: https://code.google.com/p/marisa-trie -Source0: https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/marisa-trie/%{name}-%{version}.tar.gz +URL: https://github.com/s-yata/marisa-trie +Source0: https://github.com/s-yata/marisa-trie/archive/%{version}/%{name}-%{version}.tar.gz BuildRequires: swig perl-devel perl-generators python3-devel ruby-devel g++ +BuildRequires: autoconf automake libtool %description MARISA is a static and space-efficient trie data structure. And libmarisa is a C++ @@ -49,25 +50,27 @@ Ruby bindings for marisa. %prep -%autosetup -n %{name}-%{version} -p1 +%autosetup -n %{name}-trie-%{version} -p1 %build +%set_build_flags +autoreconf -i %configure --disable-static sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool %make_build cd bindings/perl -%{__perl} Makefile.PL INC="-I%{_builddir}/marisa-%{version}/lib" \ -LIBS="-L%{_builddir}/marisa-%{version}/lib/.libs -lmarisa" INSTALLDIRS=vendor +%{__perl} Makefile.PL INC="-I%{_builddir}/marisa-trie-%{version}/include" \ +LIBS="-L%{_builddir}/marisa-trie-%{version}/lib/marisa/.libs -lmarisa" INSTALLDIRS=vendor %make_build cd - %make_build --directory=bindings swig-python cd bindings/python -%{__python3} setup.py build_ext --include-dirs="%{_builddir}/marisa-%{version}/lib" \ ---library-dirs="%{_builddir}/marisa-%{version}/lib/.libs" +%{__python3} setup.py build_ext --include-dirs="%{_builddir}/marisa-trie-%{version}/include" \ +--library-dirs="%{_builddir}/marisa-trie-%{version}/lib/marisa/.libs" %py3_build cd - @@ -76,8 +79,8 @@ cd bindings cd - cd bindings/ruby -ruby extconf.rb --with-opt-include="%{_builddir}/marisa-%{version}/lib" \ ---with-opt-lib="%{_builddir}/marisa-%{version}/lib/.libs" --vendor +ruby extconf.rb --with-opt-include="%{_builddir}/marisa-trie-%{version}/include" \ +--with-opt-lib="%{_builddir}/marisa-%{version}/lib/marisa/.libs" --vendor %make_build cd - @@ -107,7 +110,7 @@ find $RPM_BUILD_ROOT -name 'perllocal.pod' -delete /sbin/ldconfig %files -%doc docs/style.css AUTHORS README docs/readme.en.html COPYING +%doc docs/style.css AUTHORS README.md docs/readme.en.html %lang(ja) %doc docs/readme.ja.html %{_libdir}/libmarisa.so.* @@ -125,11 +128,15 @@ find $RPM_BUILD_ROOT -name 'perllocal.pod' -delete %{perl_vendorarch}/{marisa.pm,auto/marisa} %exclude %{perl_vendorarch}/auto/marisa/.packlist %exclude %{perl_vendorarch}/sample.pl +%exclude %{perl_vendorarch}/benchmark.pl %files ruby %{ruby_vendorarchdir}/marisa.so %changelog +* Tue Oct 17 2023 xu_ping <707078654@qq.com> - 0.2.6-1 +- Upgrade version to 0.2.6 + * Tue May 10 2022 chenchen - 0.2.4-41 - License compliance rectification