Accepting request 121298 from home:swyear:branches:M17N

- mkdir target directory before link, fix build error in Factory

OBS-URL: https://build.opensuse.org/request/show/121298
OBS-URL: https://build.opensuse.org/package/show/M17N/ibus?expand=0&rev=41
This commit is contained in:
Marguerite Su 2012-05-17 08:21:40 +00:00 committed by Git OBS Bridge
parent 11569fba1d
commit 2a4175d473
2 changed files with 28 additions and 6 deletions

View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Thu May 17 07:11:11 UTC 2012 - swyear@gmail.com
- remove soft link in RPM_BUILD_ROOT
-------------------------------------------------------------------
Thu May 17 06:10:46 UTC 2012 - swyear@gmail.com
- mkdir target directory before link
-------------------------------------------------------------------
Thu May 17 05:49:31 UTC 2012 - swyear@gmail.com
- fix build error in Factory: ln should be done in buildroot
-------------------------------------------------------------------
Wed Mar 7 21:54:43 UTC+8 2012 - hillwood@linuxfans.org

View File

@ -39,7 +39,6 @@ Group: System/I18n/Chinese
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: /usr/bin/touch
Provides: locale(ja;ko;zh)
BuildRequires: pkg-config
BuildRequires: dbus-1-glib-devel
BuildRequires: dbus-1-python-devel
BuildRequires: fdupes
@ -51,10 +50,18 @@ BuildRequires: gtk2-devel
BuildRequires: intltool
BuildRequires: iso-codes-devel
BuildRequires: libtool
BuildRequires: pkg-config
BuildRequires: python
BuildRequires: python-gobject2-devel
BuildRequires: update-desktop-files
Requires: python-gtk dbus-1-python notification-daemon iso-codes gconf2 python-xdg python-notify gobject-introspection
Requires: dbus-1-python
Requires: gconf2
Requires: gobject-introspection
Requires: iso-codes
Requires: notification-daemon
Requires: python-gtk
Requires: python-notify
Requires: python-xdg
%gconf_schemas_prereq
%define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
@ -107,12 +114,12 @@ This package contains ibus im module for gtk3
%package devel
Summary: Development tools for ibus
Group: Development/Libraries/Other
Requires: libibus-1_0-0 = %{version}
Requires: typelib-1_0-IBus-1_0 = %{version}
Requires: glib2-devel
Requires: dbus-1-devel
Requires: glib2-devel
Requires: gtk-doc
Requires: ibus = %{version}
Requires: libibus-1_0-0 = %{version}
Requires: typelib-1_0-IBus-1_0 = %{version}
%description devel
The ibus-devel package contains the header files and developer
@ -166,7 +173,7 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/gtk-2.0/%{gtk_binary_version}/immodules/im-ibus
rm -f $RPM_BUILD_ROOT/%{_libdir}/libibus-*.*a
rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/ibus.desktop
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
ln -sf %{_datadir}/icons/hicolor/48x48/apps/ibus-keyboard.png \
$RPM_BUILD_ROOT%{_datadir}/pixmaps/ibus-keyboard.png