Hello community, here is the log from the commit of package sunpinyin for openSUSE:Factory checked in at 2015-08-27 08:57:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sunpinyin (Old) and /work/SRC/openSUSE:Factory/.sunpinyin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sunpinyin" Changes: -------- --- /work/SRC/openSUSE:Factory/sunpinyin/sunpinyin.changes 2013-03-26 07:03:05.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.sunpinyin.new/sunpinyin.changes 2015-08-27 08:57:19.000000000 +0200 @@ -1,0 +2,8 @@ +Sun Aug 23 15:25:49 UTC 2015 - [email protected] + +- Update to version 2.0.4+git20150706.cf18102: + + fix pod2man invocations +- drop sunpinyin-gcc47.patch, forgot to delete the file +- add patch: no-download.patch, don't download dicts online + +------------------------------------------------------------------- Old: ---- dict.utf8.tar.bz2 lm_sc.t3g.arpa.tar.bz2 sunpinyin-2.0.4.tar.bz2 sunpinyin-gcc47.patch New: ---- _servicedata dict.utf8-20131214.tar.bz2 lm_sc.3gm.arpa-20140820.tar.bz2 no-download.patch sunpinyin-2.0.4+git20150706.cf18102.tar.xz sunpinyin-dictgen-local.mk.in ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sunpinyin.spec ++++++ --- /var/tmp/diff_new_pack.TvEA6L/_old 2015-08-27 08:57:20.000000000 +0200 +++ /var/tmp/diff_new_pack.TvEA6L/_new 2015-08-27 08:57:20.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package sunpinyin # -# Copyright (c) 2010 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 @@ -17,26 +17,26 @@ Name: sunpinyin -Version: 2.0.4 -Release: 1 -License: LGPL-2.1+ +Version: 2.0.4+git20150706.cf18102 +Release: 0 Summary: A Statistical Language Model Based Chinese Input Method -Url: http://sunpinyin.org +License: LGPL-2.1+ Group: System/I18n/Chinese -Source: %{name}-%{version}.tar.bz2 -Source1: lm_sc.t3g.arpa.tar.bz2 -Source2: dict.utf8.tar.bz2 -Patch: sunpinyin-aarch64.patch -BuildRequires: scons -%if 0%{?suse_version} -BuildRequires: sqlite3-devel -%else -BuildRequires: sqlite-devel -%endif +Url: https://github.com/sunpinyin/sunpinyin +Source: %{name}-%{version}.tar.xz +Source1: http://jaist.dl.sourceforge.net/project/open-gram/lm_sc.3gm.arpa-20140820.tar.bz2 +Source2: http://jaist.dl.sourceforge.net/project/open-gram/dict.utf8-20131214.tar.bz2 +Source3: sunpinyin-dictgen-local.mk.in +Patch0: sunpinyin-aarch64.patch +#PATCH-FIX-UPSTREAM [email protected] do not download online +Patch1: no-download.patch BuildRequires: gcc-c++ BuildRequires: gtk2-devel -BuildRequires: python-devel BuildRequires: pkg-config +BuildRequires: python-devel +BuildRequires: scons +BuildRequires: sqlite3-devel +BuildRequires: xz BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -45,43 +45,113 @@ %package -n lib%{name}3 Summary: Libraries for Sunpinyin Group: System/Libraries -Provides: %{name} = %{version} %description -n lib%{name}3 Sunpinyin is a statistical language model based Chinese input method engine. to model the Chinese language, it use a backoff bigram and trigram language model. +%package data +Summary: Data files for Sunpinyin +Group: System/I18n/Chinese + +%description data +Sunpinyin is a statistical language model based Chinese input method engine. to model the Chinese language, it use a backoff bigram and trigram language model. + +This package provides data files needed by it. + +%package tools +Summary: Dictionary tools for Sunpinyin +Group: System/I18n/Chinese + +%description tools +Sunpinyin is a statistical language model based Chinese input method engine. to model the Chinese language, it use a backoff bigram and trigram language model. + +This package provides dictionary tools needed by it. + %package devel Summary: Development Files for Sunpinyin Group: Development/Libraries/Other -Requires: %{name} = %{version} +Requires: lib%{name}3 = %{version} +Requires: sunpinyin-tools = %{version} Provides: lib%{name}-devel = %{version} Obsoletes: lib%{name}-devel < %{version} %description devel Sunpinyin is a statistical language model based Chinese input method engine. to model the Chinese language, it use a backoff bigram and trigram language model. +This package provides development headers for it. + %prep %setup -q -%patch -p1 +%patch0 -p1 +%patch1 -p1 +cp -r %{SOURCE1} . +cp -r %{SOURCE2} . +cp -r %{SOURCE3} src %build -%{__cp} -r %{S:1} ./raw/ -%{__cp} -r %{S:2} ./raw/ - +export CXXFLAGS+="%{optflags}" scons --prefix=%{_prefix} %install scons --prefix=%{_prefix} --libdir=%{_libdir} --install-sandbox=%{buildroot} install +# make dicts +src/sunpinyin-dictgen-local +mkdir -p %{buildroot}%{_datadir}/%{name} +install -m 0644 lm_sc.t3g %{buildroot}%{_datadir}/%{name} +install -m 0644 pydict_sc.bin %{buildroot}%{_datadir}/%{name} + +# fix doc +rm -rf %{buildroot}%{_datadir}/doc/%{name} + %post -n lib%{name}3 -p /sbin/ldconfig %postun -n lib%{name}3 -p /sbin/ldconfig +%post -n %{name}-tools -p /sbin/ldconfig + +%postun -n %{name}-tools -p /sbin/ldconfig + %files -n lib%{name}3 %defattr(-,root,root) -%doc AUTHORS NEWS LGPL.LICENSE +%doc AUTHORS NEWS LGPL.LICENSE doc/README doc/SLM-inst.mk doc/SLM-train.mk %{_libdir}/lib%{name}.so.* -/usr/lib/%{name}/ + +%files data +%defattr(-,root,root) +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/lm_sc.t3g +%{_datadir}/%{name}/pydict_sc.bin + +%files tools +%defattr(-,root,root) +%{_bindir}/genpyt +%{_bindir}/getwordfreq +%{_bindir}/idngram_merge +%{_bindir}/ids2ngram +%{_bindir}/mmseg +%{_bindir}/slmbuild +%{_bindir}/slminfo +%{_bindir}/slmpack +%{_bindir}/slmprune +%{_bindir}/slmseg +%{_bindir}/slmthread +%{_bindir}/%{name}-dictgen +%{_bindir}/tslmendian +%{_bindir}/tslminfo +%{_mandir}/man1/genpyt.1.gz +%{_mandir}/man1/getwordfreq.1.gz +%{_mandir}/man1/idngram_merge.1.gz +%{_mandir}/man1/ids2ngram.1.gz +%{_mandir}/man1/mmseg.1.gz +%{_mandir}/man1/slmbuild.1.gz +%{_mandir}/man1/slminfo.1.gz +%{_mandir}/man1/slmpack.1.gz +%{_mandir}/man1/slmprune.1.gz +%{_mandir}/man1/slmseg.1.gz +%{_mandir}/man1/slmthread.1.gz +%{_mandir}/man1/tslmendian.1.gz +%{_mandir}/man1/tslminfo.1.gz %files devel %defattr(-,root,root) ++++++ _service ++++++ --- /var/tmp/diff_new_pack.TvEA6L/_old 2015-08-27 08:57:20.000000000 +0200 +++ /var/tmp/diff_new_pack.TvEA6L/_new 2015-08-27 08:57:20.000000000 +0200 @@ -1,13 +1,17 @@ <services> - <service name="tar_scm" mode="localonly"> - - - - - <param name="history-depth">1</param><param name="url">git://github.com/sunpinyin/sunpinyin.git</param><param name="versionprefix">2.0.4git</param><param name="scm">git</param></service> - <service name="recompress" mode="localonly"> - <param name="file">*.tar</param> - <param name="compression">bz2</param> - </service> - <service name="set_version" mode="localonly"/> + <service name="tar_scm" mode="disabled"> + <param name="url">https://github.com/sunpinyin/sunpinyin/</param> + <param name="scm">git</param> + <param name="exclude">.git</param> + <param name="versionformat">2.0.4+git%cd.%h</param> + <param name="revision">master</param> + <param name="changesgenerate">enable</param> + </service> + <service name="recompress" mode="disabled"> + <param name="file">sunpinyin-*.tar</param> + <param name="compression">xz</param> + </service> + <service name="set_version" mode="disabled"> + <param name="basename">sunpinyin</param> + </service> </services> ++++++ _servicedata ++++++ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/sunpinyin/sunpinyin/</param> <param name="changesrevision">cf1810220bf3d3f5a8b990b0a9d3e9df21b1942c</param></service></servicedata>++++++ no-download.patch ++++++ Index: sunpinyin-2.0.4+git20150706.cf18102/src/SConscript =================================================================== --- sunpinyin-2.0.4+git20150706.cf18102.orig/src/SConscript +++ sunpinyin-2.0.4+git20150706.cf18102/src/SConscript @@ -56,4 +56,15 @@ env.Command('sunpinyin-dictgen', 'sunpin Chmod("$TARGET", 0755), ]) +env.Substfile('sunpinyin-dictgen-local.mk.in', SUBST_DICT={ + '@MAKE@': env['MAKE'], + '@TAR@': env['TAR'], + '@DATADIR@': env['DATADIR'], + '@ENDIANNESS@': env['ENDIANNESS'], +}) +env.Command('sunpinyin-dictgen-local', 'sunpinyin-dictgen-local.mk', [ + Copy("$TARGET", "$SOURCE"), + Chmod("$TARGET", 0755), +]) + # -*- indent-tabs-mode: nil -*- vim:et:ts=4 ++++++ sunpinyin-aarch64.patch ++++++ --- /var/tmp/diff_new_pack.TvEA6L/_old 2015-08-27 08:57:20.000000000 +0200 +++ /var/tmp/diff_new_pack.TvEA6L/_new 2015-08-27 08:57:20.000000000 +0200 @@ -1,20 +1,20 @@ -Index: sunpinyin-2.0.4/SConstruct +Index: sunpinyin-2.0.4+git20150706.cf18102/SConstruct =================================================================== ---- sunpinyin-2.0.4.orig/SConstruct -+++ sunpinyin-2.0.4/SConstruct -@@ -242,6 +242,7 @@ def AppendEndianCheck(conf): +--- sunpinyin-2.0.4+git20150706.cf18102.orig/SConstruct ++++ sunpinyin-2.0.4+git20150706.cf18102/SConstruct +@@ -320,6 +320,7 @@ def AppendEndianCheck(conf): || defined(_POWER) || defined(__powerpc__) \ || defined(__ppc__) || defined(__hpux) || defined(__hppa) \ || defined(_MIPSEB) || defined(_POWER) \ + || defined(__AARCH64EB__) \ - || defined(__s390__) || (defined(__sh__) && defined(__BIG_ENDIAN__)) + || defined(__s390__) || (defined(__sh__) && defined(__BIG_ENDIAN__)) \ + || defined(__AARCH64EB__) # define WORDS_BIGENDIAN 1 - -@@ -253,6 +254,7 @@ def AppendEndianCheck(conf): +@@ -332,6 +333,7 @@ def AppendEndianCheck(conf): || defined(__x86_64) || defined(__x86_64__) \ || defined(_M_X64) || defined(__bfin__) \ || defined(__alpha__) || defined(__ARMEL__) \ + || defined(__AARCH64EL__) \ - || defined(_MIPSEL) || (defined(__sh__) && defined(__LITTLE_ENDIAN__)) + || defined(_MIPSEL) || (defined(__sh__) && defined(__LITTLE_ENDIAN__)) \ + || defined(__AARCH64EL__) # undef WORDS_BIGENDIAN - ++++++ sunpinyin-dictgen-local.mk.in ++++++ #!/usr/bin/@MAKE@ -f # -*- mode: makefile; indent-tabs-mode: t -*- vim:noet:ts=4 TAR = @TAR@ ENDIANNESS = @ENDIANNESS@ all: pydict_sc.bin dict.utf8: ${TAR} -xf dict.utf8-*.tar.bz2 lm_sc.3gm.arpa: ${TAR} -xf lm_sc.3gm.arpa-*.tar.bz2 lm_sc.3gm: lm_sc.3gm.arpa dict.utf8 src/slmpack $^ $@ lm_sc.t3g.orig: lm_sc.3gm src/slmthread $^ $@ lm_sc.t3g: lm_sc.t3g.orig src/tslmendian -e ${ENDIANNESS} -i $^ -o $@ pydict_sc.bin: dict.utf8 lm_sc.t3g src/genpyt -e ${ENDIANNESS} -i dict.utf8 -s lm_sc.t3g \ -l pydict_sc.log -o $@
