commit pyzy for openSUSE:Factory
Hello community, here is the log from the commit of package pyzy for openSUSE:Factory checked in at 2020-07-27 17:43:42 Comparing /work/SRC/openSUSE:Factory/pyzy (Old) and /work/SRC/openSUSE:Factory/.pyzy.new.3592 (New) Package is "pyzy" Mon Jul 27 17:43:42 2020 rev:9 rq:823007 version:1.1 Changes: --- /work/SRC/openSUSE:Factory/pyzy/pyzy.changes2020-04-11 23:48:30.559178937 +0200 +++ /work/SRC/openSUSE:Factory/.pyzy.new.3592/pyzy.changes 2020-07-27 17:45:18.683276472 +0200 @@ -12 +12 @@ -- fix tumbleweed build +- fix tumbleweed build by adding BuildRequires: python Other differences: --
commit pyzy for openSUSE:Factory
Hello community,
here is the log from the commit of package pyzy for openSUSE:Factory checked in
at 2020-04-11 23:47:45
Comparing /work/SRC/openSUSE:Factory/pyzy (Old)
and /work/SRC/openSUSE:Factory/.pyzy.new.3248 (New)
Package is "pyzy"
Sat Apr 11 23:47:45 2020 rev:8 rq:793101 version:1.1
Changes:
--- /work/SRC/openSUSE:Factory/pyzy/pyzy.changes2019-01-15
09:17:44.210159418 +0100
+++ /work/SRC/openSUSE:Factory/.pyzy.new.3248/pyzy.changes 2020-04-11
23:48:30.559178937 +0200
@@ -1,0 +2,8 @@
+Sat Apr 11 13:16:04 UTC 2020 - Hillwood Yang
+
+- Update version to 1.1
+ * Support opencc 1.0.2, drop pyzy-opencc-1_0_2-build.patch
+ * Migrate to python3
+ * Fix bugs, drop signed-char.patch and autofix.diff
+
+---
@@ -43,0 +52 @@
+
Old:
autofix.diff
pinyin-database-1.2.99.tar.bz2
pyzy-1.0git20120805.tar.gz
pyzy-opencc-1_0_2-build.patch
signed-char.patch
New:
pyzy-1.1.tar.gz
Other differences:
--
++ pyzy.spec ++
--- /var/tmp/diff_new_pack.cUwAwT/_old 2020-04-11 23:48:31.743179839 +0200
+++ /var/tmp/diff_new_pack.cUwAwT/_new 2020-04-11 23:48:31.747179842 +0200
@@ -1,7 +1,7 @@
#
# spec file for package pyzy
#
-# 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,44 +12,34 @@
# 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/
#
Name: pyzy
-Version:1.0git20120805
+Version:1.1
Release:0
Summary:The Chinese PinYin and Bopomofo conversion library
-License:LGPL-2.1
+License:LGPL-2.1-only
Group: System/I18n/Chinese
-Url:http://code.google.com/p/pyzy
-Source0:%{name}-%{version}.tar.gz
-Source1:pyzy-database-1.0.0.tar.bz2
-Source2:pinyin-database-1.2.99.tar.bz2
-# PATCH-FIX-UPSTREAM autofix.diff jeng...@inai.de -- resolve build errors with
old automake
-Patch1: autofix.diff
-# PATCH-FIX-UPSTREAM pyzy-opencc-1_0_2-build.patch hillw...@opensuse.org --
Use opencc 1.0.2
-Patch2: pyzy-opencc-1_0_2-build.patch
-# PATCH-FIX-UPSTREAM signed-char.patch sch...@suse.de -- Fix -Wnarrowing
warning
-Patch3: signed-char.patch
+URL:https://github.com/openSUSE/pyzy
+Source0:
https://github.com/openSUSE/pyzy/archive/%{version}/%{name}-%{version}.tar.gz
+Source1:
https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/pyzy/pyzy-database-1.0.0.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: gcc-c++
-BuildRequires: glib2-devel >= 2.24.0
+BuildRequires: pkgconfig(glib-2.0) >= 2.24.0
BuildRequires: gnome-common
BuildRequires: googletest-devel
BuildRequires: libtool
-BuildRequires: libuuid-devel
-BuildRequires: opencc
-BuildRequires: opencc-devel
+BuildRequires: pkgconfig(uuid)
+BuildRequires: pkgconfig(opencc)
BuildRequires: pkgconfig
-BuildRequires: python
-BuildRequires: sqlite
-BuildRequires: sqlite-devel
+BuildRequires: python3
+BuildRequires: sqlite3
+BuildRequires: pkgconfig(sqlite3)
BuildRequires: wget
Requires: opencc
-# Requires(post): sqlite
-
%description
The Chinese Pinyin and Bopomofo conversion library.
@@ -92,24 +82,18 @@
%prep
%setup -q
-%patch -P 1 -p1
-%patch2 -p1
-%patch3 -p1
cp %{SOURCE1} data/db/open-phrase
-cp %{SOURCE2} data/db/open-phrase
%build
-./autogen.sh
+export PYTHON=python3
+autoreconf -fi
%configure --disable-static \
--enable-db-open-phrase \
--enable-opencc
-# make -C po update-gmo
-make %{?_smp_mflags}
+%make_build
%install
-rm -rf $RPM_BUILD_ROOT
-# make DESTDIR=${RPM_BUILD_ROOT} NO_INDEX=true install
-make DESTDIR=$RPM_BUILD_ROOT install
+%make_install
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
%post -n lib%{name}-1_0-0 -p /sbin/ldconfig
@@ -118,7 +102,8 @@
%files -n lib%{name}-1_0-0
%defattr(-,root,root,-)
-%doc AUTHORS COPYING README
+%doc AUTHORS README
+%license COPYING
%{_libdir}/lib*.so.*
%{_datadir}/%{name}/phrases.txt
%{_datadir}/%{name}/db/create_index.sql
++ pyzy-1.0git20120805.tar.gz -> pyzy-1.1.tar.gz ++
29829 lines of diff (skipped)
commit pyzy for openSUSE:Factory
Hello community, here is the log from the commit of package pyzy for openSUSE:Factory checked in at 2019-01-15 09:17:22 Comparing /work/SRC/openSUSE:Factory/pyzy (Old) and /work/SRC/openSUSE:Factory/.pyzy.new.28833 (New) Package is "pyzy" Tue Jan 15 09:17:22 2019 rev:7 rq:665272 version:1.0git20120805 Changes: --- /work/SRC/openSUSE:Factory/pyzy/pyzy.changes2015-07-22 09:19:59.0 +0200 +++ /work/SRC/openSUSE:Factory/.pyzy.new.28833/pyzy.changes 2019-01-15 09:17:44.210159418 +0100 @@ -1,0 +2,5 @@ +Sun Jan 13 10:42:52 UTC 2019 - Marguerite Su + +- fix tumbleweed build + +--- Other differences: -- ++ pyzy.spec ++ --- /var/tmp/diff_new_pack.dIR5lz/_old 2019-01-15 09:17:45.170158523 +0100 +++ /var/tmp/diff_new_pack.dIR5lz/_new 2019-01-15 09:17:45.174158519 +0100 @@ -42,6 +42,7 @@ BuildRequires: opencc BuildRequires: opencc-devel BuildRequires: pkgconfig +BuildRequires: python BuildRequires: sqlite BuildRequires: sqlite-devel BuildRequires: wget
commit pyzy for openSUSE:Factory
Hello community,
here is the log from the commit of package pyzy for openSUSE:Factory checked in
at 2015-07-22 09:19:57
Comparing /work/SRC/openSUSE:Factory/pyzy (Old)
and /work/SRC/openSUSE:Factory/.pyzy.new (New)
Package is pyzy
Changes:
--- /work/SRC/openSUSE:Factory/pyzy/pyzy.changes2015-02-27
11:00:34.0 +0100
+++ /work/SRC/openSUSE:Factory/.pyzy.new/pyzy.changes 2015-07-22
09:19:59.0 +0200
@@ -1,0 +2,5 @@
+Tue Jul 21 10:30:52 UTC 2015 - sch...@suse.de
+
+- signed-char.patch: Fix -Wnarrowing warning
+
+---
New:
signed-char.patch
Other differences:
--
++ pyzy.spec ++
--- /var/tmp/diff_new_pack.nIXmqO/_old 2015-07-22 09:20:00.0 +0200
+++ /var/tmp/diff_new_pack.nIXmqO/_new 2015-07-22 09:20:00.0 +0200
@@ -30,6 +30,8 @@
Patch1: autofix.diff
# PATCH-FIX-UPSTREAM pyzy-opencc-1_0_2-build.patch hillw...@opensuse.org --
Use opencc 1.0.2
Patch2: pyzy-opencc-1_0_2-build.patch
+# PATCH-FIX-UPSTREAM signed-char.patch sch...@suse.de -- Fix -Wnarrowing
warning
+Patch3: signed-char.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: gcc-c++
BuildRequires: glib2-devel = 2.24.0
@@ -91,6 +93,7 @@
%setup -q
%patch -P 1 -p1
%patch2 -p1
+%patch3 -p1
cp %{SOURCE1} data/db/open-phrase
cp %{SOURCE2} data/db/open-phrase
++ signed-char.patch ++
Index: pyzy-1.0git20120805/src/DoublePinyinContext.cc
===
--- pyzy-1.0git20120805.orig/src/DoublePinyinContext.cc
+++ pyzy-1.0git20120805/src/DoublePinyinContext.cc
@@ -352,7 +352,7 @@ DoublePinyinContext::isPinyin (int i)
return NULL;
}
-char sheng = ID_TO_SHENG (i);
+signed char sheng = ID_TO_SHENG (i);
if (sheng == PINYIN_ID_VOID) {
return NULL;
@@ -365,8 +365,8 @@ inline const Pinyin *
DoublePinyinContext::isPinyin (int i, int j)
{
const Pinyin *pinyin = NULL;
-char sheng = ID_TO_SHENG (i);
-const char *yun = ID_TO_YUNS (j);
+signed char sheng = ID_TO_SHENG (i);
+const signed char *yun = ID_TO_YUNS (j);
do {
if (sheng == PINYIN_ID_VOID || yun[0] == PINYIN_ID_VOID)
Index: pyzy-1.0git20120805/src/DoublePinyinTable.h
===
--- pyzy-1.0git20120805.orig/src/DoublePinyinTable.h
+++ pyzy-1.0git20120805/src/DoublePinyinTable.h
@@ -26,7 +26,7 @@
#define PINYIN_ID_AEO PINYIN_ID_ZERO
-static const char double_pinyin_mspy_sheng[] = {
+static const signed char double_pinyin_mspy_sheng[] = {
PINYIN_ID_AEO, // A
PINYIN_ID_B,// B
PINYIN_ID_C,// C
@@ -55,7 +55,7 @@ static const char double_pinyin_mspy_she
PINYIN_ID_Z,// Z
PINYIN_ID_VOID, // ;
};
-static const char double_pinyin_mspy_yun[][2] = {
+static const signed char double_pinyin_mspy_yun[][2] = {
{ PINYIN_ID_A,PINYIN_ID_VOID }, // A
{ PINYIN_ID_OU, PINYIN_ID_VOID }, // B
{ PINYIN_ID_IAO, PINYIN_ID_VOID }, // C
@@ -84,7 +84,7 @@ static const char double_pinyin_mspy_yun
{ PINYIN_ID_EI, PINYIN_ID_VOID }, // Z
{ PINYIN_ID_ING, PINYIN_ID_VOID }, // ;
};
-static const char double_pinyin_zrm_sheng[] = {
+static const signed char double_pinyin_zrm_sheng[] = {
PINYIN_ID_AEO, // A
PINYIN_ID_B,// B
PINYIN_ID_C,// C
@@ -113,7 +113,7 @@ static const char double_pinyin_zrm_shen
PINYIN_ID_Z,// Z
PINYIN_ID_VOID, // ;
};
-static const char double_pinyin_zrm_yun[][2] = {
+static const signed char double_pinyin_zrm_yun[][2] = {
{ PINYIN_ID_A,PINYIN_ID_VOID }, // A
{ PINYIN_ID_OU, PINYIN_ID_VOID }, // B
{ PINYIN_ID_IAO, PINYIN_ID_VOID }, // C
@@ -142,7 +142,7 @@ static const char double_pinyin_zrm_yun[
{ PINYIN_ID_EI, PINYIN_ID_VOID }, // Z
{ PINYIN_ID_VOID, PINYIN_ID_VOID }, // ;
};
-static const char double_pinyin_abc_sheng[] = {
+static const signed char double_pinyin_abc_sheng[] = {
PINYIN_ID_ZH, // A
PINYIN_ID_B,// B
PINYIN_ID_C,// C
@@ -171,7 +171,7 @@ static const char double_pinyin_abc_shen
PINYIN_ID_Z,// Z
PINYIN_ID_VOID, // ;
};
-static const char double_pinyin_abc_yun[][2] = {
+static const signed char double_pinyin_abc_yun[][2] = {
{ PINYIN_ID_A,PINYIN_ID_VOID }, // A
{ PINYIN_ID_OU, PINYIN_ID_VOID }, // B
{ PINYIN_ID_IN, PINYIN_ID_UAI }, // C
@@ -200,7 +200,7 @@ static const char double_pinyin_abc_yun[
{ PINYIN_ID_IAO, PINYIN_ID_VOID }, // Z
{ PINYIN_ID_VOID, PINYIN_ID_VOID }, // ;
};
-static const char double_pinyin_zgpy_sheng[] = {
+static const signed char
commit pyzy for openSUSE:Factory
Hello community,
here is the log from the commit of package pyzy for openSUSE:Factory checked in
at 2015-02-27 10:59:59
Comparing /work/SRC/openSUSE:Factory/pyzy (Old)
and /work/SRC/openSUSE:Factory/.pyzy.new (New)
Package is pyzy
Changes:
--- /work/SRC/openSUSE:Factory/pyzy/pyzy.changes2013-11-24
13:23:38.0 +0100
+++ /work/SRC/openSUSE:Factory/.pyzy.new/pyzy.changes 2015-02-27
11:00:34.0 +0100
@@ -1,0 +2,11 @@
+Thu Feb 26 03:27:50 UTC 2015 - hillw...@linuxfans.org
+
+- Add patch: pyzy-opencc-1_0_2-build.patch
+ * Use opencc 1.0.2
+
+---
+Wed Feb 25 06:45:17 UTC 2015 - hillw...@linuxfans.org
+
+- Disable opencc build.
+
+---
New:
pyzy-opencc-1_0_2-build.patch
Other differences:
--
++ pyzy.spec ++
--- /var/tmp/diff_new_pack.fAaVoL/_old 2015-02-27 11:00:36.0 +0100
+++ /var/tmp/diff_new_pack.fAaVoL/_new 2015-02-27 11:00:36.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package pyzy
#
-# 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
@@ -23,11 +23,13 @@
License:LGPL-2.1
Group: System/I18n/Chinese
Url:http://code.google.com/p/pyzy
-
Source0:%{name}-%{version}.tar.gz
Source1:pyzy-database-1.0.0.tar.bz2
Source2:pinyin-database-1.2.99.tar.bz2
+# PATCH-FIX-UPSTREAM autofix.diff jeng...@inai.de -- resolve build errors with
old automake
Patch1: autofix.diff
+# PATCH-FIX-UPSTREAM pyzy-opencc-1_0_2-build.patch hillw...@opensuse.org --
Use opencc 1.0.2
+Patch2: pyzy-opencc-1_0_2-build.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: gcc-c++
BuildRequires: glib2-devel = 2.24.0
@@ -88,6 +90,7 @@
%prep
%setup -q
%patch -P 1 -p1
+%patch2 -p1
cp %{SOURCE1} data/db/open-phrase
cp %{SOURCE2} data/db/open-phrase
++ pyzy-opencc-1_0_2-build.patch ++
diff -Nur pyzy-1.0git20120805/src/SimpTradConverter.cc
pyzy-1.0git20120805-new/src/SimpTradConverter.cc
--- pyzy-1.0git20120805/src/SimpTradConverter.cc2012-08-03
10:36:31.0 +0800
+++ pyzy-1.0git20120805-new/src/SimpTradConverter.cc2015-02-26
09:40:41.243684651 +0800
@@ -40,7 +40,6 @@
#ifdef HAVE_OPENCC
class opencc {
-static const int BUFFER_SIZE = 64;
public:
opencc (void)
{
@@ -55,29 +54,13 @@
void convert (const char *in, String out)
{
-long n_char;
-unichar *in_ucs4 = g_utf8_to_ucs4_fast (in, -1, n_char);
-
-ucs4_t *pinbuf = (ucs4_t *)in_ucs4;
-size_t inbuf_left = n_char;
-while (inbuf_left != 0) {
-ucs4_t *poutbuf = (ucs4_t *)m_buffer;
-size_t outbuf_left = BUFFER_SIZE;
-size_t retval = opencc_convert(m_od, pinbuf, inbuf_left,
poutbuf, outbuf_left);
-if (retval == (size_t) -1) {
-/* append left chars in pinbuf */
-g_warning (opencc_convert return failed);
-out (unichar *) pinbuf;
-break;
-}
-*poutbuf = L'\0';
-out m_buffer;
-}
-g_free (in_ucs4);
+char * converted = opencc_convert_utf8 (m_od, in, -1);
+g_assert (converted != NULL);
+out = converted;
+opencc_convert_utf8_free (converted);
}
private:
opencc_t m_od;
-unichar m_buffer[BUFFER_SIZE + 1];
};
void
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit pyzy for openSUSE:Factory
Hello community,
here is the log from the commit of package pyzy for openSUSE:Factory checked in
at 2013-11-24 13:23:36
Comparing /work/SRC/openSUSE:Factory/pyzy (Old)
and /work/SRC/openSUSE:Factory/.pyzy.new (New)
Package is pyzy
Changes:
--- /work/SRC/openSUSE:Factory/pyzy/pyzy.changes2013-07-08
21:45:31.0 +0200
+++ /work/SRC/openSUSE:Factory/.pyzy.new/pyzy.changes 2013-11-24
13:23:38.0 +0100
@@ -1,0 +2,12 @@
+Sat Nov 23 04:19:45 UTC 2013 - jeng...@inai.de
+
+- Resolve build problems with old automake: add patch autofix.diff
+- Write down pyzy version requirements into specfile's BuildRequires
+
+---
+Tue Nov 12 05:23:40 UTC 2013 - jeng...@inai.de
+
+- Have the database subpackages own their parent paths, so that
+ they get properly removed when the package is
+
+---
New:
autofix.diff
Other differences:
--
++ pyzy.spec ++
--- /var/tmp/diff_new_pack.aDZlRp/_old 2013-11-24 13:23:39.0 +0100
+++ /var/tmp/diff_new_pack.aDZlRp/_new 2013-11-24 13:23:39.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package pyzy
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products 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,27 +15,32 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
Name: pyzy
Version:1.0git20120805
-Release:1
+Release:0
Summary:The Chinese PinYin and Bopomofo conversion library
License:LGPL-2.1
Group: System/I18n/Chinese
-URL:http://code.google.com/p/pyzy
+Url:http://code.google.com/p/pyzy
+
Source0:%{name}-%{version}.tar.gz
Source1:pyzy-database-1.0.0.tar.bz2
Source2:pinyin-database-1.2.99.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: glib2-devel
+Patch1: autofix.diff
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: gcc-c++
+BuildRequires: glib2-devel = 2.24.0
+BuildRequires: gnome-common
+BuildRequires: googletest-devel
BuildRequires: libtool
-BuildRequires: pkgconfig
-BuildRequires: sqlite sqlite-devel
BuildRequires: libuuid-devel
-BuildRequires: googletest-devel
+BuildRequires: opencc
+BuildRequires: opencc-devel
+BuildRequires: pkgconfig
+BuildRequires: sqlite
+BuildRequires: sqlite-devel
BuildRequires: wget
-BuildRequires: gcc-c++
-BuildRequires: opencc opencc-devel
-BuildRequires: gnome-common
Requires:opencc
# Requires(post): sqlite
@@ -82,6 +87,7 @@
%prep
%setup -q
+%patch -P 1 -p1
cp %{SOURCE1} data/db/open-phrase
cp %{SOURCE2} data/db/open-phrase
@@ -99,9 +105,6 @@
make DESTDIR=$RPM_BUILD_ROOT install
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%post -n lib%{name}-1_0-0 -p /sbin/ldconfig
%postun -n lib%{name}-1_0-0 -p /sbin/ldconfig
@@ -123,10 +126,14 @@
%files db-open-phrase
%defattr(-,root,root,-)
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/db
%{_datadir}/%{name}/db/open-phrase.db
%files db-android
%defattr(-,root,root,-)
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/db
%{_datadir}/%{name}/db/android.db
%changelog
++ autofix.diff ++
From: Jan Engelhardt jeng...@inai.de
Date: 2013-11-23 05:16:43.764865702 +0100
build: resolve build errors with old automake
Sufficiently old automake does not know AM_SILENT_RULES (= 1.11) or
AM_COND_IF (= v1.10b).
---
configure.ac |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Index: pyzy-1.0git20120805/configure.ac
===
--- pyzy-1.0git20120805.orig/configure.ac
+++ pyzy-1.0git20120805/configure.ac
@@ -34,7 +34,7 @@ m4_define([pyzy_version],
pyzy_major_version.pyzy_minor_version.pyzy_micro_version[]pyzy_maybe_datestamp)
m4_define([pyzy_api_version], [1.0])
-AC_PREFEQ([2.62])
+AC_PREREQ([2.62])
AC_INIT([pyzy], [pyzy_version],
[http://code.google.com/p/pyzy/issues/entry],
[pyzy])
@@ -52,7 +52,7 @@ AC_GNU_SOURCE
# Support silent build rules. Disable
# by either passing --disable-silent-rules to configure or passing V=1
# to make
-AM_SILENT_RULES([yes])
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
# Define sustituted variables:
PYZY_MAJOR_VERSION=pyzy_major_version
@@ -196,7 +196,7 @@ if test -z $DOXYGEN; then
AC_MSG_WARN([Doxygen not found - continuing without Doxygen support])
fi
