rpms/pida/F-7 pida.spec,1.1,1.2

[Debarshi Ray (rishi)]

Author: rishi

Update of /cvs/pkgs/rpms/pida/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv845

Modified Files:
	pida.spec 
Log Message:
Fixed Spec file in F-7.

 Modified Files:
 	pida.spec 



Index: pida.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pida/F-7/pida.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pida.spec	15 Nov 2007 18:47:42 -0000	1.1
+++ pida.spec	25 Nov 2007 13:30:57 -0000	1.2
@@ -1,5 +1,11 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(plat_specific=1)")}
 
+%if 0%{?fc7}
+  %define _remove_encoding
+%else
+  %define _remove_encoding --remove-key Encoding
+%endif
+
 Summary:	A Python IDE written in Python and GTK
 Name:		pida
 Version:	0.5.1
@@ -62,7 +68,7 @@
 install -p -m644 %{name}/resources/pixmaps/%{name}-icon.svg \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps
 
-desktop-file-install --vendor fedora \
+desktop-file-install %{_remove_encoding} --vendor fedora \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   %{SOURCE1}
 
@@ -102,19 +108,19 @@
 %doc AUTHORS CHANGELOG COPYING docs
 %{_bindir}/%{name}
 %{_bindir}/%{name}-remote
+%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/icons/hicolor/48x48/apps/%{name}-icon.png
+%{_datadir}/icons/hicolor/scalable/apps/%{name}-icon.svg
+%{_mandir}/man1/%{name}.1.gz
 %{python_sitelib}/moo_stub.so
 
 %dir %{python_sitelib}/%{name}
 %{python_sitelib}/%{name}/*
 
-%{_mandir}/man1/%{name}.1.gz
-%{_datadir}/applications/fedora-%{name}.desktop
-%{_datadir}/icons/hicolor/48x48/apps/%{name}-icon.png
-%{_datadir}/icons/hicolor/scalable/apps/%{name}-icon.svg
-
 %changelog
 * Tue Nov 13 2007 Debarshi Ray <rishi at fedoraproject.org> - 0.5.1-5
 - Preserved timestamps using 'install -p'.
+- Removed Encoding from Desktop Entry for all distributions, except Fedora 7.
 
 * Sat Oct 27 2007 Debarshi Ray <rishi at fedoraproject.org> - 0.5.1-4
 - Retain CHANGELOG spelling.