@@ -1,7 +1,10 @@

+%{!?python2_sitelib: %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}

+%{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}

+

 Summary:        Hawkey

 Name:           hawkey

 Version:        2017.1

-Release:        1%{?dist}

+Release:        2%{?dist}

 License:        LGPLv2+

 URL:            http://fedoraproject.org/wiki/Features/Hawkey

 Source0:        https://github.com/rpm-software-management/hawkey/archive/%{name}-%{version}.tar.gz

@@ -44,16 +47,43 @@ Requires:   python2

 %description -n python-hawkey

 Python 2 bindings for the hawkey library.

+%package -n python3-%{name}

+Summary:        Python 3 bindings for the hawkey library

+%{?python_provide:%python_provide python3-%{name}}

+BuildRequires:  python3-devel

+BuildRequires:  python3-sphinx

+Requires:       %{name} = %{version}-%{release}

+

+%description -n python3-%{name}

+Python 3 bindings for the hawkey library.

+

 %prep

 %setup -qn hawkey-hawkey-0.6.4-1

 sed -i 's/ADD_SUBDIRECTORY (doc)//' CMakeLists.txt

+mkdir build

+mkdir build-py3

 %build

+pushd build

 cmake \

-    -DCMAKE_INSTALL_PREFIX=%{_prefix}

+    -DCMAKE_INSTALL_PREFIX=%{_prefix} ..

 make %{?_smp_mflags}

+popd

+pushd build-py3

+cmake \

+    -DCMAKE_INSTALL_PREFIX=%{_prefix} \

+    -DPYTHON_DESIRED:str=3 ..

+popd

+

 %install

+pushd build

 make DESTDIR=%{buildroot} install

 find %{buildroot} -name '*.la' -delete

+popd

+pushd build-py3

+make DESTDIR=%{buildroot} install

+find %{buildroot} -name '*.la' -delete

+popd

+

 %check

 cp src/libhawkey.* /lib

 easy_install nose

@@ -66,7 +96,11 @@ tests/test_main tests/repos/

 %files -n python-hawkey

 %defattr(-,root,root)

-%{python_sitearch}/

+%{python2_sitelib}/*

+

+%files -n python3-hawkey

+%defattr(-,root,root)

+%{python3_sitelib}/*

 %files devel

 %defattr(-,root,root)

@@ -76,6 +110,8 @@ tests/test_main tests/repos/

 %exclude %{python_sitearch}/*

 %changelog

+*   Mon May 22 2017 Xiaolin Li <xiaolinl@vmware.com> 2017.1-2

+-   Added python3 subpackage.

 *   Wed Apr 05 2017 Dheeraj Shetty <dheerajs@vmware.com> 2017.1-1

 -   Upgrading to version 2017.1 which is 0.6.4-1.

 *   Mon Dec 19 2016 Xiaolin Li <xiaolinl@vmware.com> 2014.1-6

@@ -1,18 +1,42 @@

+%{!?python2_sitelib: %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}

+%{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}

+

 Summary:        POSIX capability Library

 Name:           libcap-ng

 Version:        0.7.8

-Release:        1%{?dist}

+Release:        2%{?dist}

 License:        LGPLv2+

 Group:          System Environment/Libraries

 URL:            http://people.redhat.com/sgrubb/libcap-ng

 Source0:        http://people.redhat.com/sgrubb/libcap-ng/%{name}-%{version}.tar.gz

 %define sha1    libcap-ng=59a85129dd0d062c14320f6c611696669a1cc0c0

+

+%description

+The libcap-ng library is intended to make programming with posix capabilities much easier than the traditional libcap library. It includes utilities that can analyse all currently running applications and print out any capabilities and whether or not it has an open ended bounding set. An open bounding set without the securebits "NOROOT" flag will allow full capabilities escalation for apps retaining uid 0 simply by calling execve.

+

+%package  -n    python2-libcap-ng

+Summary:        Python bindings for libcap-ng

+License:        LGPLv2+

 BuildRequires:  python2-devel

 BuildRequires:  python2-libs

+BuildRequires:  swig

+Requires:       %{name} = %{version}-%{release}

 Requires:       python2

-%description

-The libcap-ng library is intended to make programming with posix capabilities much easier than the traditional libcap library. It includes utilities that can analyse all currently running applications and print out any capabilities and whether or not it has an open ended bounding set. An open bounding set without the securebits "NOROOT" flag will allow full capabilities escalation for apps retaining uid 0 simply by calling execve.

+%description -n python2-libcap-ng

+The python2-libcap-ng package contains the python2 bindings for libcap-ng.

+

+%package  -n    python3-libcap-ng

+Summary:        Python3 bindings for libaudit

+License:        LGPLv2+

+BuildRequires:  python3-devel

+BuildRequires:  python3-libs

+BuildRequires:  swig

+Requires:       %{name} = %{version}-%{release}

+Requires:       python3

+

+%description -n python3-libcap-ng

+The python3-libcap-ng package contains the python3 bindings for libcap-ng.

 %package devel

 Summary:    The libraries and header files needed for libcap-ng development.

@@ -29,11 +53,12 @@ The libraries and header files needed for libcap_ng development.

     --prefix=%{_prefix} \

     --libdir=%{_libdir} \

     --with-python \

-    --without-python3

+    --with-python3

 make %{?_smp_mflags}

 %install

-make DESTDIR=%{buildroot} install 

+make DESTDIR=%{buildroot} install

+find %{buildroot} -name '*.la' -delete

 %check

 chown -Rv nobody .

@@ -45,11 +70,14 @@ sudo -u nobody -s /bin/bash -c "PATH=$PATH make -k check"

 %files

 %defattr(-, root, root)

 %{_libdir}/*.so.*

-%{_libdir}/*.a

-%{_libdir}/*.la

 %{_bindir}/*

 %{_mandir}/man8/*

-%{_datadir}/aclocal/*.m4

+

+%files -n python2-libcap-ng

+%{python2_sitelib}/*

+

+%files -n python3-libcap-ng

+%{python3_sitelib}/*

 %files devel

 %defattr(-, root, root)

@@ -57,8 +85,12 @@ sudo -u nobody -s /bin/bash -c "PATH=$PATH make -k check"

 %{_libdir}/pkgconfig/*.pc

 %{_includedir}/*.h

 %{_mandir}/man3/*

+%{_datadir}/aclocal/*.m4

+%{_libdir}/*.a

 %changelog

+*   Mon May 22 2017 Xiaolin Li <xiaolinl@vmware.com> 0.7.8-2

+-   Added python3 subpackage.

 *   Mon Apr 03 2017 Divya Thaluru <dthaluru@vmware.com> 0.7.8-1

 -   Upgrade version to 0.7.8

 *   Wed Dec 07 2016 Xiaolin Li <xiaolinl@vmware.com> 0.7.7-3

new file mode 100644

@@ -0,0 +1,31 @@

+diff --git a/iniparse/compat.py b/iniparse/compat.py

+index db89ed8..09ffa23 100644

+--- a/iniparse/compat.py

+@@ -56,7 +56,7 @@ class RawConfigParser(object):

+         # The default section is the only one that gets the case-insensitive

+         # treatment - so it is special-cased here.

+         if section.lower() == "default":

+-            raise ValueError, 'Invalid section name: %s' % section

++            raise ValueError('Invalid section name: %s' % section)

+ 

+         if self.has_section(section):

+             raise DuplicateSectionError(section)

+@@ -143,7 +143,7 @@ class RawConfigParser(object):

+     def getboolean(self, section, option):

+         v = self.get(section, option)

+         if v.lower() not in self._boolean_states:

+-            raise ValueError, 'Not a boolean: %s' % v

++            raise ValueError('Not a boolean: %s' % v)

+         return self._boolean_states[v.lower()]

+ 

+     def has_option(self, section, option):

+@@ -234,7 +234,7 @@ class ConfigParser(RawConfigParser):

+             if "%(" in value:

+                 try:

+                     value = value % vars

+-                except KeyError, e:

++                except KeyError as e:

+                     raise InterpolationMissingOptionError(

+                         option, section, rawval, e.args[0])

+             else:

@@ -1,20 +1,22 @@

-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

+%{!?python2_sitelib: %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}

+%{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}

 Name:           python-iniparse

 Version:        0.4

-Release:        3%{?dist}

+Release:        4%{?dist}

 Summary:        Python Module for Accessing and Modifying Configuration Data in INI files

 Group:          Development/Libraries

 License:        MIT

 URL:            http://code.google.com/p/iniparse/

 Source0:        http://iniparse.googlecode.com/files/iniparse-%{version}.tar.gz

 %define sha1 iniparse=2b2af8a19f3e5c212c27d7c524cd748fa0b38650

-Vendor:		VMware, Inc.

-Distribution:	Photon

-BuildRequires:	python2-devel

-BuildRequires:	python2-libs

-BuildArch:	noarch

-Requires:	python2

+Patch0:         iniparse-py3-build.patch

+Vendor:         VMware, Inc.

+Distribution:   Photon

+BuildRequires:  python2-devel

+BuildRequires:  python2-libs

+BuildArch:      noarch

+Requires:       python2

 %description

 iniparse is an INI parser for Python which is API compatible

@@ -23,19 +25,39 @@ files (order of sections & options, indentation, comments, and blank

 lines are preserved when data is updated), and is more convenient to

 use.

+%package -n     python3-iniparse

+Summary:        python-iniparse

+BuildRequires:  python3

+BuildRequires:  python3-devel

+BuildRequires:  python3-libs

+Requires:       python3

+Requires:       python3-libs

+Requires:       python3-pycparser

+

+%description -n python3-iniparse

+Python 3 version.

+

 %prep

 %setup -q -n iniparse-%{version}

-

+%patch0 -p1

+rm -rf ../p3dir

+cp -a . ../p3dir

 %build

-%{__python} setup.py build

+python2 setup.py build

+pushd ../p3dir

+python3 setup.py build

+popd

 %install

-rm -rf $RPM_BUILD_ROOT

-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

+python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}

+pushd ../p3dir

+python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}

+popd

 # fixes

-chmod 644 $RPM_BUILD_ROOT//usr/share/doc/iniparse-%{version}/index.html

-mv $RPM_BUILD_ROOT/usr/share/doc/iniparse-%{version} $RPM_BUILD_ROOT/usr/share/doc/python-iniparse-%{version}

+chmod 644 %{buildroot}/usr/share/doc/iniparse-%{version}/index.html

+mv %{buildroot}/usr/share/doc/iniparse-%{version} %{buildroot}/usr/share/doc/python-iniparse-%{version}

+

 %check

 cp -r iniparse/ tests/

@@ -47,46 +69,58 @@ python test_ini.py

 python test_multiprocessing.py

 python test_unicode.py

-%clean

-rm -rf $RPM_BUILD_ROOT

+pushd ../p3dir

+cp -r iniparse/ tests/

+cd tests

+python3 test_misc.py

+python3 test_tidy.py

+python3 test_fuzz.py

+python3 test_ini.py

+python3 test_multiprocessing.py

+python3 test_unicode.py

+popd

 %files

 %defattr(-,root,root,-)

 %doc  %{_docdir}/python-iniparse-%{version}/*

-%{python_sitelib}/iniparse

-%{python_sitelib}/iniparse-%{version}-py*.egg-info

+%{python2_sitelib}/*

+%files -n python3-iniparse

+%defattr(-,root,root,-)

+%{python3_sitelib}/*

 %changelog

-*       Mon Oct 03 2016 ChangLee <changLee@vmware.com> 0.4-3

--       Modified %check

-*	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.4-2

--	GA - Bump release of all rpms

-* Sat Jun 12 2010 Paramjit Oberoi <param@cs.wisc.edu> - 0.4-1

-- Release 0.4

-* Sat Apr 17 2010 Paramjit Oberoi <param@cs.wisc.edu> - 0.3.2-1

-- Release 0.3.2

-* Mon Mar 2 2009 Paramjit Oberoi <param@cs.wisc.edu> - 0.3.1-1

-- Release 0.3.1

-* Fri Feb 27 2009 Paramjit Oberoi <param@cs.wisc.edu> - 0.3.0-1

-- Release 0.3.0

-* Tue Dec 6 2008 Paramjit Oberoi <param@cs.wisc.edu> - 0.2.4-1

-- Release 0.2.4

-- added egg-info file to %%files

-* Tue Dec 11 2007 Paramjit Oberoi <param@cs.wisc.edu> - 0.2.3-1

-- Release 0.2.3

-* Tue Sep 24 2007 Paramjit Oberoi <param@cs.wisc.edu> - 0.2.2-1

-- Release 0.2.2

-* Tue Aug 7 2007 Paramjit Oberoi <param@cs.wisc.edu> - 0.2.1-1

-- Release 0.2.1

-* Fri Jul 27 2007 Tim Lauridsen <timlau@fedoraproject.org> - 0.2-3

-- relocated doc to %{_docdir}/python-iniparse-%{version}

-* Thu Jul 26 2007 Tim Lauridsen <timlau@fedoraproject.org> - 0.2-2

-- changed name from iniparse to python-iniparse

-* Tue Jul 17 2007 Tim Lauridsen <timlau@fedoraproject.org> - 0.2-1

-- Release 0.2

-- Added html/* to %%doc

-* Fri Jul 13 2007 Tim Lauridsen <timlau@fedoraproject.org> - 0.1-1

-- Initial build.

+*   Mon May 22 2017 Xiaolin Li <xiaolinl@vmware.com> 0.4-4

+-   Added python3 subpackage.

+*   Mon Oct 03 2016 ChangLee <changLee@vmware.com> 0.4-3

+-   Modified %check

+*   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.4-2

+-   GA - Bump release of all rpms

+*   Sat Jun 12 2010 Paramjit Oberoi <param@cs.wisc.edu> - 0.4-1

+-   Release 0.4

+*   Sat Apr 17 2010 Paramjit Oberoi <param@cs.wisc.edu> - 0.3.2-1

+-   Release 0.3.2

+*   Mon Mar 2 2009 Paramjit Oberoi <param@cs.wisc.edu> - 0.3.1-1

+-   Release 0.3.1

+*   Fri Feb 27 2009 Paramjit Oberoi <param@cs.wisc.edu> - 0.3.0-1

+-   Release 0.3.0

+*   Tue Dec 6 2008 Paramjit Oberoi <param@cs.wisc.edu> - 0.2.4-1

+-   Release 0.2.4

+-   added egg-info file to %%files

+*   Tue Dec 11 2007 Paramjit Oberoi <param@cs.wisc.edu> - 0.2.3-1

+-   Release 0.2.3

+*   Tue Sep 24 2007 Paramjit Oberoi <param@cs.wisc.edu> - 0.2.2-1

+-   Release 0.2.2

+*   Tue Aug 7 2007 Paramjit Oberoi <param@cs.wisc.edu> - 0.2.1-1

+-   Release 0.2.1

+*   Fri Jul 27 2007 Tim Lauridsen <timlau@fedoraproject.org> - 0.2-3

+-   relocated doc to %{_docdir}/python-iniparse-%{version}

+*   Thu Jul 26 2007 Tim Lauridsen <timlau@fedoraproject.org> - 0.2-2

+-   changed name from iniparse to python-iniparse

+*   Tue Jul 17 2007 Tim Lauridsen <timlau@fedoraproject.org> - 0.2-1

+-   Release 0.2

+-   Added html/* to %%doc

+*   Fri Jul 13 2007 Tim Lauridsen <timlau@fedoraproject.org> - 0.1-1

+-   Initial build.

new file mode 100644

@@ -0,0 +1,41 @@

+From 8472bc2706377c93752b2f0b8429b0d18639b65c Mon Sep 17 00:00:00 2001

+From: Martin Kletzander <mkletzan@redhat.com>

+Date: Fri, 5 Apr 2013 15:12:15 +0200

+Subject: [PATCH] setup: make build work on python 3

+

+In python 3, the string module doesn't have 'split' function anymore

+and users are encouraged to use '.split()' on the string itself.  Also

+'map()' is lazy and returns an iterable map object, but setup expects

+only a list, so it has to be wrapped in 'list()'.  All of this works

+with python2 as well.

+

+Signed-off-by: Martin Kletzander <mkletzan@redhat.com>

+---

+ setup.py | 8 ++++----

+ 1 file changed, 4 insertions(+), 4 deletions(-)

+

+diff --git a/setup.py b/setup.py

+index d0d0429..a42a9b7 100644

+--- a/setup.py

+@@ -1,16 +1,16 @@

+-import os, string

++import os

+ 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 = list(map(lambda x:x[2:], 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 = list(map(lambda x:x[2:], 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 = list(map(lambda x:x[2:], pc.readline().split()))

+ pc.close()

+ 

+ module = Extension('_sqlitecache',

@@ -1,52 +1,78 @@

-%{!?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:    	3%{?dist}

-Source0:    	%{name}-%{version}.tar.gz

-%define sha1 yum-metadata-parser=044e69a04ea5ac39d79020d9e1f1a35c9dc64d9b

-License:    	GPLv2+

-Group:      	Development/Libraries

-URL:        	http://devel.linux.duke.edu/cgi-bin/viewcvs.cgi/yum-metadata-parser/

-Vendor:		VMware, Inc.

-Distribution:	Photon

-BuildRequires: pkg-config

-BuildRequires: python2-devel

-BuildRequires: glib-devel

-BuildRequires: libxml2

-BuildRequires: libxml2-devel

-BuildRequires: sqlite-devel

-BuildRequires:	python2-libs

-Requires:	libxml2

-Requires:	glib

-Requires:	python2

+%{!?python2_sitelib: %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}

+%{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}

+

+Summary:        A fast metadata parser for yum

+Name:           yum-metadata-parser

+Version:        1.1.4

+Release:        4%{?dist}

+License:        GPLv2+

+Group:          Development/Libraries

+URL:            http://devel.linux.duke.edu/cgi-bin/viewcvs.cgi/yum-metadata-parser/

+Vendor:         VMware, Inc.

+Distribution:   Photon

+Source0:        %{name}-%{version}.tar.gz

+%define sha1    yum-metadata-parser=044e69a04ea5ac39d79020d9e1f1a35c9dc64d9b

+Patch0:         Upstream-py3-string-split.patch

+BuildRequires:  pkg-config

+BuildRequires:  python2-devel

+BuildRequires:  glib-devel

+BuildRequires:  libxml2

+BuildRequires:  libxml2-devel

+BuildRequires:  sqlite-devel

+BuildRequires:  python2-libs

+Requires:       libxml2

+Requires:       glib

+Requires:       python2

 %description

 Fast metadata parser for yum implemented in C.

+%package -n     python3-yum-metadata-parser

+Summary:        python3-yum-metadata-parser

+BuildRequires:  python3

+BuildRequires:  python3-devel

+BuildRequires:  python3-libs

+Requires:       python3

+Requires:       python3-libs

+Requires:       libxml2

+Requires:       glib

+

+%description -n python3-yum-metadata-parser

+

 %prep

 %setup

+%patch0 -p1

+rm -rf ../p3dir

+cp -a . ../p3dir

 %build

-%{__python} setup.py build

+python2 setup.py build

+pushd ../p3dir

+python3 setup.py build

+popd

 %install

-%{__python} setup.py install -O1 --root=%{buildroot}

-

-%clean

-%{__rm} -rf %{buildroot}

+python2 setup.py install -O1 --root=%{buildroot}

+pushd ../p3dir

+python3 setup.py install -O1 --root=%{buildroot}

+popd

 %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

+%{python2_sitelib}/_sqlitecache.so

+%{python2_sitelib}/sqlitecachec.py

+%{python2_sitelib}/sqlitecachec.pyc

+%{python2_sitelib}/sqlitecachec.pyo

+%{python2_sitelib}/*egg-info

+

+%files -n python3-yum-metadata-parser

+%defattr(-,root,root)

+%{python3_sitelib}/*

 %changelog

+*   Thu May 18 2017 Xiaolin Li <xiaolinl@vmware.com> 1.1.4-4

+-   Added python3 site-packages.

 *   Wed Nov 16 2016 Alexey Makhalov <ppadmavilasom@vmware.com> 1.1.4-3

 -   Use sqlite-{devel,libs}

 *   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.1.4-2

--   GA - Bump release of all rpms

+-   GA - Bump release of all rpms

\ No newline at end of file