Fix make rpm errors

BUG=make rpm failed in fedora
TEST=make rpm in fedora

Review URL: http://codereview.appspot.com/4862041

diff --git a/configure.ac b/configure.ac
index c3bd423..367b069 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -78,6 +78,12 @@ AC_HEADER_STDC
 AM_PROG_LIBTOOL
 IT_PROG_INTLTOOL([0.35.0])
 
+# For dislpay Date
+m4_define(ibus_datedisplay,
+    m4_esyscmd(date '+%a %b %d %Y' | tr -d '\n\r'))
+DATE_DISPLAY="ibus_datedisplay"
+AC_SUBST(DATE_DISPLAY)
+
 # If only source code changed, lt_revision + 1
 # If any interface added, lt_age + 1
 # If any interfaces changed or removed, lt_current + 1, lt_revision = 0, lt_age = 0

diff --git a/docs/reference/ibus/.gitignore b/docs/reference/ibus/.gitignore
index 070c9e5..375a002 100644 (file)
--- a/docs/reference/ibus/.gitignore
+++ b/docs/reference/ibus/.gitignore
@@ -46,5 +46,4 @@
 /tmpl.stamp
 /tmpl/*.bak
 /tmpl/ibus-unused.sgml
-/trim-build.stamp
 /xml

diff --git a/ibus.spec.in b/ibus.spec.in
index 7a625ff..4badbda 100644 (file)
--- a/ibus.spec.in
+++ b/ibus.spec.in
@@ -134,7 +134,7 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
-rm -f $RPM_BUILD_ROOT%{_libdir}/libibus-2.0.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/libibus-1.0.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/%{gtk2_binary_version}/immodules/im-ibus.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/%{gtk3_binary_version}/immodules/im-ibus.la
 
@@ -148,7 +148,7 @@ desktop-file-install --delete-original          \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   $RPM_BUILD_ROOT%{_datadir}/applications/*
 
-%find_lang %{name}
+%find_lang %{name}10
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -204,7 +204,7 @@ fi
 %postun gtk3
 %{_bindir}/gtk-query-immodules-3.0-%{__isa_bits} --update-cache
 
-%files -f %{name}.lang
+%files -f %{name}10.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README
 %dir %{python_sitelib}/ibus
@@ -224,8 +224,8 @@ fi
 
 %files libs
 %defattr(-,root,root,-)
-%{_libdir}/libibus-2.0.so.*
-%{_libdir}/girepository-1.0/IBus-2.0.typelib
+%{_libdir}/libibus-1.0.so.*
+%{_libdir}/girepository-1.0/IBus-1.0.typelib
 
 %files gtk2
 %defattr(-,root,root,-)
@@ -240,8 +240,9 @@ fi
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*
 %{_includedir}/*
-%{_datadir}/gir-1.0/IBus-2.0.gir
-%{_datadir}/vala/vapi/ibus-2.0.vapi
+%{_datadir}/gir-1.0/IBus-1.0.gir
+%{_datadir}/vala/vapi/ibus-1.0.vapi
+%{_datadir}/vala/vapi/ibus-1.0.deps
 
 %files devel-docs
 %defattr(-,root,root,-)