rpms/im-chooser/F-13 im-chooser-new-icons-authors.patch, NONE, 1.1 .cvsignore, 1.32, 1.33 im-chooser.spec, 1.59, 1.60 sources, 1.31, 1.32

[Jens Petersen]

Author: petersen

Update of /cvs/pkgs/rpms/im-chooser/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv24865

Modified Files:
	.cvsignore im-chooser.spec sources 
Added Files:
	im-chooser-new-icons-authors.patch 
Log Message:
- add new gnome-icon-theme style icons by Lapo Calamandrei and Jakub Steiner
  (mizmo, #587712)
- add scriptlets for icon cache



im-chooser-new-icons-authors.patch:
 AUTHORS |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE im-chooser-new-icons-authors.patch ---
diff -u im-chooser-1.2.7/AUTHORS\~ im-chooser-1.2.7/AUTHORS
--- im-chooser-1.2.7/AUTHORS~	2008-04-25 15:12:38.000000000 +1000
+++ im-chooser-1.2.7/AUTHORS	2010-05-04 18:08:10.000000000 +1000
@@ -1 +1,3 @@
 Akira TAGOH <tagoh at redhat.com>
+
+new icons by Lapo Calamandrei and Jakub Steiner


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/im-chooser/F-13/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- .cvsignore	14 Sep 2009 09:49:52 -0000	1.32
+++ .cvsignore	4 May 2010 09:40:10 -0000	1.33
@@ -32,3 +32,4 @@ im-chooser-1.2.4.tar.bz2
 im-chooser-1.2.5.tar.bz2
 im-chooser-1.2.6.tar.bz2
 im-chooser-1.2.7.tar.bz2
+im-chooser-icons.tar.bz2


Index: im-chooser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/im-chooser/F-13/im-chooser.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- im-chooser.spec	14 Sep 2009 09:49:53 -0000	1.59
+++ im-chooser.spec	4 May 2010 09:40:10 -0000	1.60
@@ -1,6 +1,6 @@
 Name:		im-chooser
 Version:	1.2.7
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 URL:		http://fedorahosted.org/im-chooser/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -9,6 +9,8 @@ BuildRequires:	imsettings-devel >= 0.106
 
 Source0:	http://fedorahosted.org/releases/i/m/%{name}/%{name}-%{version}.tar.bz2
 Patch0:		im-chooser-disable-status-icon.patch
+Source1:	im-chooser-icons.tar.bz2
+Patch1:		im-chooser-new-icons-authors.patch
 
 Summary:	Desktop Input Method configuration tool
 Group:		Applications/System
@@ -21,8 +23,10 @@ to be used or disable Input Method usage
 
 
 %prep
-%setup -q
+%setup -q -a1
+mv im-chooser{\ ,-}icons
 %patch0 -p1 -b .0-status-icon
+%patch1 -p1 -b .orig
 
 %build
 %configure
@@ -39,22 +43,45 @@ desktop-file-install --vendor=fedora    
         --dir=$RPM_BUILD_ROOT%{_datadir}/applications           \
         $RPM_BUILD_ROOT%{_datadir}/applications/im-chooser.desktop
 
+# hack in new icons for now
+rm -r $RPM_BUILD_ROOT%{_datadir}/pixmaps
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor
+cp -a im-chooser-icons/* $RPM_BUILD_ROOT%{_datadir}/icons/hicolor
+
 %find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
+%post
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+%postun
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+
 %files -f %{name}.lang
 %defattr (-, root, root)
 %doc AUTHORS COPYING ChangeLog README
 %{_bindir}/im-chooser
 %{_datadir}/applications/fedora-im-chooser.desktop
 %{_datadir}/applications/xfce4-im-chooser.desktop
-%{_datadir}/pixmaps/im-chooser.png
+%{_datadir}/icons/hicolor/*/apps/im-chooser.png
 
 
 %changelog
+* Tue May  4 2010 Jens Petersen <petersen at redhat.com> - 1.2.7-2
+- add new gnome-icon-theme style icons by Lapo Calamandrei and Jakub Steiner
+  (mizmo, #587712)
+- add scriptlets for icon cache
+
 * Mon Sep 14 2009 Akira TAGOH <tagoh at redhat.com> - 1.2.7-1
 - New upstream release.
   - translation updates only.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/im-chooser/F-13/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources	14 Sep 2009 09:49:53 -0000	1.31
+++ sources	4 May 2010 09:40:10 -0000	1.32
@@ -1 +1,2 @@
 229cbb124082224a8f6d1bab207248b3  im-chooser-1.2.7.tar.bz2
+8d7e6db16468e6ed73eb1dc5afb06e5f  im-chooser-icons.tar.bz2