rpms/xscorch/FC-6 xscorch.desktop,1.1,1.2 xscorch.spec,1.7,1.8

[Marcin Garski (mgarski)]

Author: mgarski

Update of /cvs/pkgs/rpms/xscorch/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32246

Modified Files:
	xscorch.desktop xscorch.spec 
Log Message:
- Create symlinks in pixmaps directory
- Fix .desktop category
- Spec tweak



Index: xscorch.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/xscorch/FC-6/xscorch.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xscorch.desktop	27 Aug 2005 16:25:13 -0000	1.1
+++ xscorch.desktop	22 Jun 2007 14:56:53 -0000	1.2
@@ -4,5 +4,5 @@
 Name=xscorch
 Comment=A Scorched Earth clone
 Exec=xscorch
-Icon=/usr/share/xscorch/images/xscorch-icon.xpm
-Categories=X-Fedora;Application;Game;
+Icon=xscorch-icon.xpm
+Categories=Game;


Index: xscorch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xscorch/FC-6/xscorch.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xscorch.spec	31 Aug 2006 15:50:05 -0000	1.7
+++ xscorch.spec	22 Jun 2007 14:56:53 -0000	1.8
@@ -1,6 +1,6 @@
 Name:		xscorch
 Version:	0.2.0
-Release:	8%{?dist}
+Release:	9%{?dist}
 Summary:	A Scorched Earth clone
 
 Group:		Amusements/Games
@@ -15,8 +15,6 @@
 
 BuildRequires:	libX11-devel libXpm-devel gtk2-devel >= 2.4.0 desktop-file-utils
 #BuildRequires:	readline-devel
-Requires(post):	desktop-file-utils
-Requires(postun): desktop-file-utils
 
 %description
 xscorch is a clone of the classic DOS game, "Scorched Earth". The basic goal
@@ -41,29 +39,40 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-desktop-file-install --vendor fedora \
-	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
+desktop-file-install --vendor="fedora" \
+	--dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
 	%{SOURCE1}
 
-%post
-update-desktop-database &> /dev/null ||:
-
-%postun
-update-desktop-database &> /dev/null ||:
+# Create symlink in pixmaps directory
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
+ln -sf ../xscorch/images/xscorch-icon.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps
+
+# Fix encoding
+for i in AUTHORS ChangeLog
+do
+	iconv -f ISO-8859-1 -t UTF-8 < ${i} > ${i}.tmp
+	mv -f ${i}.tmp ${i}
+done
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-, root, root)
+%defattr(-,root,root,-)
 %doc doc/AI AUTHORS ChangeLog COPYING doc/make_text_data.pl doc/NETWORK NEWS
 %doc doc/NOTES README TODO
 %{_bindir}/xscorch
 %{_datadir}/applications/*xscorch.desktop
 %{_mandir}/man6/xscorch.6*
+%{_datadir}/pixmaps/xscorch-icon.xpm
 %{_datadir}/xscorch/
 
 %changelog
+* Fri Jun 22 2007 Marcin Garski <mgarski[AT]post.pl> 0.2.0-9
+- Create symlinks in pixmaps directory
+- Fix .desktop category
+- Spec tweak
+
 * Thu Aug 31 2006 Marcin Garski <mgarski[AT]post.pl> 0.2.0-8
 - Rebuild for FC6