|
@@ -1,8 +1,9 @@
|
|
%define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
|
|
%define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
|
|
|
|
|
|
-%define snapshot 20110817
|
|
|
|
-%define ver 1.3.99.%{snapshot}
|
|
|
|
-%define rel 2
|
|
|
|
|
|
+%define ver 1.4.0
|
|
|
|
+%define rel 1
|
|
|
|
+
|
|
|
|
+%define gjsver 3.2.0.20110928
|
|
|
|
|
|
%if "%{?_dist_release}" >= "vl7"
|
|
%if "%{?_dist_release}" >= "vl7"
|
|
%define have_gjsfile 1
|
|
%define have_gjsfile 1
|
|
@@ -23,7 +24,7 @@ Group: System Environment/Libraries
|
|
URL: http://code.google.com/p/ibus/
|
|
URL: http://code.google.com/p/ibus/
|
|
|
|
|
|
Source0: %{name}-%{version}.tar.gz
|
|
Source0: %{name}-%{version}.tar.gz
|
|
-Source1: http://fujiwara.fedorapeople.org/ibus/gnome-shell/ibus-gjs-1.3.99.20110814.tar.gz
|
|
|
|
|
|
+Source1: http://fujiwara.fedorapeople.org/ibus/gnome-shell/ibus-gjs-%{gjsver}.tar.gz
|
|
|
|
|
|
Patch1: ibus-530711-preload-sys.patch
|
|
Patch1: ibus-530711-preload-sys.patch
|
|
Patch4: ibus-541492-xkb.patch
|
|
Patch4: ibus-541492-xkb.patch
|
|
@@ -196,7 +197,7 @@ rm -rf %{buildroot}%{_sysconfdir}/xdg/autostart/ibus.desktop
|
|
d=`basename %SOURCE1 .tar.gz`
|
|
d=`basename %SOURCE1 .tar.gz`
|
|
cd $d
|
|
cd $d
|
|
make DESTDIR=$RPM_BUILD_ROOT install
|
|
make DESTDIR=$RPM_BUILD_ROOT install
|
|
-rm -f $RPM_BUILD_ROOT%{_datadir}/locale/*/LC_MESSAGES/ibus-gjs.mo
|
|
|
|
|
|
+#rm -f $RPM_BUILD_ROOT%{_datadir}/locale/*/LC_MESSAGES/ibus-gjs.mo
|
|
cd ..
|
|
cd ..
|
|
%endif
|
|
%endif
|
|
|
|
|
|
@@ -317,6 +318,7 @@ touch --no-create %{_datadir}/icons/hicolor || :
|
|
%defattr(-,root,root,-)
|
|
%defattr(-,root,root,-)
|
|
%{_datadir}/gnome-shell/js/ui/status/ibus
|
|
%{_datadir}/gnome-shell/js/ui/status/ibus
|
|
%{_datadir}/gnome-shell/extensions/ibus-indicator@example.com
|
|
%{_datadir}/gnome-shell/extensions/ibus-indicator@example.com
|
|
|
|
+%{_datadir}/locale/*/LC_MESSAGES/ibus-gjs.mo
|
|
%endif
|
|
%endif
|
|
|
|
|
|
## to build compat32 for x86_64 architecture support
|
|
## to build compat32 for x86_64 architecture support
|
|
@@ -334,6 +336,13 @@ touch --no-create %{_datadir}/icons/hicolor || :
|
|
%endif
|
|
%endif
|
|
|
|
|
|
%changelog
|
|
%changelog
|
|
|
|
+* Sun Oct 02 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 1.4.0-1
|
|
|
|
+- update to ibus-1.4.0
|
|
|
|
+- update to ibus-gjs-3.2.0.20110928
|
|
|
|
+
|
|
|
|
+* Sat Sep 10 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 1.3.99.20110817-3
|
|
|
|
+- update ibus-gjs to 3.1.91.20110908
|
|
|
|
+
|
|
* Wed Aug 31 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 1.3.99.20110817-2
|
|
* Wed Aug 31 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 1.3.99.20110817-2
|
|
- re-enable compat32
|
|
- re-enable compat32
|
|
* Wed Aug 10 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 1.3.9-6
|
|
* Wed Aug 10 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 1.3.9-6
|