rpms/python-imdb/F-10 python-imdb-4.0-beautifulsoup.patch, NONE, 1.1 python-imdb.spec, 1.1, 1.2 sources, 1.2, 1.3

[Sindre Pedersen Bjørdal]

Author: sindrepb

Update of /cvs/pkgs/rpms/python-imdb/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23423

Modified Files:
	python-imdb.spec sources 
Added Files:
	python-imdb-4.0-beautifulsoup.patch 
Log Message:
new upstream release

python-imdb-4.0-beautifulsoup.patch:

--- NEW FILE python-imdb-4.0-beautifulsoup.patch ---
diff -up ./imdb/parser/http/bsouplxml/bsoupxpath.py.orig ./imdb/parser/http/bsouplxml/bsoupxpath.py
--- ./imdb/parser/http/bsouplxml/bsoupxpath.py.orig	2009-04-01 04:37:01.000000000 +0200
+++ ./imdb/parser/http/bsouplxml/bsoupxpath.py	2009-04-01 04:37:46.000000000 +0200
@@ -26,8 +26,8 @@ __docformat__ = 'restructuredtext'
 
 import re
 import string
-import _bsoup as BeautifulSoup
-
+#use system BeautifulSoup
+import BeautifulSoup
 
 # XPath related enumerations and constants
 
diff -up ./imdb/parser/http/bsouplxml/etree.py.orig ./imdb/parser/http/bsouplxml/etree.py
--- ./imdb/parser/http/bsouplxml/etree.py.orig	2009-04-01 04:38:24.000000000 +0200
+++ ./imdb/parser/http/bsouplxml/etree.py	2009-04-01 04:39:19.000000000 +0200
@@ -21,8 +21,9 @@ along with this program; if not, write t
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """
 
-import _bsoup as BeautifulSoup
-from _bsoup import Tag as Element
+#use system BeautifulSoup
+import BeautifulSoup
+from BeautifulSoup import Tag as Element
 
 import bsoupxpath
 
diff -up ./imdb/parser/http/bsouplxml/html.py.orig ./imdb/parser/http/bsouplxml/html.py
--- ./imdb/parser/http/bsouplxml/html.py.orig	2009-04-01 04:38:14.000000000 +0200
+++ ./imdb/parser/http/bsouplxml/html.py	2009-04-01 04:39:36.000000000 +0200
@@ -21,8 +21,8 @@ along with this program; if not, write t
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """
 
-import _bsoup as BeautifulSoup
-
+#use system BeautifulSoup
+import BeautifulSoup
 
 def fromstring(html_string):
     """Return a DOM representation of the string."""


Index: python-imdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-imdb/F-10/python-imdb.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-imdb.spec	25 Dec 2008 11:45:40 -0000	1.1
+++ python-imdb.spec	1 Apr 2009 03:57:51 -0000	1.2
@@ -4,8 +4,9 @@
 %define realname IMDbPY
 
 Name:           python-imdb
-Version:        3.8
-Release:        3%{?dist}
+Provides:       IMDBpy = %{version}-%{release}
+Version:        4.0
+Release:        4%{?dist}
 Summary:        Retrieve and manage the data of the IMDb movie database
 
 Group:          Development/Languages
@@ -13,10 +14,10 @@
 URL:            http://imdbpy.sourceforge.net/
 Source0:        http://prdownloads.sourceforge.net/imdbpy/%{realname}-%{version}.tar.gz
 #use system beautifulsoup
-Patch0:         %{name}-beautifulsoup.patch
+Patch0:         %{name}-%{version}-beautifulsoup.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  python-devel
+BuildRequires:  python-devel, python-setuptools
 
 Requires:       python-sqlobject, python-lxml, python-BeautifulSoup
 
@@ -32,7 +33,7 @@
 %patch0 -p0
 
 #patch removes need for bundled beautifulsoup, so let's remove it
-rm -f imdb/parser/http/_bsoup.py
+rm -f imdb/parser/http/bsouplxml/_bsoup.py
 
 #fix end-of-line-encoding
 %{__sed} -i 's/\r//' docs/imdbpy.cfg
@@ -56,6 +57,9 @@
 mv bin examples
 chmod 0644 examples/*
 
+#don't include these twice
+rm -f $RPM_BUILD_ROOT%{_prefix}/doc/*
+rm -f $RPM_BUILD_ROOT%{_prefix}/etc/*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -69,6 +73,16 @@
 
 
 %changelog
+* Wed Apr 01 2009 Sindre Pedersen Bjørdal <sindrepb at fedoraproject.org> - 4.0-4
+- Add Provides: upstream name
+- Add missing python-setuptools buildrequires
+
+* Wed Apr 01 2009 Sindre Pedersen Bjørdal <sindrepb at fedoraproject.org> - 4.0-2
+- New upstream release
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.8-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sun Dec 22 2008 Sindre Pedersen Bjørdal <sindrepb at fedoraproject.org> - 3.8-3
 - Add patch to use system BeautifulSoup
 - Add beautifulsoup requires


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-imdb/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	25 Dec 2008 11:45:40 -0000	1.2
+++ sources	1 Apr 2009 03:57:51 -0000	1.3
@@ -1 +1 @@
-da982f60de30883c224fe81d7b1dfe2e  IMDbPY-3.8.tar.gz
+873fb1550f0fde04acbb297b74c94377  IMDbPY-4.0.tar.gz