diff --git a/.cvsignore b/.cvsignore index bea05ff..b388891 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -ibus-1.2.0.20090828.tar.gz -icons.tar.gz +ibus-1.2.0.20090904.tar.gz diff --git a/ibus.spec b/ibus.spec index 406b782..9735b38 100644 --- a/ibus.spec +++ b/ibus.spec @@ -7,16 +7,16 @@ %define im_chooser_version 1.2.5 Name: ibus -Version: 1.2.0.20090828 -Release: 2%{?dist} +Version: 1.2.0.20090904 +Release: 1%{?dist} Summary: Intelligent Input Bus for Linux OS License: LGPLv2+ Group: System Environment/Libraries URL: http://code.google.com/p/ibus/ Source0: http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz Source1: xinput-ibus -Source2: icons.tar.gz -Patch0: ibus-HEAD.patch +# Source2: icons.tar.gz +# Patch0: ibus-HEAD.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -114,7 +114,7 @@ The ibus-devel-docs package contains developer documentation for ibus %prep -%setup -q -a2 +%setup -q -a1 # %patch0 -p1 %build @@ -131,14 +131,6 @@ make DESTDIR=$RPM_BUILD_ROOT install rm -f $RPM_BUILD_ROOT%{_libdir}/libibus.la rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/%{gtk_binary_version}/immodules/im-ibus.la -# install icons -install -pm 644 -D icons/IBus4-16.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/status/ibus-off.png -install -pm 644 -D icons/IBus4-22.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/22x22/status/ibus-off.png -install -pm 644 -D icons/IBus4-24.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/24x24/status/ibus-off.png -install -pm 644 -D icons/IBus4-32.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/status/ibus-off.png -install -pm 644 -D icons/IBus4-48.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/status/ibus-off.png -install -pm 644 -D icons/IBus4-48.svg $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/status/ibus-off.svg - # install xinput config file install -pm 644 -D %{SOURCE1} $RPM_BUILD_ROOT%{_xinputconf} @@ -242,6 +234,9 @@ fi %{_datadir}/gtk-doc/html/* %changelog +* Fri Sep 04 2009 Peng Huang - 1.2.0.20090904-1 +- Update to 1.2.0.20090904 + * Mon Aug 31 2009 Peng Huang - 1.2.0.20090828-2 - Change icon path in ibus.conf diff --git a/sources b/sources index 9e3b86d..23c01ff 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -4945b6cec33288fc5916a163133f927f ibus-1.2.0.20090828.tar.gz -cf57c152f07c90c72aa8c3281a65e80c icons.tar.gz +35e422490b409f738f9861ee13dfacf7 ibus-1.2.0.20090904.tar.gz