rpms/python-demjson/F-8 python-demjson.spec,1.1,1.2

Thomas Moschny (thm) fedora-extras-commits at redhat.com
Tue Apr 15 21:03:56 UTC 2008


Author: thm

Update of /cvs/pkgs/rpms/python-demjson/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17008/F-8

Modified Files:
	python-demjson.spec 
Log Message:
Remove egg directory.


Index: python-demjson.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-demjson/F-8/python-demjson.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-demjson.spec	1 Apr 2008 20:48:11 -0000	1.1
+++ python-demjson.spec	15 Apr 2008 21:03:21 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           python-demjson
 Version:        1.3
-Release:        2%{?dist}
+Release:        2%{?dist}.1
 Summary:        Python JSON module and lint checker
 
 Group:          Development/Languages
@@ -12,7 +12,6 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  python-devel
-BuildRequires:  python-setuptools-devel
 
 
 %description 
@@ -35,20 +34,12 @@
 
 
 %build
-%if 0%{?fedora} > 8
 %{__python} setup.py build
-%else
-%{__python} -c 'import setuptools; execfile("setup.py")' build
-%endif
 
 
 %install
 rm -rf %{buildroot}
-%if 0%{?fedora} > 8
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
-%else
-%{__python} -c 'import setuptools; execfile("setup.py")' install -O1 --skip-build --root %{buildroot}
-%endif
 %{__install} -m 0755 -D -p jsonlint %{buildroot}%{_bindir}/jsonlint
 
 # fix shebang lines
@@ -71,6 +62,10 @@
 
 
 %changelog
+* Tue Apr 15 2008 Thomas Moschny <thomas.moschny at gmx.de> - 1.3-2.1
+- The egg-info directory causes problems when upgrading to F9, so
+  don't create or package it.
+
 * Mon Mar 31 2008 Thomas Moschny <thomas.moschny at gmx.de> - 1.3-2
 - Cleanup BuildRequires.
 - Don't pack INSTALL.txt.




More information about the scm-commits mailing list