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

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

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

+

 Summary:        Kernel Audit Tool

 Name:           audit

 Version:        2.7.5

-Release:        1%{?dist}

+Release:        2%{?dist}

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

 %define sha1    audit=7aaae7ea80f2280b25f243916e8d18b7338b5f53

 License:        GPLv2+

@@ -9,8 +12,6 @@ Group:          System Environment/Security

 URL:            http://people.redhat.com/sgrubb/audit/

 Vendor:         VMware, Inc.

 Distribution:   Photon

-BuildRequires:  python2-devel

-BuildRequires:  python2-libs

 BuildRequires:  krb5-devel

 BuildRequires:  openldap

 BuildRequires:  go

@@ -22,7 +23,6 @@ BuildRequires:  systemd

 Requires:       systemd

 Requires:       krb5

 Requires:       openldap

-Requires:       python2

 Requires:       tcp_wrappers

 Requires:       libcap-ng

 Requires:       gawk

@@ -32,13 +32,37 @@ The audit package contains the user space utilities for

 storing and searching the audit records generate by

 the audit subsystem in the Linux 2.6 kernel.

-%package devel

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

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

+%package        devel

+Summary:        The libraries and header files needed for audit development.

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

-%description devel

+%description    devel

 The libraries and header files needed for audit development.

+%package        python

+Summary:        Python bindings for libaudit

+License:        LGPLv2+

+BuildRequires:  python2-devel

+BuildRequires:  python2-libs

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

+Requires:       python2

+

+%description python

+The audit-python package contains the python2 bindings for libaudit

+and libauparse.

+

+%package  -n    python3-audit

+Summary:        Python3 bindings for libaudit

+License:        LGPLv2+

+BuildRequires:  python3-devel

+BuildRequires:  python3-libs

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

+Requires:       python3

+

+%description -n python3-audit

+The python3-audit package contains the python2 bindings for libaudit

+and libauparse.

+

 %prep

 %setup -q

@@ -50,12 +74,12 @@ The libraries and header files needed for audit development.

     --libdir=%{_libdir} \

     --sysconfdir=%{_sysconfdir} \

     --with-python=yes \

-    --without-python3 \

-        --with-libwrap \

+    --with-python3=yes \

+    --with-libwrap \

     --enable-gssapi-krb5=yes \

-        --with-libcap-ng=yes \

+    --with-libcap-ng=yes \

     --with-aarch64 \

-        --enable-zos-remote \

+    --enable-zos-remote \

     --with-golang \

     --enable-systemd \

     --disable-static

@@ -87,7 +111,6 @@ make %{?_smp_mflags} check

 %{_bindir}/*

 %{_sbindir}/*

 %{_libdir}/*.so.*

-%{_libdir}/python*/*

 %{_libdir}/systemd/system/auditd.service

 %{_libexecdir}/*

 %{_mandir}/man5/*

@@ -122,7 +145,17 @@ make %{?_smp_mflags} check

 %{_mandir}/man3/*

 /usr/share/aclocal/audit.m4

+%files python

+%defattr(-,root,root)

+%{python2_sitelib}/*

+

+%files -n python3-audit

+%defattr(-,root,root)

+%{python3_sitelib}/*

+

 %changelog

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

+-   Move python2 requires to python subpackage and added python3.

 *   Fri Apr 14 2017 Alexey Makhalov <amakhalov@vmware.com> 2.7.5-1

 -   Version update.

 *   Wed Dec 07 2016 Xiaolin Li <xiaolinl@vmware.com> 2.5-7

@@ -1,23 +1,21 @@

+%{!?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())")}

 # Got this spec from http://downloads.sourceforge.net/cracklib/cracklib-2.9.6.tar.gz

-Summary:	A password strength-checking library.

-Name:		cracklib

-Version:	2.9.6

-Release:	5%{?dist}

-Group:		System Environment/Libraries

-Source:		cracklib-%{version}.tar.gz

-%define sha1 cracklib-%{version}=9199e7b8830717565a844430653f5a90a04fcd65

-Source1:	cracklib-words-%{version}.gz

-%define sha1 cracklib-words-%{version}=b0739c990431a0971545dff347b50f922604c1cd

-Patch0:		CVE-2016-6318.patch

-URL:		http://sourceforge.net/projects/cracklib/

-License:	GPL

-Vendor:     VMware, Inc.

-Distribution: Photon

-

-BuildRequires: python2

-BuildRequires: python2-libs

-BuildRequires: python2-devel

+Summary:        A password strength-checking library.

+Name:           cracklib

+Version:        2.9.6

+Release:        6%{?dist}

+Group:          System Environment/Libraries

+Source:         cracklib-%{version}.tar.gz

+%define sha1    cracklib-%{version}=9199e7b8830717565a844430653f5a90a04fcd65

+Source1:        cracklib-words-%{version}.gz

+%define sha1    cracklib-words-%{version}=b0739c990431a0971545dff347b50f922604c1cd

+Patch0:         CVE-2016-6318.patch

+URL:            http://sourceforge.net/projects/cracklib/

+License:        GPL

+Vendor:         VMware, Inc.

+Distribution:   Photon

 %description

 CrackLib tests passwords to determine whether they match certain

@@ -41,12 +39,12 @@ passwords to see if they are at least minimally secure. If you

 install CrackLib, you'll also want to install the cracklib-dicts

 package.

-%package	dicts

-Summary:	The standard CrackLib dictionaries.

-Group:		System Environment/Utilities

+%package    dicts

+Summary:    The standard CrackLib dictionaries.

+Group:      System Environment/Utilities

 Requires:   cracklib

-%description	dicts

+%description    dicts

 The cracklib-dicts package includes the CrackLib dictionaries.

 CrackLib will need to use the dictionary appropriate to your system,

 which is normally put in /usr/share/dict/words.  Cracklib-dicts also contains

@@ -55,17 +53,22 @@ the utilities necessary for the creation of new dictionaries.

 If you are installing CrackLib, you should also install cracklib-dicts.

 %package devel

-Summary:	Cracklib link library & header file

-Group:		Development/Libraries

-Requires:	cracklib

+Summary:    Cracklib link library & header file

+Group:      Development/Libraries

+Requires:   cracklib

 %description devel

 The cracklib devel package include the needed library link and

 header files for development.

-%package python

+%package    python

 Summary:    The cracklib python module

 Group:      Development/Languages/Python

+BuildRequires:  python2

+BuildRequires:  python2-libs

+BuildRequires:  python2-devel

+BuildRequires:  python-setuptools

+

 Requires:   cracklib

 Requires:   python2

 Requires:   python2-libs

@@ -73,6 +76,20 @@ Requires:   python2-libs

 %description python

 The cracklib python module

+%package -n python3-cracklib

+Summary:        The cracklib python module

+Group:          Development/Languages/Python

+BuildRequires:  python3

+BuildRequires:  python3-libs

+BuildRequires:  python3-devel

+

+Requires:   cracklib

+Requires:   python3

+Requires:   python3-libs

+

+%description -n python3-cracklib

+The cracklib python3 module

+

 %package lang

 Summary:    The CrackLib language pack.

 Group:      System Environment/Libraries

@@ -97,9 +114,13 @@ CFLAGS="$RPM_OPT_FLAGS" ./configure \

   --libexecdir=%{_libdir} \

   --datadir=%{_datadir} \

   --disable-static \

-  --with-python

+  --without-python

 make

+pushd python

+python2 setup.py build

+python3 setup.py build

+popd

 %install

 rm -rf $RPM_BUILD_ROOT

@@ -112,6 +133,11 @@ rm -f $RPM_BUILD_ROOT/%{_datadir}/cracklib/cracklib-small

 ln -s cracklib-format $RPM_BUILD_ROOT/%{_sbindir}/mkdict

 ln -s cracklib-packer $RPM_BUILD_ROOT/%{_sbindir}/packer

+pushd python

+python2 setup.py install --skip-build --root %{buildroot}

+python3 setup.py install --skip-build --root %{buildroot}

+popd

+

 %check

 mkdir -p /usr/share/cracklib

 cp $RPM_BUILD_ROOT%{_datadir}/cracklib/* /usr/share/cracklib/

@@ -164,7 +190,11 @@ rm -f %{_datadir}/cracklib/pw_dict.pwi

 %files python

 %defattr(-,root,root)

-%{_libdir}/python*

+%{python2_sitelib}/*

+

+%files -n python3-cracklib

+%defattr(-,root,root)

+%{python3_sitelib}/*

 %files dicts

 %defattr(-,root,root)

@@ -176,6 +206,8 @@ rm -f %{_datadir}/cracklib/pw_dict.pwi

 %{_datadir}/locale/*

 %changelog

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

+-   Move python2 requires to python subpackage and added python3.

 *   Thu Apr 13 2017 Bo Gan <ganb@vmware.com> 2.9.6-5

 -   Fix CVE-2016-6318, trigger for cracklib-dicts

 -   Trigger for dynamic symlink for dict

@@ -1,25 +1,22 @@

-Summary: Create deltas between rpms

-Name: deltarpm

-Version: 3.6.1

-Release: 1%{?dist}

-License: BSD

-Group: Applications/System

-Vendor: VMware, Inc.

-Distribution: Photon

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

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

+

+Summary:        Create deltas between rpms

+Name:           deltarpm

+Version:        3.6.1

+Release:        2%{?dist}

+License:        BSD

+Group:          Applications/System

+Vendor:         VMware, Inc.

+Distribution:   Photon

 URL: https://github.com/rpm-software-management/deltarpm

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

 %define sha1 deltarpm=29f39a8c55f48a7e538cabe49ca3203ebb823b2c

-BuildRequires: rpm-devel >= 4.2

-BuildRequires: bzip2-devel

-BuildRequires: xz-devel

-BuildRequires: popt-devel

-BuildRequires: python2

-BuildRequires: python2-libs

-BuildRequires: python2-devel

-Requires: perl

-Requires: python2

-Requires: python2-libs

-

+BuildRequires:  rpm-devel >= 4.2

+BuildRequires:  bzip2-devel

+BuildRequires:  xz-devel

+BuildRequires:  popt-devel

+Requires:       perl

 %description

 A deltarpm contains the difference between an old

@@ -28,6 +25,27 @@ to recreate the new rpm from the deltarpm and the old

 one. You don't have to have a copy of the old rpm,

 deltarpms can also work with installed rpms.

+%package        python

+Summary:        Python2 bindings for deltarpm

+License:        LGPLv2+

+BuildRequires:  python2-devel

+BuildRequires:  python2-libs

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

+Requires:       python2

+

+%description python

+The deltarpm-python package contains the python2 bindings for deltarpm.

+

+%package  -n    python3-deltarpm

+Summary:        Python3 bindings for deltarpm

+License:        LGPLv2+

+BuildRequires:  python3-devel

+BuildRequires:  python3-libs

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

+Requires:       python2

+

+%description -n python3-deltarpm

+The python3-deltarpm package contains the python3 bindings for deltarpm.

 %prep

 %setup

@@ -60,18 +78,27 @@ deltarpms can also work with installed rpms.

 %{_bindir}/makedeltarpm

 %{_bindir}/rpmdumpheader

 %{_bindir}/fragiso

+

+%files python

+%defattr(-,root,root)

 %{python_sitelib}/*

+%files -n python3-deltarpm

+%defattr(-,root,root)

+%{python3_sitelib}/*

+

 %changelog

-* Tue Apr 25 2017 Bo Gan <ganb@vmware.com> 3.6.1-1

-- Update to 3.6.1

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

--	GA - Bump release of all rpms

-* Tue Apr 28 2015 Fabio Rapposelli <fabio@vmware.com> - 3.6-2

-- Fixed Python install.

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

+-   Move python2 requires to python subpackage and added python3.

+*   Tue Apr 25 2017 Bo Gan <ganb@vmware.com> 3.6.1-1

+-   Update to 3.6.1

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

+-   GA - Bump release of all rpms

+*   Tue Apr 28 2015 Fabio Rapposelli <fabio@vmware.com> - 3.6-2

+-   Fixed Python install.

-* Fri Mar 09 2007 Dag Wieers <dag@wieers.com> - 3.3-2

-- Fixed group.

+*   Fri Mar 09 2007 Dag Wieers <dag@wieers.com> - 3.3-2

+-   Fixed group.

-* Sat Dec 03 2005 Dries Verachtert <dries@ulyssis.org> - 3.3-1

-- Initial package.

+*   Sat Dec 03 2005 Dries Verachtert <dries@ulyssis.org> - 3.3-1

+-   Initial package.