new upstream release and fix patch

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@925 ec354946-7b23-47d6-9f5a-488ba84defc7

g/gkrellm/gkrellm-vl.spec

@@ -1,6 +1,6 @@
 Summary:        Multiple stacked system monitors: 1 process.
 Name:           gkrellm
-Version:        2.3.2
+Version:        2.3.4
 Release:        1%{?_dist_release}
 License:        GPL
 Group:          Applications/System
@@ -11,10 +11,13 @@ Distribution:   Vine Linux
 
 # styles for vine.
 Source1:        HW-Vine2.tar.bz2
-Patch0:         gkrellm-2.3.2.ja.po.patch
+Patch0:         gkrellm-2.3.4.ja.po.patch
 Requires:       gtk2 >= 2.4, glib2 >= 2.0
 BuildRequires:  gtk2-devel >= 2.4, glib2-devel >= 2.0, gettext
 BuildRequires:  ImageMagick, bzip2
+%if %{?_dist_release} == "vl6"
+BuildRequires:  xorg-x11-devel
+%endif
 %if %{?_dist_release} == "vl5"
 BuildRequires:  xorg-x11-devel
 %endif
@@ -80,22 +83,22 @@ make install \
     MANDIR=%{buildroot}%{_mandir}/man1 \
     INCLUDEDIR=%{buildroot}%{_includedir}
 
-%ifarch x86_64
-# convert program terminate with segmentation fault: fix me!
-convert gkrellm.ico gkrellm.png || [ -f gkrellm-0.png ]
-%else
-convert gkrellm.ico gkrellm.png
-%endif
-
-for i in gkrellm-*.png
-do
-%__install -D -p -m 644 $i \
-    %{buildroot}%{_datadir}/pixmaps/$i
-done
-pushd %{buildroot}%{_datadir}/pixmaps
-ln -s gkrellm-0.png gkrellm.png
-popd
-#    %{buildroot}%{_datadir}/pixmaps/gkrellm.png
+## %ifarch x86_64
+## # convert program terminate with segmentation fault: fix me!
+## convert gkrellm.ico gkrellm.png || [ -f gkrellm-0.png ]
+## %else
+## convert gkrellm.ico gkrellm.png
+## %endif
+
+## for i in gkrellm-*.png
+## do
+## %__install -D -p -m 644 $i \
+##     %{buildroot}%{_datadir}/pixmaps/$i
+## done
+## pushd %{buildroot}%{_datadir}/pixmaps
+## ln -s gkrellm-0.png gkrellm.png
+## popd
+## #    %{buildroot}%{_datadir}/pixmaps/gkrellm.png
 
 %__cp -a HW-Vine2 \
     %{buildroot}%{_datadir}/gkrellm2/themes/
@@ -128,12 +131,16 @@ EOF
 %{_includedir}/gkrellm2/*
 %{_libdir}/pkgconfig/gkrellm.pc
 %{_datadir}/locale/*/LC_MESSAGES/gkrellm.mo
-%{_datadir}/pixmaps/*
+## %{_datadir}/pixmaps/*
 %{_datadir}/gkrellm2
 %{_datadir}/applications/%{name}.desktop
 %{_libdir}/gkrellm2
 
 %changelog
+* Sun May 02 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.3.4-1
+- new upstream release
+- fix Patch0 for gkrellm-2.3.4
+
 * Fri Jul 17 2009 KATO Masashi <mkato@par.odn.ne.jp> 2.3.2-1
 - new upstream release
 - added desktop entry