commit marisa for openSUSE:Factory
Hello community,
here is the log from the commit of package marisa for openSUSE:Factory checked
in at 2020-09-29 19:01:12
Comparing /work/SRC/openSUSE:Factory/marisa (Old)
and /work/SRC/openSUSE:Factory/.marisa.new.4249 (New)
Package is "marisa"
Tue Sep 29 19:01:12 2020 rev:7 rq:838099 version:0.2.6
Changes:
--- /work/SRC/openSUSE:Factory/marisa/marisa.changes2020-08-16
20:33:27.774303430 +0200
+++ /work/SRC/openSUSE:Factory/.marisa.new.4249/marisa.changes 2020-09-29
19:01:38.677761915 +0200
@@ -1,0 +2,7 @@
+Sun Sep 27 04:25:30 UTC 2020 - Marguerite Su
+
+- update version 0.2.6
+ * see git commits
+- enable python3 binding again
+
+---
Old:
marisa-0.2.4.tar.gz
New:
marisa-trie-0.2.6.tar.gz
Other differences:
--
++ marisa.spec ++
--- /var/tmp/diff_new_pack.NeoLiz/_old 2020-09-29 19:01:39.269762634 +0200
+++ /var/tmp/diff_new_pack.NeoLiz/_new 2020-09-29 19:01:39.273762639 +0200
@@ -16,31 +16,20 @@
#
-%define with_python2 0%{?suse_version} < 1550
-%{!?py_ver: %global py_ver %(python -c "import sys; v=sys.version_info[:2];
print '%%d.%%d'%%v" 2>/dev/null || echo PYTHON-NOT-FOUND)}
-%{!?python_sitearch: %global python_sitearch %(python -c "from
distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
-
-%if 0%{?sles_version} < 1110
-%{!?rb_arch: %global rb_arch %(/usr/bin/ruby -e 'print RUBY_PLATFORUM')}
-%{!?rb_ver: %global rb_ver %(/usr/bin/ruby -e 'puts
VERSION.sub(/\\\.\\\d$/,"")')}
-%{!?rb_vendorarch: %global rb_vendorarch
%{_libdir}/ruby/site_ruby/%{rb_ver}/%{rb_arch}}
-%endif
-
Name: marisa
-Version:0.2.4
+Version:0.2.6
Release:0
Summary:Matching Algorithm with Recursively Implemented StorAge
License:LGPL-2.1-or-later OR BSD-2-Clause
Group: System/I18n/Japanese
-URL:https://code.google.com/p/marisa-trie/
-Source:
https://marisa-trie.googlecode.com/files/%{name}-%{version}.tar.gz
+URL:https://github.com/s-yata/marisa-trie/
+Source:
https://github.com/s-yata/marisa-trie/archive/v%{version}/%{name}-trie-%{version}.tar.gz
Source99: baselibs.conf
BuildRequires: gcc-c++
+BuildRequires: libtool
BuildRequires: perl
BuildRequires: pkg-config
-%if %with_python2
-BuildRequires: python-devel
-%endif
+BuildRequires: python3-devel
BuildRequires: ruby-devel
BuildRequires: swig
Provides: marisa-trie = %{version}
@@ -68,25 +57,18 @@
Summary:Perl bindings for %{name}
Group: Development/Libraries/Perl
Requires: %{name} = %{version}
-%if 0%{?suse_version} < 1140
-Requires: perl = %{perl_version}
-%else
%{perl_requires}
-%endif
%description -n perl-marisa
Perl bindings for %{name}.
-%if %with_python2
-%package -n python-marisa
-Summary:Python bindings for %{name}
+%package -n python3-marisa
+Summary:Python3 bindings for %{name}
Group: Development/Libraries/Python
Requires: %{name} = %{version}
-%py_requires
-%description -n python-marisa
-Python bindings for %{name}.
-%endif
+%description -n python3-marisa
+Python3 bindings for %{name}.
%package -n ruby-marisa
Summary:Ruby bindings for %{name}
@@ -102,9 +84,7 @@
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}
Requires: perl-marisa = %{version}
-%if %with_python2
-Requires: python-marisa = %{version}
-%endif
+Requires: python3-marisa = %{version}
Requires: ruby-marisa = %{version}
%description devel
@@ -112,29 +92,30 @@
developing applications that use %{name}.
%prep
-%setup -q
+%setup -q -n marisa-trie-%{version}
%build
+autoreconf -fiv
%configure
make %{?_smp_mflags}
# build ruby
pushd bindings/ruby
-ruby extconf.rb --with-opt-include="%{_builddir}/%{name}-%{version}/lib"
--vendor
+ruby extconf.rb --with-opt-include=../../include
--with-opt-lib=../../lib/marisa/.libs --vendor
make %{?_smp_mflags}
popd
-%if %with_python2
# build python
pushd bindings/python
-python setup.py build_ext --include-dirs="%{_builddir}/%{name}-%{version}/lib"
--library-dirs="%{_builddir}/%{name}-%{version}/lib/.libs"
-python setup.py build
+swig -Wall -c++ -python -py3 -outdir . ../marisa-swig.i
+mv ../marisa-swig_wrap.cxx .
+python3 setup.py build_ext --include-dirs=../../include
--library-dirs=../../lib/marisa/.libs
+python3 setup.py build
popd
-%endif
# build perl
pushd bindings/perl
-%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
INC="-I%{_builddir}/%{name}-%{version}/lib"
LIBS="-L%{_builddir}/%{name}-%{version}/lib/.libs"
+%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
commit marisa for openSUSE:Factory
Hello community,
here is the log from the commit of package marisa for openSUSE:Factory checked
in at 2020-08-16 20:33:26
Comparing /work/SRC/openSUSE:Factory/marisa (Old)
and /work/SRC/openSUSE:Factory/.marisa.new.3399 (New)
Package is "marisa"
Sun Aug 16 20:33:26 2020 rev:6 rq:826849 version:0.2.4
Changes:
--- /work/SRC/openSUSE:Factory/marisa/marisa.changes2018-03-20
21:56:20.142375903 +0100
+++ /work/SRC/openSUSE:Factory/.marisa.new.3399/marisa.changes 2020-08-16
20:33:27.774303430 +0200
@@ -1,0 +2,5 @@
+Fri Aug 14 12:55:00 UTC 2020 - Dominique Leuenberger
+
+- No longer package python2-binding on suse_version > 1500.
+
+---
Other differences:
--
++ marisa.spec ++
--- /var/tmp/diff_new_pack.S60zvT/_old 2020-08-16 20:33:28.270303704 +0200
+++ /var/tmp/diff_new_pack.S60zvT/_new 2020-08-16 20:33:28.274303706 +0200
@@ -1,7 +1,7 @@
#
# spec file for package marisa
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,10 +12,11 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
+%define with_python2 0%{?suse_version} < 1550
%{!?py_ver: %global py_ver %(python -c "import sys; v=sys.version_info[:2];
print '%%d.%%d'%%v" 2>/dev/null || echo PYTHON-NOT-FOUND)}
%{!?python_sitearch: %global python_sitearch %(python -c "from
distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
@@ -29,15 +30,17 @@
Version:0.2.4
Release:0
Summary:Matching Algorithm with Recursively Implemented StorAge
-License:LGPL-2.1+ or BSD-2-Clause
+License:LGPL-2.1-or-later OR BSD-2-Clause
Group: System/I18n/Japanese
-Url:https://code.google.com/p/marisa-trie/
+URL:https://code.google.com/p/marisa-trie/
Source:
https://marisa-trie.googlecode.com/files/%{name}-%{version}.tar.gz
Source99: baselibs.conf
BuildRequires: gcc-c++
BuildRequires: perl
BuildRequires: pkg-config
+%if %with_python2
BuildRequires: python-devel
+%endif
BuildRequires: ruby-devel
BuildRequires: swig
Provides: marisa-trie = %{version}
@@ -74,6 +77,7 @@
%description -n perl-marisa
Perl bindings for %{name}.
+%if %with_python2
%package -n python-marisa
Summary:Python bindings for %{name}
Group: Development/Libraries/Python
@@ -82,6 +86,7 @@
%description -n python-marisa
Python bindings for %{name}.
+%endif
%package -n ruby-marisa
Summary:Ruby bindings for %{name}
@@ -97,7 +102,9 @@
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}
Requires: perl-marisa = %{version}
+%if %with_python2
Requires: python-marisa = %{version}
+%endif
Requires: ruby-marisa = %{version}
%description devel
@@ -117,11 +124,13 @@
make %{?_smp_mflags}
popd
+%if %with_python2
# build python
pushd bindings/python
python setup.py build_ext --include-dirs="%{_builddir}/%{name}-%{version}/lib"
--library-dirs="%{_builddir}/%{name}-%{version}/lib/.libs"
python setup.py build
popd
+%endif
# build perl
pushd bindings/perl
@@ -139,10 +148,12 @@
make install DESTDIR=%{buildroot} hdrdir=%{_includedir}/ruby-%{rb_ver}
rubyhdrdir=%{_includedir}/ruby-%{rb_ver}
popd
+%if %with_python2
# install python
pushd bindings/python
python setup.py install --prefix=%{_prefix} --root=%{buildroot}
popd
+%endif
# install perl
pushd bindings/perl
@@ -179,6 +190,7 @@
%{rb_vendorarch}/%{name}.so
%endif
+%if %with_python2
%files -n python-marisa
%defattr(-,root,root)
%{python_sitearch}/_marisa.so
@@ -186,6 +198,7 @@
%if 0%{?suse_version} >= 1110
%{python_sitearch}/marisa-0.0.0-py%{py_ver}.egg-info
%endif
+%endif
%files -n perl-marisa
%defattr(-,root,root)
commit marisa for openSUSE:Factory
Hello community,
here is the log from the commit of package marisa for openSUSE:Factory checked
in at 2018-03-20 21:56:15
Comparing /work/SRC/openSUSE:Factory/marisa (Old)
and /work/SRC/openSUSE:Factory/.marisa.new (New)
Package is "marisa"
Tue Mar 20 21:56:15 2018 rev:5 rq:586371 version:0.2.4
Changes:
--- /work/SRC/openSUSE:Factory/marisa/marisa.changes2015-10-20
00:07:06.0 +0200
+++ /work/SRC/openSUSE:Factory/.marisa.new/marisa.changes 2018-03-20
21:56:20.142375903 +0100
@@ -1,0 +2,5 @@
+Tue Mar 13 09:37:28 UTC 2018 - bwiedem...@suse.com
+
+- Drop build time from perllocal.pod for reproducibility (boo#1047218)
+
+---
Other differences:
--
++ marisa.spec ++
--- /var/tmp/diff_new_pack.htgmS8/_old 2018-03-20 21:56:20.822351420 +0100
+++ /var/tmp/diff_new_pack.htgmS8/_new 2018-03-20 21:56:20.826351276 +0100
@@ -149,6 +149,7 @@
make install DESTDIR=%{buildroot}
rm -rf %{buildroot}%{perl_vendorarch}/auto/marisa/.packlist
popd
+sed -i '1s/^=head2 .*:/=head2/' %{buildroot}%{perl_archlib}/perllocal.pod
%post -n libmarisa0 -p /sbin/ldconfig
commit marisa for openSUSE:Factory
Hello community,
here is the log from the commit of package marisa for openSUSE:Factory checked
in at 2015-10-19 22:53:07
Comparing /work/SRC/openSUSE:Factory/marisa (Old)
and /work/SRC/openSUSE:Factory/.marisa.new (New)
Package is "marisa"
Changes:
--- /work/SRC/openSUSE:Factory/marisa/marisa.changes2013-07-08
12:36:24.0 +0200
+++ /work/SRC/openSUSE:Factory/.marisa.new/marisa.changes 2015-10-20
00:07:06.0 +0200
@@ -1,0 +2,7 @@
+Sun Oct 18 10:51:45 UTC 2015 - i...@marguerite.su
+
+- add baselibs.conf
+ * fix boo#949455: can't install libkkc2-32bit because lack of
+libmarisa0-32bit
+
+---
New:
baselibs.conf
Other differences:
--
++ marisa.spec ++
--- /var/tmp/diff_new_pack.j7aEEl/_old 2015-10-20 00:07:07.0 +0200
+++ /var/tmp/diff_new_pack.j7aEEl/_new 2015-10-20 00:07:07.0 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package
+# spec file for package marisa
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,6 +15,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
%{!?py_ver: %global py_ver %(python -c "import sys; v=sys.version_info[:2];
print '%%d.%%d'%%v" 2>/dev/null || echo PYTHON-NOT-FOUND)}
%{!?python_sitearch: %global python_sitearch %(python -c "from
distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
@@ -27,11 +28,12 @@
Name: marisa
Version: 0.2.4
Release: 0
-License: LGPL-2.1+ or BSD-2-Clause
Summary: Matching Algorithm with Recursively Implemented StorAge
-Url: https://code.google.com/p/marisa-trie/
+License:LGPL-2.1+ or BSD-2-Clause
Group: System/I18n/Japanese
+Url:https://code.google.com/p/marisa-trie/
Source:
https://marisa-trie.googlecode.com/files/%{name}-%{version}.tar.gz
+Source99: baselibs.conf
BuildRequires: gcc-c++
BuildRequires: perl
BuildRequires: pkg-config
++ baselibs.conf ++
libmarisa0
marisa
