rpms/pida/F-8 pida.spec,1.2,1.3

[Debarshi Ray (rishi)]

Author: rishi

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

Modified Files:
	pida.spec 
Log Message:
Updated to 0.5.1-6 in F-8.
 
 Modified Files:
 	pida.spec 



Index: pida.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pida/F-8/pida.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pida.spec	25 Nov 2007 13:29:30 -0000	1.2
+++ pida.spec	18 Feb 2008 18:18:54 -0000	1.3
@@ -1,7 +1,6 @@
 %{!?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
@@ -9,7 +8,7 @@
 Summary:	A Python IDE written in Python and GTK
 Name:		pida
 Version:	0.5.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 License:	MIT
 Group:		Development/Tools
 URL:		http://pida.co.uk/
@@ -34,7 +33,6 @@
 BuildRequires:	dos2unix
 BuildRequires:	gtk2-devel
 BuildRequires:	pygtk2-devel
-BuildRequires:	python-setuptools
 
 %description
 PIDA is an IDE. PIDA is different from other IDEs in that it will use the
@@ -68,7 +66,7 @@
 install -p -m644 %{name}/resources/pixmaps/%{name}-icon.svg \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps
 
-desktop-file-install %{_remove_encoding} --vendor fedora \
+desktop-file-install %{?_remove_encoding} --vendor fedora \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   %{SOURCE1}
 
@@ -114,10 +112,20 @@
 %{_mandir}/man1/%{name}.1.gz
 %{python_sitelib}/moo_stub.so
 
+%if 0%{?fc7}%{?fc8}
+%else
+  %{python_sitelib}/PIDA-0.5.1-py2.5.egg-info
+%endif
+
 %dir %{python_sitelib}/%{name}
 %{python_sitelib}/%{name}/*
 
 %changelog
+* Mon Feb 18 2008 Debarshi Ray <rishi at fedoraproject.org> - 0.5.1-6
+- Fixed usage of _remove_encoding to prevent failure on Fedora 7.
+- Provided Egg on all distributions starting from Fedora 9.
+- Removed 'BuildRequires: python-setuptools'.
+
 * 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.