commit libzhuyin for openSUSE:Factory
Hello community,
here is the log from the commit of package libzhuyin for openSUSE:Factory
checked in at 2017-10-13 14:14:22
Comparing /work/SRC/openSUSE:Factory/libzhuyin (Old)
and /work/SRC/openSUSE:Factory/.libzhuyin.new (New)
Package is "libzhuyin"
Fri Oct 13 14:14:22 2017 rev:7 rq:532833 version:1.1.1
Changes:
--- /work/SRC/openSUSE:Factory/libzhuyin/libzhuyin.changes 2016-10-20
23:07:57.0 +0200
+++ /work/SRC/openSUSE:Factory/.libzhuyin.new/libzhuyin.changes 2017-10-13
14:14:23.940683594 +0200
@@ -1,0 +2,15 @@
+Sun Oct 8 14:11:38 UTC 2017 - jeng...@inai.de
+
+- Move documentation to libzhuyin7-devel. Manpages do not belong
+ into libzhuyin7 (SLPP guideline).
+- Adhere to package naming guidelines and use package versions,
+ not SO versions for package names.
+- Avoid running fdupes across partition boundaries.
+- Rename %soname to %sover to better reflect its use.
+
+---
+Thu Sep 28 07:31:59 UTC 2017 - hillw...@opensuse.org
+
+- Change the install libdir.
+
+---
Other differences:
--
++ libzhuyin.spec ++
--- /var/tmp/diff_new_pack.q8407C/_old 2017-10-13 14:14:25.104632414 +0200
+++ /var/tmp/diff_new_pack.q8407C/_new 2017-10-13 14:14:25.108632238 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libzhuyin
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -16,7 +16,7 @@
#
-%define soname 7
+%define sover 7
Name: libzhuyin
Version:1.1.1
Release:0
@@ -40,39 +40,42 @@
BuildRequires: libtool
Obsoletes: libzhuyin-tools < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+#
+# libzhuyin has been source-merged with libpinyin and recent versions
+# come from there.
%description
-The libzhuyin project aims to provide the algorithms core
+The libzhuyin project provides the algorithms core
for intelligent sentence-based Chinese zhuyin input methods.
-
-%package -n libzhuyin%{soname}
-Summary:Runtime libraries for libzhuyin
+%package -n libzhuyin%{sover}
+Summary:Runtime libraries for libzhuyin 1.1
Group: System/Libraries
-Requires: libzhuyin-data
+Requires: libzhuyin-1_1-data
-%description -n libzhuyin%{soname}
-The libzhuyin project aims to provide the algorithms core
+%description -n libzhuyin%{sover}
+The libzhuyin project provide the algorithms core
for intelligent sentence-based Chinese zhuyin input methods.
This package provides the runtime libraries for libzhuyin.
-%package data
-Summary:Data files for libzhuyin
+%package -n libzhuyin-1_1-data
+Summary:Data files for libzhuyin 1.1
Group: System/I18n/Chinese
-%description data
+%description -n libzhuyin-1_1-data
The libzhuyin project aims to provide the algorithms core
for intelligent sentence-based Chinese zhuyin input methods.
-This package provides the data files used by libzhuyin to be functional.
+This package provides the data files used by libzhuyin%{sover} to be
functional.
-%package devel
+%package -n libzhuyin-1_1-devel
Summary:Development headers for libzhuyin
Group: Development/Libraries/C and C++
-Requires: libzhuyin%{soname} = %{version}
+Requires: libzhuyin%{sover} = %{version}
+Conflicts: libzhuyin-devel
-%description devel
+%description -n libzhuyin-1_1-devel
The libzhuyin project aims to provide the algorithms core
for intelligent sentence-based Chinese zhuyin input methods.
@@ -87,37 +90,39 @@
tar -xf model9.text.tar.gz
popd &> /dev/null
NOCONFIGURE=1 ./autogen.sh
+# Add version number to directory for (arch-dependent!) data
+perl -i -lpe 's{^pkgdatadir=.*}{pkgdatadir=\@libdir\@/\@PACKAGE_NAME\@-1.1}'
*.pc.in
%build
-%configure --prefix=%{_prefix} --libdir=%{_libdir}
-make %{?_smp_mflags}
+%configure --disable-static
+make %{?_smp_mflags} libzhuyin_dbdir='${libdir}/${PACKAGE_NAME}-1.1/data'
%install
-make install DESTDIR=%{buildroot} %{?_smp_mflags}
+%make_install %{?_smp_mflags}
libzhuyin_dbdir='${libdir}/${PACKAGE_NAME}-1.1/data'
+rm -rf %{buildroot}/%{_libdir}/%{name}.la
+%fdupes %{buildroot}/%{_prefix}
-rm -rf %{buildroot}%{_libdir}/%{name}.{a,la}
+%post -n libzhuyin%{sover} -p /sbin/ldconfig
-%fdupes %{buildroot}
+%postun -n libzhuyin%{sover} -p /sbin/ldconfig
-%post -n libzhuyin%{soname} -p /sbin/ldconfig
-
-%postun -n libzhuyin%{soname} -p /sbin/ldconfig
-
-%files -n libzhuyin%{soname}
+%files -n libzh
commit libzhuyin for openSUSE:Factory
Hello community,
here is the log from the commit of package libzhuyin for openSUSE:Factory
checked in at 2016-10-20 23:07:57
Comparing /work/SRC/openSUSE:Factory/libzhuyin (Old)
and /work/SRC/openSUSE:Factory/.libzhuyin.new (New)
Package is "libzhuyin"
Changes:
--- /work/SRC/openSUSE:Factory/libzhuyin/libzhuyin.changes 2015-12-29
12:59:27.0 +0100
+++ /work/SRC/openSUSE:Factory/.libzhuyin.new/libzhuyin.changes 2016-10-20
23:07:57.0 +0200
@@ -1,0 +2,6 @@
+Sat Sep 10 08:08:23 UTC 2016 - hillw...@opensuse.org
+
+- Update to 1.1.1
+ * simplify ZhuyinDaChenCP26Parser2
+
+---
Old:
libzhuyin-1.1.0.tar.gz
New:
libzhuyin-1.1.1.tar.gz
Other differences:
--
++ libzhuyin.spec ++
--- /var/tmp/diff_new_pack.Rpfl8s/_old 2016-10-20 23:07:59.0 +0200
+++ /var/tmp/diff_new_pack.Rpfl8s/_new 2016-10-20 23:07:59.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libzhuyin
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 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
@@ -18,7 +18,7 @@
%define soname 7
Name: libzhuyin
-Version:1.1.0
+Version:1.1.1
Release:0
Summary:Library to deal with zhuyin
License:GPL-2.0
++ libzhuyin-1.1.0.tar.gz -> libzhuyin-1.1.1.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzhuyin-1.1.0/configure.ac
new/libzhuyin-1.1.1/configure.ac
--- old/libzhuyin-1.1.0/configure.ac2015-12-17 08:11:48.0 +0100
+++ new/libzhuyin-1.1.1/configure.ac2016-09-02 07:12:23.0 +0200
@@ -6,7 +6,7 @@
m4_define([libzhuyin_released], [1])
m4_define([libzhuyin_major_version], [1])
m4_define([libzhuyin_minor_version], [1])
-m4_define([libzhuyin_micro_version], [0])
+m4_define([libzhuyin_micro_version], [1])
m4_define(libzhuyin_maybe_datestamp,
m4_esyscmd([if test x]libzhuyin_released[ != x1; then date +.%Y%m%d | tr
-d '\n\r'; fi]))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzhuyin-1.1.0/src/storage/pinyin_parser2.cpp
new/libzhuyin-1.1.1/src/storage/pinyin_parser2.cpp
--- old/libzhuyin-1.1.0/src/storage/pinyin_parser2.cpp 2015-12-17
08:11:48.0 +0100
+++ new/libzhuyin-1.1.1/src/storage/pinyin_parser2.cpp 2016-09-02
07:12:23.0 +0200
@@ -938,6 +938,22 @@
m_tone_table= chewing_dachen_cp26_tones;
}
+static int count_same_chars(const char * str, int len) {
+assert(len > 0);
+
+int count = 0;
+const char cur_char = str[0];
+
+for (int i = 0; i < len; ++i) {
+if (cur_char != str[i])
+break;
+++count;
+}
+
+assert(count >= 1);
+return count;
+}
+
bool ChewingDaChenCP26Parser2::parse_one_key(pinyin_option_t options,
ChewingKey & key,
const char *str, int len) const {
@@ -975,26 +991,19 @@
if (0 == len)
return false;
-int i; int choice;
+int choice; int count;
/* probe initial */
do {
ch = input[index];
+count = count_same_chars(input + index, len - index);
if (search_chewing_symbols2(m_initial_table, ch, &first, &second)) {
-index ++;
+index += count;
if (NULL == second) {
initial = first;
break;
} else {
-choice = 0;
-/* zero out the same char */
-for (i = index; i < len; ++i) {
-if (input[i] == ch) {
-input[i] = '\0';
-choice ++;
-}
-}
-choice = choice % 2;
+choice = (count - 1) % 2;
if (0 == choice)
initial = first;
if (1 == choice)
@@ -1003,12 +1012,6 @@
}
} while (0);
-/* skip zeros */
-for (; index < len; index ++) {
-if ('\0' != input[index])
-break;
-}
-
if (index == len)
goto probe;
@@ -1016,57 +1019,37 @@
/* probe middle */
do {
ch = input[index];
+count = count_same_chars(input + index, len - index);
/* handle 'u' */
if ('u' == ch) {
-index ++;
-choice = 0;
-/* zero out the same char */
-for (i = index; i < len; ++i) {
-if ('u' == input[i]) {
commit libzhuyin for openSUSE:Factory
Hello community, here is the log from the commit of package libzhuyin for openSUSE:Factory checked in at 2015-12-29 12:59:22 Comparing /work/SRC/openSUSE:Factory/libzhuyin (Old) and /work/SRC/openSUSE:Factory/.libzhuyin.new (New) Package is "libzhuyin" Changes: --- /work/SRC/openSUSE:Factory/libzhuyin/libzhuyin.changes 2015-08-27 08:55:54.0 +0200 +++ /work/SRC/openSUSE:Factory/.libzhuyin.new/libzhuyin.changes 2015-12-29 12:59:27.0 +0100 @@ -1,0 +2,10 @@ +Fri Dec 25 07:10:03 UTC 2015 - hillw...@linuxfans.org + +- Update to 1.1.0 + * fixes zhuyin_choose_candidate method + * rename zhuyin_get_raw_full_pinyin to zhuyin_get_raw_user_input method + * write zhuyin_valid_zhuyin_keys method + * fixes zhuyin_in_chewing_keyboard method + * fixes ChewingDiscreteParser2 + +--- Old: libzhuyin-1.0.91.tar.gz New: libzhuyin-1.1.0.tar.gz Other differences: -- ++ libzhuyin.spec ++ --- /var/tmp/diff_new_pack.xfdJtN/_old 2015-12-29 12:59:29.0 +0100 +++ /var/tmp/diff_new_pack.xfdJtN/_new 2015-12-29 12:59:29.0 +0100 @@ -18,7 +18,7 @@ %define soname 7 Name: libzhuyin -Version:1.0.91 +Version:1.1.0 Release:0 Summary:Library to deal with zhuyin License:GPL-2.0 ++ libzhuyin-1.0.91.tar.gz -> libzhuyin-1.1.0.tar.gz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzhuyin-1.0.91/configure.ac new/libzhuyin-1.1.0/configure.ac --- old/libzhuyin-1.0.91/configure.ac 2015-08-13 04:42:32.0 +0200 +++ new/libzhuyin-1.1.0/configure.ac2015-12-17 08:11:48.0 +0100 @@ -5,8 +5,8 @@ # if not 1, append datestamp to the version number. m4_define([libzhuyin_released], [1]) m4_define([libzhuyin_major_version], [1]) -m4_define([libzhuyin_minor_version], [0]) -m4_define([libzhuyin_micro_version], [91]) +m4_define([libzhuyin_minor_version], [1]) +m4_define([libzhuyin_micro_version], [0]) m4_define(libzhuyin_maybe_datestamp, m4_esyscmd([if test x]libzhuyin_released[ != x1; then date +.%Y%m%d | tr -d '\n\r'; fi]))
commit libzhuyin for openSUSE:Factory
Hello community,
here is the log from the commit of package libzhuyin for openSUSE:Factory
checked in at 2015-08-27 08:55:48
Comparing /work/SRC/openSUSE:Factory/libzhuyin (Old)
and /work/SRC/openSUSE:Factory/.libzhuyin.new (New)
Package is "libzhuyin"
Changes:
--- /work/SRC/openSUSE:Factory/libzhuyin/libzhuyin.changes 2014-11-24
11:18:40.0 +0100
+++ /work/SRC/openSUSE:Factory/.libzhuyin.new/libzhuyin.changes 2015-08-27
08:55:54.0 +0200
@@ -1,0 +2,9 @@
+Sat Aug 22 18:14:28 UTC 2015 - i...@marguerite.su
+
+- update version 1.0.91
+ * add zhuyin_guess_candidates_before/after_cursor methods.
+ * add zhuyin_valid_zhuyin_keys method.
+- changes in 1.0.0
+ * support shuffle input
+
+---
Old:
libzhuyin-0.9.99.20140929.tar.gz
New:
libzhuyin-1.0.91.tar.gz
Other differences:
--
++ libzhuyin.spec ++
--- /var/tmp/diff_new_pack.kgZRJZ/_old 2015-08-27 08:55:55.0 +0200
+++ /var/tmp/diff_new_pack.kgZRJZ/_new 2015-08-27 08:55:55.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libzhuyin
#
-# Copyright (c) 2014 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
@@ -16,8 +16,9 @@
#
+%define soname 7
Name: libzhuyin
-Version:0.9.99.20140929
+Version:1.0.91
Release:0
Summary:Library to deal with zhuyin
License:GPL-2.0
@@ -45,12 +46,12 @@
for intelligent sentence-based Chinese zhuyin input methods.
-%package -n libzhuyin6
+%package -n libzhuyin%{soname}
Summary:Runtime libraries for libzhuyin
Group: System/Libraries
Requires: libzhuyin-data
-%description -n libzhuyin6
+%description -n libzhuyin%{soname}
The libzhuyin project aims to provide the algorithms core
for intelligent sentence-based Chinese zhuyin input methods.
@@ -69,8 +70,7 @@
%package devel
Summary:Development headers for libzhuyin
Group: Development/Libraries/C and C++
-#Requires: libzhuyin-tools = %{version}
-Requires: libzhuyin6 = %{version}
+Requires: libzhuyin%{soname} = %{version}
%description devel
The libzhuyin project aims to provide the algorithms core
@@ -86,26 +86,24 @@
pushd data &> /dev/null
tar -xf model9.text.tar.gz
popd &> /dev/null
-./autogen.sh
+NOCONFIGURE=1 ./autogen.sh
%build
%configure --prefix=%{_prefix} --libdir=%{_libdir}
make %{?_smp_mflags}
%install
-%make_install
-
+make install DESTDIR=%{buildroot} %{?_smp_mflags}
rm -rf %{buildroot}%{_libdir}/%{name}.{a,la}
%fdupes %{buildroot}
-%post -n libzhuyin6 -p /sbin/ldconfig
-
-%postun -n libzhuyin6 -p /sbin/ldconfig
+%post -n libzhuyin%{soname} -p /sbin/ldconfig
+%postun -n libzhuyin%{soname} -p /sbin/ldconfig
-%files -n libzhuyin6
+%files -n libzhuyin%{soname}
%defattr(-,root,root)
%doc AUTHORS ChangeLog README COPYING
%dir %{_libdir}/%{name}
@@ -118,9 +116,8 @@
%files devel
%defattr(-,root,root)
-%{_includedir}/%{name}-0.9.99
+%{_includedir}/%{name}-%{version}
%{_libdir}/%{name}.so
%{_libdir}/pkgconfig/%{name}.pc
-
%changelog
++ libzhuyin-0.9.99.20140929.tar.gz -> libzhuyin-1.0.91.tar.gz ++
2940 lines of diff (skipped)
commit libzhuyin for openSUSE:Factory
Hello community,
here is the log from the commit of package libzhuyin for openSUSE:Factory
checked in at 2014-11-24 11:18:11
Comparing /work/SRC/openSUSE:Factory/libzhuyin (Old)
and /work/SRC/openSUSE:Factory/.libzhuyin.new (New)
Package is "libzhuyin"
Changes:
--- /work/SRC/openSUSE:Factory/libzhuyin/libzhuyin.changes 2014-07-18
06:41:14.0 +0200
+++ /work/SRC/openSUSE:Factory/.libzhuyin.new/libzhuyin.changes 2014-11-24
11:18:40.0 +0100
@@ -1,0 +2,8 @@
+Thu Oct 23 15:14:20 UTC 2014 - hillw...@linuxfans.org
+
+- Update to 0.9.99.2014929
+ * bump so version
+ * add function zhuyin_get_zhuyin_key_rest_offset
+- Drop libzhuyin-tools, upstream have dropped it.
+
+---
Old:
libzhuyin-0.9.99.20140619.tar.gz
model8.text.tar.gz
New:
libzhuyin-0.9.99.20140929.tar.gz
model9.text.tar.gz
Other differences:
--
++ libzhuyin.spec ++
--- /var/tmp/diff_new_pack.UZUofA/_old 2014-11-24 11:18:42.0 +0100
+++ /var/tmp/diff_new_pack.UZUofA/_new 2014-11-24 11:18:42.0 +0100
@@ -15,51 +15,42 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
Name: libzhuyin
-Version: 0.9.99.20140619
+Version:0.9.99.20140929
Release: 0
-License: GPL-2.0
Summary: Library to deal with zhuyin
-Url: https://github.com/libzhuyin/libzhuyin
+License:GPL-2.0
Group: System/I18n/Chinese
+Url:https://github.com/libzhuyin/libzhuyin
Source:%{name}-%{version}.tar.gz
-Source1:
http://downloads.sourceforge.net/libzhuyin/models/model8.text.tar.gz
+Source1:
http://downloads.sourceforge.net/libzhuyin/models/model9.text.tar.gz
# PATCH-FIX-UPSTREAM marguer...@opensuse.org - no download when build
Patch: libzhuyin-no-download.patch
# PATCH-FIX-UPSTREAM marguer...@opensuse.org
# it will use current date eg. /usr/include/libzhuyin-0.9.99.20140716
# Don't do this
Patch1:libzhuyin-no-random-version-number-includedir.patch
+BuildRequires: db-devel
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: glib2-devel
BuildRequires: gnome-common
BuildRequires: libtool
-BuildRequires: db-devel
+Obsoletes: libzhuyin-tools < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
The libzhuyin project aims to provide the algorithms core
for intelligent sentence-based Chinese zhuyin input methods.
-%package tools
-Summary: Tools for libzhuyin
-Group: System/I18n/Chinese
-Requires(post):update-alternatives
-Requires(postun): update-alternatives
-
-%description tools
-The libzhuyin project aims to provide the algorithms core
-for intelligent sentence-based Chinese zhuyin input methods.
-
-This package provides the tools used to make data files.
-%package -n libzhuyin5
+%package -n libzhuyin6
Summary: Runtime libraries for libzhuyin
Group: System/Libraries
Requires: libzhuyin-data
-%description -n libzhuyin5
+%description -n libzhuyin6
The libzhuyin project aims to provide the algorithms core
for intelligent sentence-based Chinese zhuyin input methods.
@@ -78,8 +69,8 @@
%package devel
Summary: Development headers for libzhuyin
Group: Development/Libraries/C and C++
-Requires: libzhuyin5 = %{version}
-Requires: libzhuyin-tools = %{version}
+#Requires: libzhuyin-tools = %{version}
+Requires: libzhuyin6 = %{version}
%description devel
The libzhuyin project aims to provide the algorithms core
@@ -93,7 +84,7 @@
%patch1 -p1
cp -r %{SOURCE1} data
pushd data &> /dev/null
-tar -xf model8.text.tar.gz
+tar -xf model9.text.tar.gz
popd &> /dev/null
./autogen.sh
@@ -104,45 +95,21 @@
%install
%make_install
-# update-alternatives
-mkdir -p %{buildroot}%{_sysconfdir}/alternatives
-for alt in gen_binary_files gen_unigram import_interpolation ; do
- mv %{buildroot}%{_bindir}/${alt} %{buildroot}%{_bindir}/${alt}-zhuyin
- mv %{buildroot}%{_mandir}/man1/${alt}.1
%{buildroot}%{_mandir}/man1/${alt}-zhuyin.1
- touch %{buildroot}%{_sysconfdir}/alternatives/${alt}
- touch %{buildroot}%{_sysconfdir}/alternatives/${alt}.1.gz
- ln -sf %{_sysconfdir}/alternatives/${alt} %{buildroot}%{_bindir}/${alt}
- ln -sf %{_sysconfdir}/alternatives/${alt}.1.gz
%{buildroot}%{_mandir}/man1/
-done
rm -rf %{buildroot}%{_libdir}/%{name}.{a,la}
%fdupes %{buildroot}
-%post -n libzhuyin5 -p /sbin/ldconfig
+%post -n libzhuyin6 -p /sbin/ldconfig
-%postun -n libzhuyin5 -p /sbin/ldconfig
+%postun -n libzhuyin6 -p /sbin/ldconfig
-%post tools
-update-alternatives \
- --install %{_bindir}/gen_binary_files g
