rpms/pondus/devel pondus.spec,1.1,1.2

[Jussi Lehtola]

Author: jussilehtola

Update of /cvs/pkgs/rpms/pondus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2348/devel

Modified Files:
	pondus.spec 
Log Message:
Use same spec in devel as in EPEL.


Index: pondus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pondus/devel/pondus.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pondus.spec	11 Jul 2009 15:16:31 -0000	1.1
+++ pondus.spec	11 Jul 2009 19:00:46 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:		pondus
 Version:	0.5.3
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A personal weight management program
 Group:		Applications/Productivity
 License:	GPLv3+
@@ -12,6 +12,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version
 
 BuildRequires:	desktop-file-utils
 BuildRequires:	python-devel
+BuildRequires:	python-setuptools
 BuildArch:	noarch
 
 # Required for plotting, not picked up automatically
@@ -26,19 +27,21 @@ compared with the actual measurements in
 
 %prep
 %setup -q
+# Remove Version entry from desktop file
+sed -i "/Version/d" data/pondus.desktop
 
 %build
-python setup.py build
+python -c 'import setuptools; execfile("setup.py")' build
 
 %install
 rm -rf %{buildroot}
-python setup.py install -O1 --skip-build --root %{buildroot}
+python -c 'import setuptools; execfile("setup.py")' install -O1 --skip-build --root %{buildroot}
 # Find locales
 %{find_lang} %{name}
 # Remove installed doc that will go in %doc
 rm -rf %{buildroot}%{_docdir}/%{name}
 # Verify desktop file install
-desktop-file-validate %{buildroot}%{_datadir}/applications/pondus.desktop
+desktop-file-install --dir=%{buildroot}%{_datadir}/applications --vendor="" --remove-category=GTK data/pondus.desktop
 
 %clean
 rm -rf %{buildroot}
@@ -57,6 +60,9 @@ rm -rf %{buildroot}
 
 %changelog
 * Sat Jul 11 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.5.3-2
+- Fix EPEL build.
+
+* Sat Jul 11 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.5.3-2
 - Added Requires: python-matplotlib for plotting capability.
 
 * Fri Jul 10 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.5.3-1