diff --git a/ibus.spec b/ibus.spec index c071d65d9c76035a41a85487593f0c116c5d2e01..34985fedf61f56892bcb6b41dd2303a59676aa52 100644 --- a/ibus.spec +++ b/ibus.spec @@ -1,4 +1,4 @@ -%define anolis_release 1 +%define anolis_release 2 %global with_pkg_config %(pkg-config --version >/dev/null 2>&1 && echo -n "1" || echo -n "0") %global ibus_api_version 1.0 @@ -10,7 +10,6 @@ %bcond_without gtk4 %if %with_pkg_config -%{!?gtk2_binary_version: %global gtk2_binary_version %(pkg-config --variable=gtk_binary_version gtk+-2.0)} %{!?gtk3_binary_version: %global gtk3_binary_version %(pkg-config --variable=gtk_binary_version gtk+-3.0)} %if %{with gtk4} %{!?gtk4_binary_version: %global gtk4_binary_version %(pkg-config --variable=gtk_binary_version gtk4)} @@ -19,7 +18,6 @@ %endif %global glib_ver %([ -a %{_libdir}/pkgconfig/glib-2.0.pc ] && pkg-config --modversion glib-2.0 | cut -d. -f 1,2 || echo -n "999") %else -%{!?gtk2_binary_version: %global gtk2_binary_version ?.?.?} %{!?gtk3_binary_version: %global gtk3_binary_version ?.?.?} %{!?gtk4_binary_version: %global gtk4_binary_version ?.?.?} %global glib_ver 0 @@ -44,7 +42,6 @@ BuildRequires: gettext-devel BuildRequires: libtool # for gtkdoc-fixxref BuildRequires: glib2-doc -BuildRequires: gtk2-devel BuildRequires: gtk3-devel %if %{with gtk4} BuildRequires: gtk4-devel @@ -70,7 +67,6 @@ BuildRequires: systemd BuildRequires: libXtst-devel Requires: %{name}-libs%{?_isa} = %{version}-%{release} -Requires: (%{name}-gtk2%{?_isa} = %{version}-%{release} if gtk2) Requires: %{name}-gtk3%{?_isa} = %{version}-%{release} Requires: %{name}-setup = %{version}-%{release} @@ -107,17 +103,6 @@ Requires: gobject-introspection %description libs This package contains the libraries for IBus -%package gtk2 -Summary: IBus IM module for GTK2 -Requires: %{name}-libs%{?_isa} = %{version}-%{release} -Requires: glib2 >= %{glib_ver} -Requires(post): glib2 >= %{glib_ver} -Provides: ibus-gtk = %{version}-%{release} -Obsoletes: ibus-gtk < %{version}-%{release} - -%description gtk2 -This package contains IBus IM module for GTK2 - %package gtk3 Summary: IBus IM module for GTK3 Requires: %{name}-libs%{?_isa} = %{version}-%{release} @@ -200,30 +185,13 @@ the functionality of the installed %{name} package. %prep %autosetup -S git -cp client/gtk2/ibusimcontext.c client/gtk3/ibusimcontext.c || : -cp client/gtk2/ibusimcontext.c client/gtk4/ibusimcontext.c || : -# prep test -for f in ibusimcontext.c ibusim.c -do - diff client/gtk2/$f client/gtk3/$f - if test $? -ne 0 ; then - echo "Have to copy $f into client/gtk3" - abort - fi -done -diff client/gtk2/ibusimcontext.c client/gtk4/ibusimcontext.c -if test $? -ne 0 ; then - echo "Have to copy ibusimcontext.c into client/gtk4" - abort -fi - %build autoreconf -f -i -v %configure \ --disable-static \ - --enable-gtk2 \ + --disable-gtk2 \ --enable-gtk3 \ %if %{with gtk4} --enable-gtk4 \ @@ -243,7 +211,6 @@ autoreconf -f -i -v %install make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' rm -f $RPM_BUILD_ROOT%{_libdir}/libibus-*%{ibus_api_version}.la -rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/%{gtk2_binary_version}/immodules/im-ibus.la rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/%{gtk3_binary_version}/immodules/im-ibus.la %if %{with gtk4} rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-4.0/%{gtk4_binary_version}/immodules/libim-ibus.la @@ -364,9 +331,6 @@ dconf update || : %dir %{_libdir}/girepository-1.0 %{_libdir}/girepository-1.0/IBus*-1.0.typelib -%files gtk2 -%{_libdir}/gtk-2.0/%{gtk2_binary_version}/immodules/im-ibus.so - %files gtk3 %{_libdir}/gtk-3.0/%{gtk3_binary_version}/immodules/im-ibus.so @@ -416,5 +380,8 @@ dconf update || : %{_datadir}/installed-tests/ibus %changelog +* Thu Aug 25 2022 mgb01105731 - 1.5.25-2 +- Remove gtk2 + * Tue Apr 12 2022 Chunmei Xu - 1.5.25-1 - init from upstream