diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000000000000000000000000000000000..b9b85422a1a2e3abfdce6aa9f26cc39c29b372c1 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +*.xz filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text diff --git a/.lfsconfig b/.lfsconfig new file mode 100644 index 0000000000000000000000000000000000000000..2cd0dda83096789a34f56b26fadf0ecd4a9e5e8c --- /dev/null +++ b/.lfsconfig @@ -0,0 +1,2 @@ +[lfs] + url = https://artlfs.openeuler.openatom.cn/src-openEuler/sunpinyin diff --git a/0001-add-loongarch64-support.patch b/0001-add-loongarch64-support.patch index 0d510154ef409745f112370f4b809e5cd80d77ef..594f6c5c100f440320aa9ce068ddc3517d95c7f6 100644 --- a/0001-add-loongarch64-support.patch +++ b/0001-add-loongarch64-support.patch @@ -5,9 +5,7 @@ Subject: [PATCH] add loongarch64 support --- SConstruct | 3 ++- - SConstruct.python3 | 3 ++- - SConstruct.scons | 3 ++- - 3 files changed, 6 insertions(+), 3 deletions(-) + 1 file changed, 2 insertions(+), 1 deletions(-) diff --git a/SConstruct b/SConstruct index 866a729..a2d2bf4 100644 @@ -22,34 +20,6 @@ index 866a729..a2d2bf4 100644 + || defined(__loongarch64) || defined(__loongarch64__) # undef WORDS_BIGENDIAN - #else -diff --git a/SConstruct.python3 b/SConstruct.python3 -index 7d9dd6f..4b3369f 100644 ---- a/SConstruct.python3 -+++ b/SConstruct.python3 -@@ -335,7 +335,8 @@ def AppendEndianCheck(conf): - || defined(__alpha__) || defined(__ARMEL__) \ - || defined(_MIPSEL) || (defined(__sh__) && defined(__LITTLE_ENDIAN__)) \ - || defined(__riscv) \ -- || defined(__AARCH64EL__) -+ || defined(__AARCH64EL__) \ -+ || defined(__loongarch64) || defined(__loongarch64__) - # undef WORDS_BIGENDIAN - - #else -diff --git a/SConstruct.scons b/SConstruct.scons -index 530e1f4..241878a 100644 ---- a/SConstruct.scons -+++ b/SConstruct.scons -@@ -335,7 +335,8 @@ def AppendEndianCheck(conf): - || defined(__alpha__) || defined(__ARMEL__) \ - || defined(_MIPSEL) || (defined(__sh__) && defined(__LITTLE_ENDIAN__)) \ - || defined(__riscv) \ -- || defined(__AARCH64EL__) -+ || defined(__AARCH64EL__) \ -+ || defined(__loongarch64) || defined(__loongarch64__) - # undef WORDS_BIGENDIAN - #else -- 2.27.0 diff --git a/dict.utf8-20131214.tar.bz2 b/dict.utf8-20131214.tar.bz2 index 99c7afe25710553eb5aa8a1cb76c250652cb2295..61c4d1a86d87b1278744f5a70931e188200de462 100644 Binary files a/dict.utf8-20131214.tar.bz2 and b/dict.utf8-20131214.tar.bz2 differ diff --git a/lm_sc.3gm.arpa-20140820.tar.bz2 b/lm_sc.3gm.arpa-20140820.tar.bz2 index 1658288f6faf750f872fe247ce98cec6cb62a455..254b79d9dcd390117ad69d9a94da46edffbdfe28 100644 Binary files a/lm_sc.3gm.arpa-20140820.tar.bz2 and b/lm_sc.3gm.arpa-20140820.tar.bz2 differ diff --git a/sunpinyin-20190805.tar.xz b/sunpinyin-20190805.tar.xz index fe57c082f0d60a4b19ea71c0e6ec432d6ab27097..26c72d62de5f68098596f1c5aa426cfbced983bd 100644 Binary files a/sunpinyin-20190805.tar.xz and b/sunpinyin-20190805.tar.xz differ diff --git a/sunpinyin.spec b/sunpinyin.spec index 408124048c7c5c45e796cd521096c583439bf550..c67a0db91f1b1036f784b64d1d6d235783c31ecd 100644 --- a/sunpinyin.spec +++ b/sunpinyin.spec @@ -1,12 +1,9 @@ -# TODO: fixes scons to generate debug information -#%%global debug_package %{nil} - %define _xinputconf %{_sysconfdir}/X11/xinit/xinput.d/xsunpinyin.conf %define gitdate 20190805 Name: sunpinyin Version: 3.0.0 -Release: 5 +Release: 6 Summary: A statistical language model based Chinese input method engine License: LGPL-2.0-only or CDDL-1.0 or CC-BY-SA-3.0 Obsoletes: %{name}-data-le @@ -17,7 +14,7 @@ Source2: http://downloads.sourceforge.net/project/open-gram/lm_sc.3gm.arpa-20140 Source3: http://downloads.sourceforge.net/project/open-gram/dict.utf8-20131214.tar.bz2 Patch0: sunpinyin-use-python3.patch Patch1: sunpinyin-fixes-scons.patch -Patch2: 0001-add-loongarch64-support.patch +Patch2: 0001-add-loongarch64-support.patch Patch3: 0002-fix-sprintf.patch BuildRequires: gcc-c++, sqlite-devel, gettext, python3-scons, perl(Pod::Man), python3-devel @@ -38,11 +35,7 @@ The %{name}-devel package contains libraries and header files that allows user to write their own front-end for sunpinyin. %prep -%setup -q -n %{name}-%{gitdate} -%patch0 -p1 -b .python3 -%patch1 -p1 -b .scons -%patch2 -p1 -%patch3 -p1 +%autosetup -p1 -n %{name}-%{gitdate} mkdir -p raw cp %SOURCE2 raw @@ -52,12 +45,11 @@ tar xvf lm_sc.3gm.arpa-20140820.tar.bz2 tar xvf dict.utf8-20131214.tar.bz2 popd # fix strip -sed -i 's|-Wall|-Wall -s -g|' SConstruct SConstruct.python3 SConstruct.scons -sed -i 's|-std=c++11|-std=c++11 -s -g|' SConstruct SConstruct.python3 SConstruct.scons +sed -i 's|-Wall|-Wall -s -g|' SConstruct +sed -i 's|-std=c++11|-std=c++11 -s -g|' SConstruct %build -# export CFLAGS, CXXFLAGS, LDFLAGS, ... -%configure || : +%set_build_flags scons %{?_smp_mflags} --prefix=%{_prefix} --libdir=%{_libdir} --datadir=%{_datadir} export PATH=`pwd`/src:$PATH @@ -67,25 +59,21 @@ make %{?_smp_mflags} VERBOSE=1 popd %install +%set_build_flags scons %{?_smp_mflags} --prefix=%{_prefix} --libdir=%{_libdir} --datadir=%{_datadir} install --install-sandbox=%{buildroot} pushd raw make install DESTDIR=%{buildroot} INSTALL="install -p" popd -install -m0644 AUTHORS TODO %{buildroot}%{_docdir}/%{name} - -%ldconfig_scriptlets +rm -fr %{buildroot}%{_docdir}/%{name} %files %license COPYING *.LICENSE +%doc AUTHORS TODO doc/README doc/SLM-*.mk %{_libdir}/libsunpinyin*.so.* %{_datadir}/%{name} %{_bindir}/* -%{_mandir}/man1/*.1.gz -%{_docdir}/%{name}/SLM-*.mk -%{_docdir}/%{name}/README -%{_docdir}/%{name}/AUTHORS -%{_docdir}/%{name}/TODO +%{_mandir}/man1/* %files devel %{_libdir}/libsunpinyin*.so @@ -93,6 +81,9 @@ install -m0644 AUTHORS TODO %{buildroot}%{_docdir}/%{name} %{_includedir}/sunpinyin* %changelog +* Tue Jul 29 2025 Funda Wang - 3.0.0-6 +- set build flags also in install section + * Fri Jun 7 2024 technology208 - 3.0.0-5 - Fix that the memory parameter range of sprintf cannot overlap