port from python2 to python3

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

diff --git a/debian/control b/debian/control
index 956ecb0cd3cc7678a0117759dc4ab92f77d39a2e..05b41113ef44cda19f1805776b6c6bdea03202b2 100755 (executable)
--- a/debian/control
+++ b/debian/control
@@ -2,14 +2,14 @@ Source: yum-metadata-parser
 Section: python
 Priority: extra
 Maintainer: Mike Miller <mtmiller@ieee.org>
-Build-Depends: debhelper (>= 9), dh-python, python-dev, python-all-dev (>= 2.6.6-3~), pkg-config, libglib2.0-dev, libsqlite3-dev, libxml2-dev
+Build-Depends: debhelper (>= 9), dh-python, python3-dev, python3-all-dev, pkg-config, libglib2.0-dev, libsqlite3-dev, libxml2-dev
 Standards-Version: 3.9.4
-X-Python-Version: >= 2.4
+X-Python-Version: >= 3.1
 Homepage: http://yum.baseurl.org/
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=users/mtmiller-guest/yum-metadata-parser.git
 Vcs-Git: git://anonscm.debian.org/users/mtmiller-guest/yum-metadata-parser.git
 
-Package: python-sqlitecachec
+Package: python3-sqlitecachec
 Architecture: any
 Depends: ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}
 Provides: ${python:Provides}

diff --git a/debian/rules b/debian/rules
index 4647c9c005d40e69a521a9c2ec268f15768df370..641186e52d53d2f9909aad1be3c94f383b296efd 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,4 @@
 #!/usr/bin/make -f
 
 %:
-       dh $@ --with python2
+       dh $@ --with python3 --buildsystem=pybuild

diff --git a/packaging/yum-metadata-parser.manifest b/packaging/yum-metadata-parser.manifest
deleted file mode 100644 (file)
index 017d22d..0000000
--- a/packaging/yum-metadata-parser.manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-<manifest>
- <request>
-    <domain name="_"/>
- </request>
-</manifest>

diff --git a/packaging/yum-metadata-parser.spec b/packaging/yum-metadata-parser.spec
index 7bb6b5488a62cee009895d7ef0ee35d1c6f27401..27dfa9f4b87920bf97fa97db6d61179505ce1504 100644 (file)
--- a/packaging/yum-metadata-parser.spec
+++ b/packaging/yum-metadata-parser.spec
@@ -1,44 +1,38 @@
-%{!?python_sitelib_platform: %define python_sitelib_platform %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           yum-metadata-parser
 Version:        1.1.4
 Release:        0
 License:        GPL-2.0
 Summary:        A fast metadata parser for yum
-Url:            http://linux.duke.edu/projects/yum/
+Url:            http://devel.linux.duke.edu/cgi-bin/viewcvs.cgi/yum-metadata-parser/
 Group:          Development/Libraries
-Source0:        http://linux.duke.edu/projects/yum/download/%{name}/%{name}-%{version}.tar.gz
-Source1001:    yum-metadata-parser.manifest
+Source0:        %{name}-%{version}.tar.bz2
 BuildRequires:  pkgconfig
 BuildRequires:  sqlite-devel
-BuildRequires:  pkgconfig(glib-2.0)
-BuildRequires:  pkgconfig(libxml-2.0)
-BuildRequires:  pkgconfig(python-2.7)
-Requires:       glib2 >= 2.15
-Conflicts: yum < 3.2.0
+BuildRequires:  glib2-devel
+BuildRequires:  libxml2-devel
+BuildRequires:  python3-devel
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+#!BuildIgnore: post-build-checks
 
 %description
 Fast metadata parser for yum implemented in C.
 
 %prep
 %setup -q
-cp %{SOURCE1001} .
 
 %build
-python setup.py build
+export CFLAGS="$RPM_OPT_FLAGS"
+python3 setup.py build
 
 %install
-rm -rf %{buildroot}
-python setup.py install -O1 --root=%{buildroot}
+python3 setup.py install -O1 --prefix="%{_prefix}" --root="$RPM_BUILD_ROOT"
+
+%clean
+rm -rf $RPM_BUILD_ROOT
 
 %files
-%manifest %{name}.manifest
 %defattr(-,root,root,-)
-%{python_sitelib_platform}/_sqlitecache.so
-%{python_sitelib_platform}/sqlitecachec.py
-%{python_sitelib_platform}/sqlitecachec.pyc
-%{python_sitelib_platform}/sqlitecachec.pyo
-
-%{python_sitelib_platform}/*egg-info
+%{python3_sitearch}/*
 
 %changelog

diff --git a/setup.py b/setup.py
index d0d0429f9a242167541ef8ceb8eee002358452c9..1aacd9aeea72fdffbea285904aea5626ea2b9a5c 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -2,15 +2,15 @@ import os, string
 from distutils.core import setup, Extension
 
 pc = os.popen("pkg-config --cflags-only-I glib-2.0 libxml-2.0 sqlite3", "r")
-includes = map(lambda x:x[2:], string.split(pc.readline()))
+includes = [x[2:] for x in pc.readline().split()]
 pc.close()
 
 pc = os.popen("pkg-config --libs-only-l glib-2.0 libxml-2.0 sqlite3", "r")
-libs = map(lambda x:x[2:], string.split(pc.readline()))
+libs = [x[2:] for x in pc.readline().split()]
 pc.close()
 
 pc = os.popen("pkg-config --libs-only-L glib-2.0 libxml-2.0 sqlite3", "r")
-libdirs = map(lambda x:x[2:], string.split(pc.readline()))
+libdirs = [x[2:] for x in pc.readline().split()]
 pc.close()
 
 module = Extension('_sqlitecache',
@@ -27,3 +27,4 @@ setup (name = 'yum-metadata-parser',
        description = 'A fast YUM meta-data parser',
           py_modules = ['sqlitecachec'],
        ext_modules = [module])
+

diff --git a/yum-metadata-parser.spec b/yum-metadata-parser.spec
deleted file mode 100644 (file)
index 2d40714..0000000
--- a/yum-metadata-parser.spec
+++ /dev/null
@@ -1,88 +0,0 @@
-%{!?python_sitelib_platform: %define python_sitelib_platform %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-
-Summary: A fast metadata parser for yum
-Name: yum-metadata-parser
-Version: 1.1.4
-Release: 1
-Source0: %{name}-%{version}.tar.gz
-License: GPL
-Group: Development/Libraries
-URL: http://devel.linux.duke.edu/cgi-bin/viewcvs.cgi/yum-metadata-parser/
-Requires: yum >= 2.6.2
-BuildRequires: python-devel
-BuildRequires: glib2-devel
-BuildRequires: libxml2-devel
-BuildRequires: sqlite-devel
-BuildRequires: pkgconfig
-BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%description
-Fast metadata parser for yum implemented in C.
-
-%prep
-%setup
-
-%build
-%{__python} setup.py build
-
-%install
-%{__python} setup.py install -O1 --root=%{buildroot}
-
-%clean
-%{__rm} -rf %{buildroot}
-
-%files
-%defattr(-,root,root)
-%doc README AUTHORS ChangeLog
-%{python_sitelib_platform}/_sqlitecache.so
-%{python_sitelib_platform}/sqlitecachec.py
-%{python_sitelib_platform}/sqlitecachec.pyc
-%{python_sitelib_platform}/sqlitecachec.pyo
-%{python_sitelib_platform}/*egg-info
-
-
-%changelog
-* Thu Jan  7 2010 Seth Vidal <skvidal at fedoraproject.org>
-- 1.1.4 b/c I made a mistake
-
-* Thu Jan  7 2010 Seth Vidal <skvidal at fedoraproject.org>
-- add the egginfo support for python 2.5 and above
-
-* Thu Jan  7 2010 Seth Vidal <skvidal at fedoraproject.org> 
-- bump the version number for an official release
-
-* Wed Aug 29 2007 Seth Vidal <skvidal at fedoraproject.org>
-- remove the %{dist} which doesn't really belong in the upstream pkg
-
-* Fri Aug 24 2007 Seth Vidal <skvidal at fedoraproject.org>
-- 1.1.2
-
-* Wed May 16 2007 Paul Nasrat <pnasrat at redhat.com>
-- Expose DBVERSION
-
-* Fri Apr 27 2007 Seth Vidal <skvidal at linux.duke.edu>
-- split out 1.1.0 for dbversion 10
-
-* Wed Apr  4 2007 Seth Vidal <skvidal at linux.duke.edu>
-- 1.0.4
-
-* Sun Jan  7 2007 Seth Vidal <skvidal at linux.duke.edu>
-- 1.0.3
-
-* Wed Jul 12 2006 Seth Vidal <skvidal at linux.duke.edu>
-- 1.0.2
-
-* Mon Jun 19 2006 Seth Vidal <skvidal at linux.duke.edu>
-- 1.0.1
-
-* Mon Jun 05 2006 Tambet Ingo <tambet@ximian.com> - 1.0-3
-- Require yum >= 2.6.2
-
-* Sat Jun 04 2006 Terje Rosten <terje.rosten@pvv.org> - 1.0-2
-- add buildrequires
-- doc files
-- url
-
-* Fri Jun 02 2006 Terje Rosten <terje.rosten@pvv.org> - 1.0-0.1
-- initial package
-