From 64537392fbed1ba1bd83eaa98a2bd788d5c3e24c Mon Sep 17 00:00:00 2001 From: Takao Fujiwara Date: Thu, 2 May 2024 14:31:37 +0900 Subject: [PATCH] Bump to 1.5.30 --- .gitignore | 1 + ibus-1.5.30.tar.gz.sum | 4 ++++ ibus.spec | 21 +++++++++++++++------ sources | 2 +- 4 files changed, 21 insertions(+), 7 deletions(-) create mode 100644 ibus-1.5.30.tar.gz.sum diff --git a/.gitignore b/.gitignore index 92185c8..fe96e3e 100644 --- a/.gitignore +++ b/.gitignore @@ -71,3 +71,4 @@ ibus-1.3.6.tar.gz /ibus-1.5.30-rc1.tar.gz /ibus-1.5.30-rc2.tar.gz /ibus-1.5.30-rc3.tar.gz +/ibus-1.5.30.tar.gz diff --git a/ibus-1.5.30.tar.gz.sum b/ibus-1.5.30.tar.gz.sum new file mode 100644 index 0000000..7aa32da --- /dev/null +++ b/ibus-1.5.30.tar.gz.sum @@ -0,0 +1,4 @@ +cksum 4283112382 4124084 ibus-1.5.30.tar.gz +sha1sum cda03c8622d5817e1a968b38bd05240e2102928d ibus-1.5.30.tar.gz +sha256sum 05b84d4a45139face161596e5ade8e6c5da55cfaf6f194861da66516190f5b96 ibus-1.5.30.tar.gz +sha512sum cbed37bf62e8d8593c838f8ef7fe0b22bf8f4a661b887fc7be2f2768dda912075abdf3070c22b9699def90e7002aaaf7394f5fc590e12ef6ebb2bb5161cc29a0 ibus-1.5.30.tar.gz diff --git a/ibus.spec b/ibus.spec index d0b4012..4eeba1b 100644 --- a/ibus.spec +++ b/ibus.spec @@ -59,15 +59,16 @@ %global dbus_python_version 0.83.0 Name: ibus -Version: 1.5.30~rc3 +Version: 1.5.30 # https://github.com/fedora-infra/rpmautospec/issues/101 -Release: 2%{?dist} +Release: 1%{?dist} Summary: Intelligent Input Bus for Linux OS License: LGPL-2.1-or-later URL: https://github.com/ibus/%name/wiki Source0: https://github.com/ibus/%name/releases/download/%{source_version}/%{name}-%{source_version}.tar.gz -Source1: %{name}-xinput -Source2: %{name}.conf.5 +Source1: https://github.com/ibus/%name/releases/download/%{source_version}/%{name}-%{source_version}.tar.gz.sum +Source2: %{name}-xinput +Source3: %{name}.conf.5 # Patch0: %%{name}-HEAD.patch # #2267615 Patch1: %{name}-2267615-wayland-init-keymap.patch @@ -332,6 +333,11 @@ the functionality of the installed %{name} package. %prep +SAVED_SUM=$(grep sha512sum %SOURCE1 | awk '{print $2}') +MY_SUM=$(sha512sum %SOURCE0 | awk '{print $1}') +if test x"$SAVED_SUM" != x"$MY_SUM" ; then + abort +fi %autosetup -S git -n %{name}-%{source_version} # cp client/gtk2/ibusimcontext.c client/gtk3/ibusimcontext.c || : # cp client/gtk2/ibusim.c client/gtk3/ibusim.c || : @@ -401,7 +407,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-4.0/%{gtk4_binary_version}/immodules/libim-i %endif # install man page -for S in %{SOURCE2} +for S in %{SOURCE3} do cp $S . MP=`basename $S` @@ -410,7 +416,7 @@ do done # install xinput config file -install -pm 644 -D %{SOURCE1} $RPM_BUILD_ROOT%{_xinputconf} +install -pm 644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_xinputconf} install -m 755 -d $RPM_BUILD_ROOT%pkgcache/bus # `rpm -Vaq ibus` compare st_mode of struct stat with lstat(2) and @@ -614,6 +620,9 @@ dconf update || : %{_datadir}/installed-tests/ibus %changelog +* Thu May 02 2024 Takao Fujiwara - 1.5.30 +- Bump to 1.5.30 + * Fri Apr 12 2024 Takao Fujiwara - 1.5.30~rc3-2 - New sub package ibus-xinit for RHEL not to depend on xorg-x11-xinit diff --git a/sources b/sources index 7e4ff84..e378b48 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ibus-1.5.30-rc3.tar.gz) = 935a55e1d637f0e3ac9c2be63ae6bf175a4f35954780815b647bbdb097e6187ac8715704b5ff1219a4cf961788fc6b0be8df0adfc9c658967085ac3f4c5526ba +SHA512 (ibus-1.5.30.tar.gz) = cbed37bf62e8d8593c838f8ef7fe0b22bf8f4a661b887fc7be2f2768dda912075abdf3070c22b9699def90e7002aaaf7394f5fc590e12ef6ebb2bb5161cc29a0