rpms/ReviewBoard/F-13 FED01-Disable-ez_setup-when-installing-by-RPM.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 ReviewBoard.spec, 1.1, 1.2 sources, 1.2, 1.3

[Stephen Gallagher]

Author: sgallagh

Update of /cvs/pkgs/rpms/ReviewBoard/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv10081

Modified Files:
	.cvsignore ReviewBoard.spec sources 
Added Files:
	FED01-Disable-ez_setup-when-installing-by-RPM.patch 
Log Message:
* Mon Jun 22 2010 Stephen Gallagher <sgallagh at redhat.com> - 1.0.8-5
- New upstream stable release 1.0.8
- Support for Django 1.2
- http://www.reviewboard.org/docs/releasenotes/dev/reviewboard/1.0.8/
- http://www.reviewboard.org/docs/releasenotes/dev/reviewboard/1.0.7/
- http://www.reviewboard.org/docs/releasenotes/dev/reviewboard/1.0.6/


FED01-Disable-ez_setup-when-installing-by-RPM.patch:
 setup.py |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE FED01-Disable-ez_setup-when-installing-by-RPM.patch ---
>From 07d6df139c1c832f674096be915518dfaf78bc14 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh at redhat.com>
Date: Tue, 22 Jun 2010 08:14:30 -0400
Subject: [PATCH] Disable ez_setup when installing by RPM

---
 setup.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index f0b5995e7be63a27daebcfce945370f718df21cb..ece60c4c0816b4fe22800c9d0018204e5e073989 100755
--- a/setup.py
+++ b/setup.py
@@ -9,8 +9,8 @@ import os
 import shutil
 import sys
 
-from ez_setup import use_setuptools
-use_setuptools()
+#from ez_setup import use_setuptools
+#use_setuptools()
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py
-- 
1.7.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ReviewBoard/F-13/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	4 Jan 2010 14:18:14 -0000	1.2
+++ .cvsignore	22 Jun 2010 12:32:10 -0000	1.3
@@ -1 +1 @@
-ReviewBoard-1.0.5.1.tar.gz
+ReviewBoard-1.0.8.tar.gz


Index: ReviewBoard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ReviewBoard/F-13/ReviewBoard.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ReviewBoard.spec	4 Jan 2010 14:18:14 -0000	1.1
+++ ReviewBoard.spec	22 Jun 2010 12:32:10 -0000	1.2
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           ReviewBoard
-Version:        1.0.5.1
-Release:        2%{?dist}
+Version:        1.0.8
+Release:        5%{?dist}
 Summary:        Web-based code review tool
 Group:          Applications/Internet
 License:        MIT
@@ -25,6 +25,9 @@ Requires:       pytz
 Requires:       python-pygments
 Requires:       django-evolution
 
+#-- Patches --#
+Patch1001: FED01-Disable-ez_setup-when-installing-by-RPM.patch
+
 %description
 Review Board is a powerful web-based code review tool that offers
 developers an easy way to handle code reviews. It scales well from small
@@ -34,9 +37,7 @@ of the stress and time out of the code r
 %prep
 %setup -q -n %{name}-%{version}
 
-# Avoid trying to bootstrap setup.py; we have this via RPM:
-sed -i 's/^from ez_setup/#from ez_setup/' setup.py
-sed -i 's/^use_setuptools()/#use_setuptools()/' setup.py
+%patch1001 -p1
 
 %build
 %{__python} setup.py build
@@ -44,7 +45,6 @@ sed -i 's/^use_setuptools()/#use_setupto
 %install
 rm -rf $RPM_BUILD_ROOT
 
-# --skip-build causes bad stuff in siteconfig.py as of 0.8.4
 %{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
 
 # manage.py has a shebang and is meaningful to run; make it executable:
@@ -61,9 +61,17 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING INSTALL NEWS README
 %{_bindir}/rb-site
-%{python_sitelib}/*
+%{python_sitelib}/reviewboard/
+%{python_sitelib}/ReviewBoard*.egg-info/
 
 %changelog
+* Mon Jun 22 2010 Stephen Gallagher <sgallagh at redhat.com> - 1.0.8-5
+- New upstream stable release 1.0.8
+- Support for Django 1.2
+- http://www.reviewboard.org/docs/releasenotes/dev/reviewboard/1.0.8/
+- http://www.reviewboard.org/docs/releasenotes/dev/reviewboard/1.0.7/
+- http://www.reviewboard.org/docs/releasenotes/dev/reviewboard/1.0.6/
+
 * Tue Dec 22 2009 Stephen Gallagher <sgallagh at redhat.com> - 1.0.5.1-2
 - Fix source tarball location
 - Add comment to spec file regarding the lack of .desktop file


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ReviewBoard/F-13/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	4 Jan 2010 14:18:14 -0000	1.2
+++ sources	22 Jun 2010 12:32:10 -0000	1.3
@@ -1 +1 @@
-16947ddda7ec9df41f243949ec83a950  ReviewBoard-1.0.5.1.tar.gz
+b5557d3a5113fbd4686109c0ee2e873a  ReviewBoard-1.0.8.tar.gz