Hello community, here is the log from the commit of package libpinyin for openSUSE:Factory checked in at 2014-07-17 17:31:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libpinyin (Old) and /work/SRC/openSUSE:Factory/.libpinyin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libpinyin" Changes: -------- --- /work/SRC/openSUSE:Factory/libpinyin/libpinyin.changes 2014-02-28 16:25:02.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libpinyin.new/libpinyin.changes 2014-07-17 17:31:42.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Jul 16 15:40:30 UTC 2014 - i...@marguerite.su + +- use update-alternatives to resolve conflicts with libzhuyin + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libpinyin.spec ++++++ --- /var/tmp/diff_new_pack.dxPVjE/_old 2014-07-17 17:31:43.000000000 +0200 +++ /var/tmp/diff_new_pack.dxPVjE/_new 2014-07-17 17:31:43.000000000 +0200 @@ -27,6 +27,7 @@ Url: https://github.com/libpinyin/libpinyin Source: %{name}-%{version}.tar.gz Source1: model7.text.tar.gz +Source99: baselibs.conf # PATCH-FIX-OPENSUSE marguer...@opensuse.org - avoid download at buildtime Patch: libpinyin-1.0.0-avoid_download_at_buildtime.patch BuildRequires: gcc-c++ @@ -88,6 +89,20 @@ It aims to be an Intelligent (and Universal) Sentence-based Pinyin IME Backend supports many Language Models and Frontends. +%package tools +Summary: Tools for libpinyin +Group: System/I18n/Chinese +Requires(post): update-alternatives +Requires(postun): update-alternatives + +%description tools +Libpinyin is a staging joint effort of many Chinese Pinyin IME development teams. +It aims to be an Intelligent (and Universal) Sentence-based Pinyin IME Backend +supports many Language Models and Frontends. + +This package provides the tools used to make data files. + + %prep %setup -q cp -r %{SOURCE1} data/ @@ -95,13 +110,23 @@ ./autogen.sh %build -%configure +%configure --disable-static make %{?_smp_mflags} %install -make install DESTDIR=%{buildroot} -rm -rf %{buildroot}%{_libdir}/%{name}.a -rm -rf %{buildroot}%{_libdir}/%{name}.la +%makeinstall +find %{buildroot}%{_libdir} -name "*.la" -type f -delete -print + +# 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}-pinyin + mv %{buildroot}%{_mandir}/man1/${alt}.1 %{buildroot}%{_mandir}/man1/${alt}-pinyin.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 %if 0%{?suse_version} %fdupes %{buildroot} @@ -113,12 +138,46 @@ %postun -n %{lname} -p /sbin/ldconfig +%post tools +update-alternatives \ + --install %{_bindir}/gen_binary_files gen_binary_files %{_bindir}/gen_binary_files-pinyin 20 \ + --slave %{_bindir}/gen_unigram gen_unigram %{_bindir}/gen_unigram-pinyin \ + --slave %{_bindir}/import_interpolation import_interpolation %{_bindir}/import_interpolation-pinyin \ + --slave %{_mandir}/man1/gen_binary_files.1.gz gen_binary_files.1.gz %{_mandir}/man1/gen_binary_files-pinyin.1.gz \ + --slave %{_mandir}/man1/gen_unigram.1.gz gen_unigram.1.gz %{_mandir}/man1/gen_unigram-pinyin.1.gz \ + --slave %{_mandir}/man1/import_interpolation.1.gz import_interpolation.1.gz %{_mandir}/man1/import_interpolation-pinyin.1.gz + +%postun tools +if [ $1 -eq 0 ] ; then + update-alternatives --remove gen_binary_files %{_bindir}/gen_binary_files-pinyin +fi + %files -n %{lname} %defattr(-,root,root) %doc ChangeLog AUTHORS COPYING README -%{_mandir}/man1/* -%{_bindir}/* %{_libdir}/%{name}.so.* +%{_mandir}/man1/libpinyin.1.gz + +%files tools +%defattr(-,root,root) +%{_bindir}/gen_binary_files +%{_bindir}/gen_unigram +%{_bindir}/import_interpolation +%{_bindir}/gen_binary_files-pinyin +%{_bindir}/gen_unigram-pinyin +%{_bindir}/import_interpolation-pinyin +%{_mandir}/man1/gen_binary_files.1.gz +%{_mandir}/man1/gen_unigram.1.gz +%{_mandir}/man1/import_interpolation.1.gz +%{_mandir}/man1/gen_binary_files-pinyin.1.gz +%{_mandir}/man1/gen_unigram-pinyin.1.gz +%{_mandir}/man1/import_interpolation-pinyin.1.gz +%ghost %{_sysconfdir}/alternatives/gen_binary_files +%ghost %{_sysconfdir}/alternatives/gen_unigram +%ghost %{_sysconfdir}/alternatives/import_interpolation +%ghost %{_sysconfdir}/alternatives/gen_binary_files.1.gz +%ghost %{_sysconfdir}/alternatives/gen_unigram.1.gz +%ghost %{_sysconfdir}/alternatives/import_interpolation.1.gz %files data %defattr(-,root,root) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org