rpms/ibus/devel .cvsignore, 1.41, 1.42 ibus.spec, 1.87, 1.88 sources, 1.46, 1.47

[Huang Peng]

Author: phuang

Update of /cvs/pkgs/rpms/ibus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17574

Modified Files:
	.cvsignore ibus.spec sources 
Log Message:
Update to 1.2.0.20090904


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- .cvsignore	28 Aug 2009 06:19:36 -0000	1.41
+++ .cvsignore	4 Sep 2009 04:29:20 -0000	1.42
@@ -1,2 +1 @@
-ibus-1.2.0.20090828.tar.gz
-icons.tar.gz
+ibus-1.2.0.20090904.tar.gz


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/ibus.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- ibus.spec	30 Aug 2009 22:59:56 -0000	1.87
+++ ibus.spec	4 Sep 2009 04:29:20 -0000	1.88
@@ -7,16 +7,16 @@
 %define im_chooser_version 1.2.5
 
 Name:       ibus
-Version:    1.2.0.20090828
-Release:    2%{?dist}
+Version:    1.2.0.20090904
+Release:    1%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
 Group:      System Environment/Libraries
 URL:        http://code.google.com/p/ibus/
 Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
 Source1:    xinput-ibus
-Source2:    icons.tar.gz
-Patch0:     ibus-HEAD.patch
+# Source2:    icons.tar.gz
+# Patch0:     ibus-HEAD.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -114,7 +114,7 @@ The ibus-devel-docs package contains dev
 
 
 %prep
-%setup -q -a2
+%setup -q -a1
 # %patch0 -p1
 
 %build
@@ -131,14 +131,6 @@ make DESTDIR=$RPM_BUILD_ROOT install
 rm -f $RPM_BUILD_ROOT%{_libdir}/libibus.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/%{gtk_binary_version}/immodules/im-ibus.la
 
-# install icons
-install -pm 644 -D icons/IBus4-16.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/status/ibus-off.png
-install -pm 644 -D icons/IBus4-22.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/22x22/status/ibus-off.png
-install -pm 644 -D icons/IBus4-24.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/24x24/status/ibus-off.png
-install -pm 644 -D icons/IBus4-32.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/status/ibus-off.png
-install -pm 644 -D icons/IBus4-48.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/status/ibus-off.png
-install -pm 644 -D icons/IBus4-48.svg $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/status/ibus-off.svg
-
 # install xinput config file
 install -pm 644 -D %{SOURCE1} $RPM_BUILD_ROOT%{_xinputconf}
 
@@ -242,6 +234,9 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Fri Sep 04 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090904-1
+- Update to 1.2.0.20090904
+
 * Mon Aug 31 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090828-2
 - Change icon path in ibus.conf
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- sources	28 Aug 2009 06:19:37 -0000	1.46
+++ sources	4 Sep 2009 04:29:20 -0000	1.47
@@ -1,2 +1 @@
-4945b6cec33288fc5916a163133f927f  ibus-1.2.0.20090828.tar.gz
-cf57c152f07c90c72aa8c3281a65e80c  icons.tar.gz
+35e422490b409f738f9861ee13dfacf7  ibus-1.2.0.20090904.tar.gz