Hello community, here is the log from the commit of package ibus for openSUSE:Factory checked in at 2013-04-02 11:52:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ibus (Old) and /work/SRC/openSUSE:Factory/.ibus.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ibus", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/ibus/ibus.changes 2013-02-21 10:33:34.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ibus.new/ibus.changes 2013-04-02 11:52:05.000000000 +0200 @@ -1,0 +2,16 @@ +Thu Mar 28 18:26:44 UTC 2013 - i@marguerite.su + +- fix a typo in Group +- fix python-bytecode-inconsistent-mtime + +------------------------------------------------------------------- +Thu Mar 28 15:32:19 UTC 2013 - jengelh@inai.de + +- Put gnome-shell integration files into separate package because + these (since openSUSE 12.3) pull in a lot of new unwanted packages + on a GNOME-less system compared to 12.2. (bnc#812298) +- Set versions on BuildRequires according to configure.ac +- Use more robust make install call +- Remove redundant %clean section + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ibus.spec ++++++ --- /var/tmp/diff_new_pack.G4oyXw/_old 2013-04-02 11:52:11.000000000 +0200 +++ /var/tmp/diff_new_pack.G4oyXw/_new 2013-04-02 11:52:11.000000000 +0200 @@ -24,7 +24,11 @@ Version: 1.4.2 Release: 0 Url: http://code.google.com/p/ibus/ -Source0: http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz +Summary: Intelligent Input Bus for Linux OS +License: LGPL-2.1+ +Group: System/I18n/Chinese + +Source: http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz Source1: xim.d-ibus Source2: ibus-README.suse Source3: xim.ibus.suse.template @@ -37,25 +41,23 @@ Patch3: ibus-fix-tray-icon-on-gnome-3.6.patch # PATCH-FIX-OPENSUSE ibus_indicator-14.patch Patch4: ibus_indicator-14.patch -Summary: Intelligent Input Bus for Linux OS -License: LGPL-2.1+ -Group: System/I18n/Chinese BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: /usr/bin/touch Provides: locale(ja;ko;zh) BuildRequires: dbus-1-glib-devel -BuildRequires: dbus-1-python-devel +BuildRequires: dbus-1-python-devel >= 0.83.0 BuildRequires: fdupes -BuildRequires: gconf2-devel +BuildRequires: gconf2-devel >= 2.12 BuildRequires: gettext-devel -BuildRequires: gobject-introspection-devel -BuildRequires: gtk-doc +BuildRequires: glib2-devel >= 2.26.0 +BuildRequires: gobject-introspection-devel >= 0.9.6 +BuildRequires: gtk-doc >= 1.9 BuildRequires: gtk2-devel BuildRequires: intltool BuildRequires: iso-codes-devel BuildRequires: libtool BuildRequires: pkg-config -BuildRequires: python +BuildRequires: python >= 2.5 BuildRequires: python-gobject2-devel BuildRequires: update-desktop-files Requires: dbus-1-python @@ -116,6 +118,16 @@ This package contains ibus im module for gtk3 %endif +%package gnome-shell +# This implicitly draws in the GNOME Shell itself and thus is separate +Summary: GNOME Shell integration for IBus +Group: System/GUI/GNOME +BuildArch: noarch + +%description gnome-shell +The package contains the files for integrating IBus into the GNOME +Shell. + %package devel Summary: Development tools for ibus Group: Development/Libraries/Other @@ -154,7 +166,8 @@ make %{?_smp_mflags} %install -%makeinstall +make install DESTDIR="%buildroot" +# autostart mkdir -p $RPM_BUILD_ROOT/etc/X11/xim.d/ %if %{build_without_dbus_autolaunch} install -m 644 $RPM_SOURCE_DIR/xim.d-ibus-121 $RPM_BUILD_ROOT/etc/X11/xim.d/ibus @@ -176,6 +189,17 @@ done popd +# fix python-bytecode-inconsistent-mtime +pushd %{buildroot}%{_datadir}/ibus/ui/gtk +%py_compile i18n.py +mv ./i18n.pyc %{buildroot}%{_datadir}/ibus/setup/i18n.pyc +popd +pushd %{buildroot}%{_datadir}/ibus/ui/gtk +%py_compile -O engineabout.py +mv ./engineabout.pyo %{buildroot}%{_datadir}/ibus/setup/engineabout.pyo +popd + +# remove static libs rm -f $RPM_BUILD_ROOT/%{_libdir}/gtk-2.0/%{gtk_binary_version}/immodules/im-ibus.*a rm -f $RPM_BUILD_ROOT/%{_libdir}/libibus-*.*a @@ -190,6 +214,7 @@ %find_lang %{domain_name} %find_gconf_schemas cat %{name}.schemas_list %{domain_name}.lang > %{name}.lst +%fdupes %buildroot/%_prefix %fdupes -s $RPM_BUILD_ROOT %if 0%{suse_version} >= 1230 @@ -197,9 +222,6 @@ install -m644 ibus_indicator-14@ftake.github.com/* %{buildroot}%{_datadir}/gnome-shell/extensions/ibus_indicator-14@ftake.github.com %endif -%clean -rm -rf %buildroot - %pre -f %{name}.schemas_pre %post gtk @@ -241,7 +263,10 @@ %{_datadir}/icons/hicolor/*/apps/* %{_datadir}/pixmaps/* %{_prefix}/%{_lib}/ibus + %if 0%{suse_version} >= 1230 +%files gnome-shell +%defattr(-,root,root) %dir %{_datadir}/gnome-shell/ %dir %{_datadir}/gnome-shell/extensions/ %dir %{_datadir}/gnome-shell/extensions/ibus_indicator-14@ftake.github.com/ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org