rpms/bzr/devel bzr.spec,1.92,1.93 bzr-old-sphinx.patch,1.1,NONE

[Henrik Nordström]

Author: hno

Update of /cvs/pkgs/rpms/bzr/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv10761

Modified Files:
	bzr.spec 
Removed Files:
	bzr-old-sphinx.patch 
Log Message:
Remove merged old-sphinx patch


Index: bzr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/devel/bzr.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- bzr.spec	31 May 2010 18:06:12 -0000	1.92
+++ bzr.spec	31 May 2010 18:19:08 -0000	1.93
@@ -13,7 +13,7 @@
 %global bzrmajor 2.2
 #global bzrminor .0
 %global bzrrc b3
-%global release 0.7
+%global release 0.8
 
 # Magics to get the dots in Release string correct per the above
 %global subrelease %{?bzrrc:.}%{?bzrrc}
@@ -29,7 +29,6 @@ URL:            http://www.bazaar-vcs.or
 Source0:        https://launchpad.net/%{name}/%{bzrmajor}/%{version}%{?bzrrc}/+download/%{name}-%{version}%{?bzrrc}.tar.gz
 Source1:        https://launchpad.net/%{name}/%{bzrmajor}/%{version}%{?bzrrc}/+download/%{name}-%{version}%{?bzrrc}.tar.gz.sig
 Source2:        bzr-icon-64.png
-Patch0: bzr-old-sphinx.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel zlib-devel
@@ -65,7 +64,6 @@ This package contains the documentation 
 
 %prep
 %setup -q -n %{name}-%{version}%{?bzrrc}
-%patch0 -p0 -b .oldsphinx
 
 
 sed -i '1{/#![[:space:]]*\/usr\/bin\/\(python\|env\)/d}' bzrlib/_patiencediff_py.py
@@ -138,7 +136,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_defaultdocdir}/%{name}-doc-%{version}/*
 
 %changelog
-* Mon May 31 2010 Henrik Nordstrom <henrik at henriknordstrom.net> - 2.2-0.6.b3
+* Mon May 31 2010 Henrik Nordstrom <henrik at henriknordstrom.net> - 2.2-0.8.b3
 - Upstream 2.2b3 release
 
 * Mon May 31 2010 Toshio Kuratomi <toshio at fedoraproject.org> - 2.2-0.6.b1


--- bzr-old-sphinx.patch DELETED ---