diff --git a/.gitignore b/.gitignore index 69d55b1..596eb03 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -tomoe-0.6.0.tar.gz /tomoe-stripped-0.6.0.tar.gz diff --git a/sources b/sources index 64360bb..f295218 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (tomoe-0.6.0.tar.gz) = eab618d7b28fc9613c175fab6f80fc7d6acc34af3a47f20c11b42a32acd87143ae10caca67fa1a5e2e75441d431799a5725a5d507604f8bd7447bbc1826f0bb8 SHA512 (tomoe-stripped-0.6.0.tar.gz) = feb168805c804abe5c276e1f1668fb2580f67686d271d6ff8b70a1aa525bc11cc74b7baaeb88a7f38a4b09c10fad54cdf204af4b8fac3be90b1c52ecfad11ad0 diff --git a/tomoe-strerror.patch b/tomoe-strerror.patch deleted file mode 100644 index b6cca25..0000000 --- a/tomoe-strerror.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/lib/tomoe-xml-parser.c b/lib/tomoe-xml-parser.c -index a9e458b..fe50485 100644 ---- a/lib/tomoe-xml-parser.c -+++ b/lib/tomoe-xml-parser.c -@@ -441,7 +441,7 @@ tomoe_xml_parser_parse_dictionary_file (const gchar *filename, - f = fopen (filename, "rb"); - if (!f) { - g_warning ("failed to open dictionary file %s: %s", filename, -- sys_errlist[errno]); -+ strerror(errno)); - } - g_return_val_if_fail (f, FALSE); - diff --git a/tomoe.spec b/tomoe.spec index b74a790..69fdda8 100644 --- a/tomoe.spec +++ b/tomoe.spec @@ -3,10 +3,10 @@ Name: tomoe Version: 0.6.0 -Release: 58%{?dist} +Release: 43%{?dist} Summary: Handwritten input system for Japanese and Chinese -License: LGPL-2.1-or-later +License: LGPLv2+ URL: http://tomoe.sourceforge.jp/ ## stripped tarball is generated as follows: # $ wget http://downloads.sourceforge.net/sourceforge/tomoe/%{name}-%{version}.tar.gz @@ -17,9 +17,6 @@ Patch0: tomoe-0.6.0-multiarch-conflict.patch Patch1: tomoe-0.6.0-bz502662.patch Patch2: tomoe-0.6.0-fixes-glib-includes.patch Patch3: tomoe-0.6.0-fixes-set-parse-error.patch -Patch4: tomoe-strerror.patch - -BuildRequires: make BuildRequires: glib2-devel, gettext, gtk-doc, libtool, intltool BuildRequires: perl(XML::Parser), python3 %if %{python_binding} @@ -46,11 +43,10 @@ Install this package if you want to develop programs which use tomoe. %prep %setup -q -%patch -P0 -p0 -b .multiarch-conflict -%patch -P1 -p0 -b .bz502662 -%patch -P2 -p1 -b .glib -%patch -P3 -p1 -b .compile -%patch -P4 -p1 -b .strerror +%patch0 -p0 -b .multiarch-conflict +%patch1 -p0 -b .bz502662 +%patch2 -p1 -b .glib +%patch3 -p1 -b .compile %build ./autogen.sh @@ -72,6 +68,10 @@ find ${RPM_BUILD_ROOT}%{_libdir} -name '*.la' | xargs rm %find_lang %{name} + +%ldconfig_scriptlets + + %files -f %{name}.lang %doc AUTHORS COPYING NEWS README TODO data/kanjidic*.html %{_libdir}/libtomoe.so.* @@ -98,51 +98,6 @@ find ${RPM_BUILD_ROOT}%{_libdir} -name '*.la' | xargs rm %endif %changelog -* Fri Jul 25 2025 Fedora Release Engineering - 0.6.0-58 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sun Jan 19 2025 Fedora Release Engineering - 0.6.0-57 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Sat Jul 20 2024 Fedora Release Engineering - 0.6.0-56 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Jan 27 2024 Fedora Release Engineering - 0.6.0-55 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering - 0.6.0-54 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat May 6 2023 Peng Wu - 0.6.0-53 -- Rebuild the package - -* Sat May 6 2023 Peng Wu - 0.6.0-52 -- Migrate to SPDX license - -* Sat Jan 21 2023 Fedora Release Engineering - 0.6.0-51 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 0.6.0-50 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 0.6.0-49 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 0.6.0-48 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 0.6.0-47 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 0.6.0-46 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Thu Jul 23 2020 Jeff Law - 0.6.0-45 -- Use strerror, not sys_errlist - -* Fri Jan 31 2020 Fedora Release Engineering - 0.6.0-44 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - * Tue Aug 13 2019 Peng Wu - 0.6.0-43 - Disable python binding