Skip to content

Commit

Permalink
Bump the version and fix rpmbuild script
Browse files Browse the repository at this point in the history
  • Loading branch information
phuang committed Feb 21, 2012
1 parent 53d83b3 commit ca0d5c2
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 6 deletions.
4 changes: 2 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@


# If ibus_released is 0, append datestamp to the version number.
m4_define([ibus_released], [1])
m4_define([ibus_released], [0])

m4_define([ibus_major_version], [1])
m4_define([ibus_minor_version], [4])
m4_define([ibus_micro_version], [1])
m4_define([ibus_micro_version], [99])
m4_define([ibus_interface_age], [0])
m4_define([ibus_binary_age],
[m4_eval(100 * ibus_minor_version + ibus_micro_version)])
Expand Down
2 changes: 2 additions & 0 deletions ibus.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,9 @@ fi
%{_datadir}/icons/hicolor/*/apps/*
%{_libexecdir}/ibus-gconf
%{_libexecdir}/ibus-ui-gtk
%{_libexecdir}/ibus-ui-gtk3
%{_libexecdir}/ibus-x11
%{_libexecdir}/ibus-engine-simple
# %{_sysconfdir}/xdg/autostart/ibus.desktop
%{_sysconfdir}/gconf/schemas/ibus.schemas
%config %{_xinputconf}
Expand Down
14 changes: 11 additions & 3 deletions ui/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,18 @@
# Boston, MA 02111-1307 USA

if ENABLE_PYTHON
if ENABLE_GTK2
GTK2_UI = gtk
endif
endif

if ENABLE_GTK3
GTK3_UI = gtk3
endif

SUBDIRS = \
gtk \
gtk3 \
$(GTK2_UI) \
$(GTK3_UI) \
$(NULL)
endif

-include $(top_srcdir)/git.mk
2 changes: 1 addition & 1 deletion ui/gtk3/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ AM_VALAFLAGS = \
--pkg=ibus-1.0 \
$(NULL)

bin_PROGRAMS = ibus-ui-gtk3
libexec_PROGRAMS = ibus-ui-gtk3

ibus_ui_gtk3_SOURCES = \
application.vala \
Expand Down

0 comments on commit ca0d5c2

Please sign in to comment.