Hello community, here is the log from the commit of package kakasi for openSUSE:Factory checked in at 2014-07-28 06:50:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kakasi (Old) and /work/SRC/openSUSE:Factory/.kakasi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kakasi" Changes: -------- --- /work/SRC/openSUSE:Factory/kakasi/kakasi.changes 2012-06-01 07:20:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kakasi.new/kakasi.changes 2014-07-28 06:50:39.000000000 +0200 @@ -1,0 +2,11 @@ +Sun Jul 27 18:02:08 UTC 2014 - [email protected] + +- update version 2.3.6 + * see NEWS if you know Japanese +- drop bugzilla-154848-array-subscript-out-of-range.patch + * upstream fixed +- drop kakasi-2.3.4-fclose.patch + * upstream fixed +- add kakasi-2.3.6-no-return-in-nonvoid-function.patch + +------------------------------------------------------------------- Old: ---- bugzilla-154848-array-subscript-out-of-range.patch kakasi-2.3.4-fclose.patch kakasi-2.3.4.tar.bz2 New: ---- kakasi-2.3.6-no-return-in-nonvoid-function.patch kakasi-2.3.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kakasi.spec ++++++ --- /var/tmp/diff_new_pack.4MIvPx/_old 2014-07-28 06:50:40.000000000 +0200 +++ /var/tmp/diff_new_pack.4MIvPx/_new 2014-07-28 06:50:40.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package kakasi # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -17,36 +17,18 @@ Name: kakasi -Version: 2.3.4 +Version: 2.3.6 Release: 0 -Requires: kakasi-dict = %{version} -Url: http://kakasi.namazu.org/ -Source0: ftp://kakasi.namazu.org/pub/kakasi/stable/%{name}-%{version}.tar.bz2 -Patch0: bugzilla-154848-array-subscript-out-of-range.patch -Patch1: kakasi-2.3.4-fclose.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Filter to Convert Kanji Characters to Hiragana, Katakana, or Romaji License: GPL-2.0+ Group: Productivity/Text/Convertors +Url: http://kakasi.namazu.org/ +Source: http://kakasi.namazu.org/stable/%{name}-%{version}.tar.gz +# PATCH-FIX-UPSTREAM [email protected] +Patch: kakasi-2.3.6-no-return-in-nonvoid-function.patch BuildRequires: automake -#Summary(ja): 漢字→かな(ローマ字)変換プログラム -# %description -l ja -# KAKASI は漢字かなまじり文をひらがな文やローマ字文に変換することを -# 目的として作成したプログラムと辞書の総称です。さらに、バージョン -# 2.3.0 からは、分かち書きパッチがマージされました。 -# -# Authors: -# -------- -# Originator: -# Hironobu Takahashi <[email protected]> -# -# Members of KAKASI Project (Maintainers): -# Hajime BABA <[email protected]> -# NOKUBI Takatsugu <[email protected]> -# Satoru Takabayashi <[email protected]> -# Ken-ichi Hirose <[email protected]> -# Ryuji Abe <[email protected]> -# +Requires: kakasi-dict = %{version} +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description KAKASI is the language processing filter to convert Kanji characters to @@ -62,71 +44,70 @@ (1) "Romaji" is an alphabetical description of Japanese pronunciation. -%package -n kakasi-devel -Summary: header file and libraries of KAKASI -Group: Productivity/Text/Convertors -# Summary(ja): KAKASIのヘッダファイル及びライブラリです。 +%package devel +Summary: Header file and libraries of KAKASI +Group: Development/Libraries/C and C++ Requires: %{name} = %{version} -Provides: kakaside -Obsoletes: kakaside -# %description -n kakasi-devel -l ja -# KAKASIのヘッダファイル及びライブラリです。 +Provides: kakaside = %{version} +Obsoletes: kakaside < %{version} -%description -n kakasi-devel +%description devel header file and libraries of KAKASI -%package -n kakasi-dict +%package dict Summary: The base dictionary of KAKASI Group: Productivity/Text/Convertors -# Summary(ja): KAKASIの基本辞書です。 -Provides: kakasidi -Obsoletes: kakasidi -# %description -n kakasi-dict -l ja -# KAKASIの基本辞書です。 +Provides: kakasidi = %{version} +Obsoletes: kakasidi < %{version} -%description -n kakasi-dict +%description dict The base dictionary of KAKASI %prep -%setup0 -q -%patch0 -p1 -%patch1 +%setup -q +%patch -p1 +# w: version-control-internal-file +rm -rf doc/CVS +# non-linux-readme +rm -rf doc/README.*OS* %build -cp /usr/share/automake*/config.{guess,sub} . +cp %{_datadir}/automake*/config.{guess,sub} . %configure --disable-static --with-pic make %{?_smp_mflags} %install -make DESTDIR=$RPM_BUILD_ROOT install -gzip --best $RPM_BUILD_DIR/%{name}-%{version}/doc/kakasi.1 -mkdir -p $RPM_BUILD_ROOT/usr/share/man/ja/man1 -install -m 644 $RPM_BUILD_DIR/%{name}-%{version}/doc/kakasi.1.gz \ - $RPM_BUILD_ROOT/usr/share/man/ja/man1 -rm -f %{buildroot}%{_libdir}/*.la +make DESTDIR=%{buildroot} install %{?_smp_mflags} +find %{buildroot} -type f -name "*.la" -delete -print %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -%defattr(-, root, root) -%doc AUTHORS COPYING NEWS ONEWS INSTALL* README* THANKS TODO -%doc ChangeLog +%defattr(-,root,root) +%doc AUTHORS COPYING NEWS ONEWS README* THANKS TODO ChangeLog %doc ./doc/* -%{_bindir}/* -%{_libdir}/libkakasi.so.* -/usr/share/man/ja/man1/kakasi.1.gz -%dir /usr/share/kakasi/ -/usr/share/kakasi/itaijidict - -%files -n kakasi-devel -%defattr(-, root, root) -/usr/include/* +%{_bindir}/atoc_conv +%{_bindir}/kakasi +%{_bindir}/kakasi-config +%{_bindir}/mkkanwa +%{_bindir}/rdic_conv +%{_bindir}/wx2_conv +%{_libdir}/libkakasi.so.2 +%{_libdir}/libkakasi.so.2.1.0 +%dir %{_datadir}/kakasi +%{_datadir}/kakasi/itaijidict +%{_mandir}/man1/kakasi.1.gz +%{_mandir}/man1/kakasi-config.1.gz + +%files devel +%defattr(-,root,root) +%{_includedir}/libkakasi.h %{_libdir}/libkakasi.so -%files -n kakasi-dict -%defattr(-, root, root) -/usr/share/kakasi/kanwadict +%files dict +%defattr(-,root,root) +%{_datadir}/kakasi/kanwadict %changelog ++++++ kakasi-2.3.6-no-return-in-nonvoid-function.patch ++++++ Index: kakasi-2.3.6/lib/libhh2.c =================================================================== --- kakasi-2.3.6.orig/lib/libhh2.c +++ kakasi-2.3.6/lib/libhh2.c @@ -848,5 +848,6 @@ H2H(c, n) n[0].c2 = 0; return 1; } + return 0; } #endif /* WAKATIGAKI */ Index: kakasi-2.3.6/src/hh2.c =================================================================== --- kakasi-2.3.6.orig/src/hh2.c +++ kakasi-2.3.6/src/hh2.c @@ -848,5 +848,7 @@ H2H(c, n) n[0].c2 = 0; return 1; } + return 0; } + #endif /* WAKATIGAKI */ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
