rpms/python-xmpp/devel python-xmpp.spec,1.6,1.7

Jeffrey C. Ollie (jcollie) fedora-extras-commits at redhat.com
Fri Jan 4 14:46:00 UTC 2008


Author: jcollie

Update of /cvs/pkgs/rpms/python-xmpp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16999

Modified Files:
	python-xmpp.spec 
Log Message:
Sync with F-7 and F-8


Index: python-xmpp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-xmpp/devel/python-xmpp.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- python-xmpp.spec	3 Jan 2008 16:01:57 -0000	1.6
+++ python-xmpp.spec	4 Jan 2008 14:45:23 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name:           python-xmpp
 Version:        0.4.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Python library for easy scripting with Jabber
 
 Group:          Development/Languages
@@ -12,7 +12,13 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  python-devel
+
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
+
 Requires:	python-dns
 
 %description
@@ -33,11 +39,11 @@
 find doc -type f | xargs chmod a-x
 
 %build
-CFLAGS="%{optflags}" %{__python} setup.py build
+CFLAGS="%{optflags}" %{__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 --skip-build --root %{buildroot}
 
 %clean
 rm -rf %{buildroot}
@@ -49,6 +55,9 @@
 %{python_sitelib}/*
 
 %changelog
+* Thu Jan  3 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.4.1-2
+- Get eggs building correctly on F-7 and F-8.
+
 * Thu Jan  3 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.4.1-1
 - Update to 0.4.1.
 




More information about the fedora-extras-commits mailing list