@@ -1,76 +1,100 @@

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

-

-Name:       	gobject-introspection

-Summary:    	Introspection system for GObject-based libraries

-Version:    	1.52.1

-Release:    	1%{?dist}

-Group:      	Development/Libraries

-License:    	GPLv2+, LGPLv2+, MIT

-URL:        	http://live.gnome.org/GObjectIntrospection

-Source0:    	http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/1.52/%{name}-%{version}.tar.xz

+%{!?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:           gobject-introspection

+Summary:        Introspection system for GObject-based libraries

+Version:        1.52.1

+Release:        2%{?dist}

+Group:          Development/Libraries

+License:        GPLv2+, LGPLv2+, MIT

+URL:            http://live.gnome.org/GObjectIntrospection

+Source0:        http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/1.52/%{name}-%{version}.tar.xz

 %define sha1 gobject-introspection=2a0c86bd23d27df0588b79404cfc5619ed6171e8

-Vendor:		VMware, Inc.

-Distribution:	Photon

+Vendor:         VMware, Inc.

+Distribution:   Photon

 BuildRequires:  gettext

 BuildRequires:  intltool

 BuildRequires:  flex

 BuildRequires:  bison

+BuildRequires:  which

 BuildRequires:  glib-devel

 BuildRequires:  libffi-devel

-BuildRequires:	go

-Requires:	libffi

-Requires:	glib >= 2.52.1

+BuildRequires:  go

+Requires:       libffi

+Requires:       glib >= 2.52.1

 %description

 GObject Introspection can scan C header and source files in order to

 generate introspection "typelib" files.  It also provides an API to examine

 typelib files, useful for creating language bindings among other

 things.

-%package python

-Summary:    Python package for handling GObject introspection data

-Group:      Development/Languages

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

-BuildRequires:	python2-devel

-BuildRequires:	python2-libs

+%package        python

+Summary:        Python package for handling GObject introspection data

+Group:          Development/Languages

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

+BuildRequires:  python2-devel

+BuildRequires:  python2-libs

 BuildRequires:  python-xml

-Requires:	python2

-%description python

+Requires:       python2

+Requires:       python-xml

+%description    python

+This package contains a Python package for handling the introspection

+data from Python.

+

+%package -n     python3-gobject-introspection

+Summary:        Python3 package for handling GObject introspection data

+Group:          Development/Languages

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

+BuildRequires:  python3-devel

+BuildRequires:  python3-libs

+Requires:       python3

+%description -n python3-gobject-introspection

 This package contains a Python package for handling the introspection

 data from Python.

 %package devel

-Summary:    Libraries and headers for gobject-introspection

-Group:      Development/Libraries

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

-Requires:   libffi-devel

-Requires:   glib-devel

-Requires:   python2

-Requires:   python2-devel

-Requires:   python2-libs

-Requires:   python-xml

+Summary:        Libraries and headers for gobject-introspection

+Group:          Development/Libraries

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

+Requires:       libffi-devel

+Requires:       glib-devel

 %description devel

 Libraries and headers for gobject-introspection.

 %prep

 %setup -q

+rm -rf ../p3dir

+cp -a . ../p3dir

 %build

-%configure

+%configure --with-python=/usr/bin/python2

+make %{?_smp_mflags}

+

+pushd ../p3dir

+%configure --with-python=/usr/bin/python3

 make %{?_smp_mflags}

+popd

 %install

-rm -rf $RPM_BUILD_ROOT/*

+rm -rf %{buildroot}/*

-make install DESTDIR=$RPM_BUILD_ROOT

+pushd ../p3dir

+make install DESTDIR=%{buildroot}

+# Move the python3 modules to the correct location

+mkdir -p %{buildroot}/%{python3_sitelib}

+mv %{buildroot}/%{_libdir}/gobject-introspection/giscanner %{buildroot}/%{python3_sitelib}

+popd

+make install DESTDIR=%{buildroot}

 # Move the python modules to the correct location

-mkdir -p $RPM_BUILD_ROOT/%{python_sitelib}

-mv $RPM_BUILD_ROOT/%{_libdir}/gobject-introspection/giscanner $RPM_BUILD_ROOT/%{python_sitelib}

+mkdir -p %{buildroot}/%{python2_sitelib}

+mv %{buildroot}/%{_libdir}/gobject-introspection/giscanner %{buildroot}/%{python2_sitelib}

 rm -rf $RPM_BUILD_ROOT/%{_datarootdir}/gtk-doc/html

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

+

 %check

 make  %{?_smp_mflags} check

@@ -88,7 +112,11 @@ make  %{?_smp_mflags} check

 %files python

 %defattr(-,root,root,-)

-%{python_sitelib}/giscanner

+%{python2_sitelib}/giscanner

+

+%files -n python3-gobject-introspection

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

+%{python3_sitelib}/giscanner

 %files devel

 %defattr(-,root,root,-)

@@ -103,17 +131,19 @@ make  %{?_smp_mflags} check

 %doc %{_mandir}/man1/*.gz

 %changelog

-*	Wed Apr 12 2017 Danut Moraru <dmoraru@vmware.com> 1.52.1-1

--	Updated to version 1.52.1

-*       Thu Oct 06 2016 ChangLee <changlee@vmware.com> 1.46.0-3

--       Modified %check

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

--	GA - Bump release of all rpms

-*       Thu Feb 25 2016 Kumar Kaushik <kaushikk@vmware.com> 1.46.0-1

--       Updated version.

-*       Mon Oct 12 2015 Xiaolin Li <xiaolinl@vmware.com> 1.43.3-4

--       Moving static lib files to devel package.

-*       Fri Oct 9 2015 Xiaolin Li <xiaolinl@vmware.com> 1.43.3-3

--       Removing la files from packages.

-*	Mon Jul 6 2015 Alexey Makhalov <amakhalov@vmware.com> 1.43.3-2

--	Added more requirements for devel subpackage.

+*   Tue May 23 2017 Xiaolin Li <xiaolinl@vmware.com> 1.52.1-2

+-   Added python3 subpackage.

+*   Wed Apr 12 2017 Danut Moraru <dmoraru@vmware.com> 1.52.1-1

+-   Updated to version 1.52.1

+*   Thu Oct 06 2016 ChangLee <changlee@vmware.com> 1.46.0-3

+-   Modified %check

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

+-   GA - Bump release of all rpms

+*   Thu Feb 25 2016 Kumar Kaushik <kaushikk@vmware.com> 1.46.0-1

+-   Updated version.

+*   Mon Oct 12 2015 Xiaolin Li <xiaolinl@vmware.com> 1.43.3-4

+-   Moving static lib files to devel package.

+*   Fri Oct 9 2015 Xiaolin Li <xiaolinl@vmware.com> 1.43.3-3

+-   Removing la files from packages.

+*   Mon Jul 6 2015 Alexey Makhalov <amakhalov@vmware.com> 1.43.3-2

+-   Added more requirements for devel subpackage.

@@ -1,28 +1,30 @@

-Summary:	Next generation system logger facilty

-Name:		syslog-ng

-Version:	3.9.1

-Release:	1%{?dist}

-License:	GPL + LGPL

-URL:		https://syslog-ng.org/

-Group:		System Environment/Daemons

-Vendor: 	VMware, Inc.

-Distribution: 	Photon

-Source0:	https://github.com/balabit/%{name}/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz

-%define sha1 syslog-ng=1ca437393d8895654452bef8ac0b996fe73284f8

-Source1:	60-syslog-ng-journald.conf

-Requires:	glib

-Requires:	json-glib

-Requires:	json-c

-Requires:   	eventlog

-Requires:	python2

-Requires:	systemd

-BuildRequires:	eventlog

-BuildRequires:	glib-devel

-BuildRequires:	json-glib-devel

-BuildRequires:	json-c-devel

-BuildRequires:	python2-libs

-BuildRequires:	python2-devel

-BuildRequires:	systemd-devel

+%{!?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:        Next generation system logger facilty

+Name:           syslog-ng

+Version:        3.9.1

+Release:        2%{?dist}

+License:        GPL + LGPL

+URL:            https://syslog-ng.org/

+Group:          System Environment/Daemons

+Vendor:         VMware, Inc.

+Distribution:   Photon

+Source0:        https://github.com/balabit/%{name}/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz

+%define sha1    syslog-ng=1ca437393d8895654452bef8ac0b996fe73284f8

+Source1:        60-syslog-ng-journald.conf

+Requires:       glib

+Requires:       json-glib

+Requires:       json-c

+Requires:       eventlog

+Requires:       systemd

+BuildRequires:  eventlog

+BuildRequires:  glib-devel

+BuildRequires:  json-glib-devel

+BuildRequires:  json-c-devel

+BuildRequires:  systemd-devel

+BuildRequires:  python2-devel

+BuildRequires:  python2

+BuildRequires:  python2-libs

 %description

  The syslog-ng application is a flexible and highly scalable

@@ -30,41 +32,82 @@ BuildRequires:	systemd-devel

  centralized logging, where the aim is to collect the log messages of several

  devices to a single, central log server.

-%package	devel

-Summary:	Header and development files for syslog-ng

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

-%description	devel

+%package -n     python2-syslog-ng

+Summary:        python2-syslog-ng

+BuildRequires:  python2

+BuildRequires:  python2-devel

+BuildRequires:  python2-libs

+Requires:       python2

+Requires:       python2-libs

+

+%description -n python2-syslog-ng

+Python 2 version.

+

+%package -n     python3-syslog-ng

+Summary:        python3-syslog-ng

+BuildRequires:  python3

+BuildRequires:  python3-devel

+BuildRequires:  python3-libs

+Requires:       python3

+Requires:       python3-libs

+

+%description -n python3-syslog-ng

+Python 3 version.

+

+%package        devel

+Summary:        Header and development files for syslog-ng

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

+%description    devel

  syslog-ng-devel package contains header files, pkfconfig files, and libraries

  needed to build applications using syslog-ng APIs.

-%package	python

-Summary:	python interface for syslog-ng

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

-%description	python

- This packages has the python interface to syslog-ng

-

 %prep

 %setup -q

-

+rm -rf ../p3dir

+cp -a . ../p3dir

 %build

+

+./configure \

+    CFLAGS="%{optflags}" \

+    CXXFLAGS="%{optflags}" \

+    --disable-silent-rules \

+    --prefix=%{_prefix} \

+    --bindir=%{_bindir} \

+    --includedir=%{_includedir} \

+    --libdir=%{_libdir} \

+    --sysconfdir=/etc/syslog-ng \

+    --enable-systemd \

+    --with-systemdsystemunitdir=%{_libdir}/systemd/system \

+    --enable-json=yes \

+    --with-jsonc=system \

+    --disable-java \

+    --disable-redis \

+    --with-python=2 \

+    PKG_CONFIG_PATH=/usr/local/lib/pkgconfig/

+make %{?_smp_mflags}

+pushd ../p3dir

 ./configure \

-	CFLAGS="%{optflags}" \

-	CXXFLAGS="%{optflags}" \

-	--disable-silent-rules \

-	--prefix=%{_prefix} \

-	--bindir=%{_bindir} \

-	--includedir=%{_includedir} \

-	--libdir=%{_libdir} \

-	--sysconfdir=/etc/syslog-ng \

-	--enable-systemd \

-	--with-systemdsystemunitdir=%{_libdir}/systemd/system \

-	--enable-json=yes \

-	--with-jsonc=system \

-	--disable-java \

-	--disable-redis \

-        PKG_CONFIG_PATH=/usr/local/lib/pkgconfig/

+    CFLAGS="%{optflags}" \

+    CXXFLAGS="%{optflags}" \

+    --disable-silent-rules \

+    --prefix=%{_prefix} \

+    --bindir=%{_bindir} \

+    --includedir=%{_includedir} \

+    --libdir=%{_libdir} \

+    --sysconfdir=/etc/syslog-ng \

+    --enable-systemd \

+    --with-systemdsystemunitdir=%{_libdir}/systemd/system \

+    --enable-json=yes \

+    --with-jsonc=system \

+    --disable-java \

+    --disable-redis \

+    --with-python=3 \

+    PYTHON=/bin/python3 \

+    PKG_CONFIG_PATH=/usr/local/lib/pkgconfig/

 make %{?_smp_mflags}

+popd

+

 %install

 [ %{buildroot} != "/"] && rm -rf %{buildroot}/*

 make DESTDIR=%{buildroot} install

@@ -75,9 +118,19 @@ rm -rf %{buildroot}/%{_infodir}

 install -vd %{buildroot}%{_sysconfdir}/systemd/journald.conf.d/

 install -p -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/systemd/journald.conf.d/

 %{_fixperms} %{buildroot}/*

+pushd ../p3dir

+make DESTDIR=%{buildroot} install

+rm %{buildroot}/%{_libdir}/pkgconfig/syslog-ng-test.pc

+rm %{buildroot}/%{_libdir}/syslog-ng/libtest/libsyslog-ng-test.a

+rm -rf %{buildroot}/%{_infodir}

+find %{buildroot} -name "*.la" -exec rm -f {} \;

+popd

 %check

 make %{?_smp_mflags} check

+pushd ../p3dir

+make %{?_smp_mflags} check

+popd

 %post

 if [ $1 -eq 1 ] ; then

@@ -107,6 +160,14 @@ rm -rf %{buildroot}/*

 %{_libdir}/syslog-ng/lib*.so

 /usr/share/syslog-ng/*

+%files -n python2-syslog-ng

+%defattr(-,root,root)

+%{python2_sitelib}/*

+

+%files -n python3-syslog-ng

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

+%{python3_sitelib}/*

+

 %files devel

 %defattr(-,root,root)

 %{_includedir}/syslog-ng/*

@@ -114,11 +175,9 @@ rm -rf %{buildroot}/*

 %{_libdir}/libsyslog-ng-native-connector.a

 %{_libdir}/pkgconfig/*

-%files python

-%defattr(-,root,root)

-/usr/lib/python2.7/site-packages/*

-

 %changelog

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

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

 *   Tue Apr 11 2017 Vinay Kulkarni <kulkarniv@vmware.com> 3.9.1-1

 -   Update to version 3.9.1

 *   Tue Oct 04 2016 ChangLee <changlee@vmware.com> 3.6.4-6

@@ -4,14 +4,13 @@

         "sudo",

         "XML-Parser",

         "intltool",

-        "mercurial",

         "libsigc++",

         "boost",

         "build-essential",

         "bison",

         "gdb",

         "libpipeline",

-        "python2-tools",

+        "python3-tools",

         "check",

         "libltdl",

         "glibc-lang",

@@ -46,20 +45,19 @@

         "perl-IO-Socket-SSL",

         "tcsh",

         "gobject-introspection",

-        "gobject-introspection-python",

+        "python3-gobject-introspection",

         "bash-lang",

         "kbd",

         "coreutils-lang",

         "libxslt",

         "docbook-xml",

         "docbook-xsl",

-        "gtk-doc",

         "texinfo",

         "tar",

         "kubernetes",

         "cyrus-sasl",

         "openldap",

-        "python-iniparse",

+        "python3-iniparse",

         "psmisc",

         "etcd",

         "util-linux-lang",

@@ -74,7 +72,7 @@

         "groff",

         "man-db",

         "man-pages",

-        "python-hawkey",

+        "python3-hawkey",

         "ruby",

         "wget",

         "Linux-PAM-lang",

@@ -85,7 +83,6 @@

         "nano",

         "ncurses-compat", 

         "tzdata",

-        "itstool",

         "sed-lang",

         "gptfdisk",

         "ntp",

@@ -101,12 +98,10 @@

         "ostree",

         "libhif",

         "rpm-ostree",

-        "createrepo",

         "glibmm",

         "deltarpm",

         "cdrkit",

         "libgsystem",

-        "rpm-ostree-toolbox",

         "libsepol",

         "libselinux",

         "device-mapper-libs",

@@ -117,21 +112,19 @@

         "device-mapper-event-libs",

         "libacl",

         "libselinux-utils",

-        "libselinux-python",

+        "libselinux-python3",

         "libaio",

         "thin-provisioning-tools",

         "lvm2",

         "lvm2-libs",

-        "lvm2-python-libs",

+        "python3-lvm2-libs",

         "lzo",

         "lzo-minilzo",

         "swig",

-        "pycurl",

-        "urlgrabber",

-        "yum-metadata-parser",

-        "yum",

+        "pycurl3",

+        "python3-yum-metadata-parser",

         "strace",

-        "cracklib-python",

+        "cracklib-python3",

         "haveged",

         "vim-extra",

         "postgresql",

@@ -181,13 +174,12 @@

         "openjdk8-sample",

         "openjdk8-doc",

         "haproxy",

-        "cython",

-        "python-lxml",

-        "python-pycparser",

-        "python-cffi",

-        "python-cryptography",

+        "cython3",

+        "python3-lxml",

+        "python3-pycparser",

+        "python3-cffi",

+        "python3-cryptography",

         "cifs-utils",

-        "python-curses",

         "c-ares",

         "dnsmasq",

         "ddclient",