From: biao716.wang <biao716.wang@samsung.com>
Date: Tue, 26 Jul 2022 07:56:46 +0000 (+0900)
Subject: fix build error with python3
X-Git-Tag: accepted/tools/devbase/tools/20250527.103829~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F01%2F278801%2F11;p=tools%2Fpython-urlgrabber.git

fix build error with python3

Change-Id: I976b3cdae25e11052ddadb3e4e3bc5679a44ad9f
Signed-off-by: biao716.wang <biao716.wang@samsung.com>
---

diff --git a/debian/control b/debian/control
index 67f13df..53d5bb2 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source:  python-urlgrabber
 Section: devel
 Priority: extra
 Maintainer: Jong-Woo Chae <jonwoo.chae@samsung.com>
-Build-Depends: debhelper (>= 7.0.15), cdbs, python3, python-is-python3, python3-all, python3-dev, dh-python, python3-docutils, python3-six, python3-pycurl
+Build-Depends: debhelper (>= 7.0.15), cdbs, python3, python3-all, python3-dev, dh-python, python3-docutils, python3-six, python3-pycurl
 Standards-Version: 4.1.0
 Homepage: http://www.tizen.org
 
diff --git a/debian/rules b/debian/rules
index 79a8246..045ed4f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,8 +6,8 @@ override_dh_auto_install:
 	dh_auto_install
 	# remove unneeded documents installed by setup.py
 	-rm -rf $(CURDIR)/debian/python-urlgrabber/usr/share/doc/urlgrabber-*
-	#mkdir -p $(CURDIR)/debian/tmp
-	#python3 setup.py install --prefix=/usr --root=$(CURDIR)/debian/tmp
+	mkdir -p $(CURDIR)/debian/tmp
+	python3 setup.py install --prefix=/usr --root=$(CURDIR)/debian/tmp
 override_dh_installchangelogs:
 	dh_installchangelogs ChangeLog
 
diff --git a/packaging/python-urlgrabber.manifest b/packaging/python-urlgrabber.manifest
deleted file mode 100644
index 017d22d..0000000
--- a/packaging/python-urlgrabber.manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-<manifest>
- <request>
-    <domain name="_"/>
- </request>
-</manifest>
diff --git a/packaging/python-urlgrabber.spec b/packaging/python-urlgrabber.spec
index 58e8755..01ce55c 100644
--- a/packaging/python-urlgrabber.spec
+++ b/packaging/python-urlgrabber.spec
@@ -1,4 +1,4 @@
-Name:           python-urlgrabber
+Name:           python3-urlgrabber
 Summary:        A high-level cross-protocol url-grabber
 Version:        4.1.0
 Release:        0
@@ -7,12 +7,11 @@ License:        LGPL-2.1+
 BuildArch:      noarch
 URL:            http://urlgrabber.baseurl.org/
 Source0:        urlgrabber-%{version}.tar.gz
-Source1001:     python-urlgrabber.manifest
 BuildRequires:  python3-pycurl
 BuildRequires:  python3-six
 BuildRequires:  python3-setuptools
-Requires:       python-pycurl
-Requires:       python-six
+Requires:       python3-pycurl
+Requires:       python3-six
 Provides:       urlgrabber = %{version}-%{release}
 
 %description
@@ -24,16 +23,14 @@ authentication, proxies and more.
 %setup -q -n urlgrabber-%{version}
 
 %build
-cp %{SOURCE1001} .
-python setup.py build
+python3 setup.py build
 
 %install
-python setup.py install --root=%{buildroot} -O1 --prefix=%{_prefix}
+python3 setup.py install --root=%{buildroot} -O1 --prefix=%{_prefix}
+rm -rf %{buildroot}%{_datadir}/doc/urlgrabber-%{version} # Remove wrongly installed docs
 
 
-%remove_docs
-
 %files
-%manifest %{name}.manifest
 %{_bindir}/urlgrabber
-%{python_sitelib}/urlgrabber*
+%{python3_sitelib}/*
+
diff --git a/setup.py b/setup.py
index 17401e1..b6714a2 100755
--- a/setup.py
+++ b/setup.py
@@ -48,6 +48,5 @@ setup(
     scripts = ['scripts/urlgrabber'],
     data_files = [
         ('share/doc/' + pkg_name + '-' + pkg_version, ['README','LICENSE', 'TODO', 'ChangeLog']),
-        ('libexec', ['scripts/urlgrabber-ext-down']),
    ],
 )