rpms/fantasdic/F-9 .cvsignore, 1.3, 1.4 fantasdic.spec, 1.2, 1.3 sources, 1.3, 1.4

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/fantasdic/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22114/F-9

Modified Files:
	.cvsignore fantasdic.spec sources 
Log Message:
* Thu Mar 26 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.0-0.4.beta7
- 1.0 beta 7
- Fix arguments of bindtextdomain() for ruby(gettext) 2.0.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fantasdic/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 Sep 2008 15:01:39 -0000	1.3
+++ .cvsignore	25 Mar 2009 19:37:31 -0000	1.4
@@ -1 +1 @@
-fantasdic-1.0-beta6.tar.gz
+fantasdic-1.0-beta7.tar.gz


Index: fantasdic.spec
===================================================================
RCS file: /cvs/extras/rpms/fantasdic/F-9/fantasdic.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fantasdic.spec	10 Sep 2008 15:01:39 -0000	1.2
+++ fantasdic.spec	25 Mar 2009 19:37:31 -0000	1.3
@@ -2,10 +2,10 @@
 
 
 %define		mainver		1.0
-%define		betaver		beta6
+%define		betaver		beta7
 %define		rubyabi		1.8
 
-%define		fedorarel	2
+%define		fedorarel	4
 
 
 %define		fullrel		%{?betaver:0.}%{fedorarel}%{?betaver:.%betaver}
@@ -57,6 +57,11 @@
 	-i.dir -e '/html/s|%{name}|%{name}-%{mainver}|' \
 	lib/fantasdic/ui/browser.rb
 
+# ruby(gettext) >= 2.0.0 no longer accepts 4 arguments for
+# bindtextdomain()
+find . -name \*.rb | xargs \
+	%{__sed} -i -e '/bindtextdomain/s|(\([^,][^,]*\), nil, nil, \([^,][^,]*\))|(\1, :charset => \2)|'
+
 %build
 ruby setup.rb config \
 	--prefix=%{_prefix} \
@@ -118,18 +123,23 @@
 
 %post
 touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
-fi
 scrollkeeper-update -q -o %{_datadir}/omf/%{name}
 exit 0
 
 %postun
+scrollkeeper-update -q
+[ $1 -eq 0 ] || exit 0
+
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
 	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
 fi
-scrollkeeper-update -q
+exit 0
+
+%posttrans
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
+fi
 exit 0
 
 %files	-f %{name}.lang 
@@ -161,6 +171,13 @@
 
 
 %changelog
+* Thu Mar 26 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.0-0.4.beta7
+- 1.0 beta 7
+- Fix arguments of bindtextdomain() for ruby(gettext) 2.0.0
+
+* Tue Feb 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.0-0.3.beta6
+- GTK icon cache updating script update
+
 * Wed Sep 10 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.0-0.2.beta6
 - 1.0 beta6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fantasdic/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Sep 2008 15:01:39 -0000	1.3
+++ sources	25 Mar 2009 19:37:31 -0000	1.4
@@ -1 +1 @@
-894cc88eaa7b50894417c7adca6af552  fantasdic-1.0-beta6.tar.gz
+fdd9d6661a38ae8d23bcd9a05d12a6b6  fantasdic-1.0-beta7.tar.gz