Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package genders for openSUSE:Factory checked in at 2022-12-06 15:35:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/genders (Old) and /work/SRC/openSUSE:Factory/.genders.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "genders" Tue Dec 6 15:35:41 2022 rev:10 rq:1040651 version:1.28.1 Changes: -------- --- /work/SRC/openSUSE:Factory/genders/genders.changes 2022-07-26 19:45:03.793882234 +0200 +++ /work/SRC/openSUSE:Factory/.genders.new.1835/genders.changes 2022-12-06 15:35:41.926256218 +0100 @@ -1,0 +2,13 @@ +Tue Dec 6 12:14:45 UTC 2022 - Dirk Müller <dmuel...@suse.com> + +- update to 1.28.1: + * Build Bindings for *both* python2 and python3 + +------------------------------------------------------------------- +Thu Dec 1 02:13:43 UTC 2022 - Steve Kowalik <steven.kowa...@suse.com> + +- Actually move Python plugin to building with Python 3, and rename the + Python binding package to reflect this. +- Add patch also-check-for-python3.patch to check for Python 3 as well. + +------------------------------------------------------------------- Old: ---- genders-1.27.3.tar.gz New: ---- also-check-for-python3.patch genders-1.28.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ genders.spec ++++++ --- /var/tmp/diff_new_pack.NZ592o/_old 2022-12-06 15:35:43.362264298 +0100 +++ /var/tmp/diff_new_pack.NZ592o/_new 2022-12-06 15:35:43.370264344 +0100 @@ -19,10 +19,10 @@ # Check file META in sources: update so_version to (API_CURRENT - API_AGE) %define c_api 0 %define cpp_api 2 -%define slash_ver 1-27-3 +%define slash_ver 1-28-1 Name: genders -Version: 1.27.3 +Version: 1.28.1 Release: 0 Summary: Static cluster configuration database License: GPL-2.0-or-later @@ -31,6 +31,7 @@ Patch1: Fix-Python-package-installation-use-root.patch Patch2: Remove-PERL_DESTDIR-use-DESTDIR-instead.patch Patch4: lua_bindings.patch +Patch5: also-check-for-python3.patch URL: https://github.com/chaos/genders BuildRequires: autoconf BuildRequires: autoconf-archive @@ -41,9 +42,6 @@ BuildRequires: libtool BuildRequires: lua-devel BuildRequires: patchelf -BuildRequires: python -BuildRequires: python-devel -BuildRequires: python3 BuildRequires: python3-devel BuildRequires: perl(ExtUtils::MakeMaker) Requires: %{name}-base @@ -80,13 +78,14 @@ %description devel genders headers and libraries files needed for development -%package -n python-%{name} +%package -n python3-%{name} Summary: Python bindings for genders Group: Development/Languages/Python +Provides: python-%{name} = %{version} +Obsoletes: python-%{name} Requires: %{name} = %{version} -Requires: python -%description -n python-%{name} +%description -n python3-%{name} Necessary files for using genders with Python. %package -n lua-%{name} @@ -146,6 +145,7 @@ %autopatch -p1 %build +export PYTHON=python3 aclocal --force --install -I config libtoolize -f -i automake -a -f @@ -247,7 +247,7 @@ %{_mandir}/man3/libgenders* %if %{?_with_python_extensions:1}%{!?_with_python_extensions:0} -%files -n python-%{name} +%files -n python3-%{name} %{_libdir}/python* %endif ++++++ also-check-for-python3.patch ++++++ Index: genders-1.27.3/configure.ac =================================================================== --- genders-1.27.3.orig/configure.ac +++ genders-1.27.3/configure.ac @@ -80,7 +80,7 @@ AM_PROG_LEX AC_PROG_YACC AM_CONDITIONAL(WITH_GNU_LD, test "$with_gnu_ld" = "yes") AC_PATH_PROG([PERL], [perl]) -AC_PATH_PROG([PYTHON], [python]) +AC_PATH_PROG([PYTHON], [python], [python3]) AC_PATH_PROG([POD2MAN], [pod2man], [/usr/bin/pod2man], [$PATH:/usr/perl5/bin/]) AC_PATH_PROG([JAVAC], [javac]) AC_PATH_PROG([JAVAH], [javah]) ++++++ genders-1.27.3.tar.gz -> genders-1.28.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/genders-genders-1-27-3/META new/genders-genders-1-28-1/META --- old/genders-genders-1-27-3/META 2019-11-26 00:13:43.000000000 +0100 +++ new/genders-genders-1-28-1/META 2020-05-15 21:52:08.000000000 +0200 @@ -5,5 +5,5 @@ ## Meta: 1 Name: genders - Version: 1.27 - Release: 2 + Version: 1.28 + Release: 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/genders-genders-1-27-3/configure new/genders-genders-1-28-1/configure --- old/genders-genders-1-27-3/configure 2019-11-26 00:13:43.000000000 +0100 +++ new/genders-genders-1-28-1/configure 2020-05-15 21:52:08.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for genders 1.27. +# Generated by GNU Autoconf 2.69 for genders 1.28. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -587,8 +587,8 @@ # Identity of this package. PACKAGE_NAME='genders' PACKAGE_TARNAME='genders' -PACKAGE_VERSION='1.27' -PACKAGE_STRING='genders 1.27' +PACKAGE_VERSION='1.28' +PACKAGE_STRING='genders 1.28' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1375,7 +1375,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures genders 1.27 to adapt to many kinds of systems. +\`configure' configures genders 1.28 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1446,7 +1446,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of genders 1.27:";; + short | recursive ) echo "Configuration of genders 1.28:";; esac cat <<\_ACEOF @@ -1582,7 +1582,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -genders configure 1.27 +genders configure 1.28 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2068,7 +2068,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by genders $as_me 1.27, which was +It was created by genders $as_me 1.28, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3071,7 +3071,7 @@ # Define the identity of the package. PACKAGE='genders' - VERSION='1.27' + VERSION='1.28' cat >>confdefs.h <<_ACEOF @@ -17380,7 +17380,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by genders $as_me 1.27, which was +This file was extended by genders $as_me 1.28, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17446,7 +17446,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -genders config.status 1.27 +genders config.status 1.28 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/genders-genders-1-27-3/configure.ac new/genders-genders-1-28-1/configure.ac --- old/genders-genders-1-27-3/configure.ac 2019-11-26 00:13:43.000000000 +0100 +++ new/genders-genders-1-28-1/configure.ac 2020-05-15 21:52:08.000000000 +0200 @@ -7,7 +7,7 @@ ## # Prologue. ## -AC_INIT([genders],[1.27]) +AC_INIT([genders],[1.28]) AC_META AC_CONFIG_AUX_DIR([config]) AC_CONFIG_SRCDIR([README]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/genders-genders-1-27-3/genders.spec.in new/genders-genders-1-28-1/genders.spec.in --- old/genders-genders-1-27-3/genders.spec.in 2019-11-26 00:13:43.000000000 +0100 +++ new/genders-genders-1-28-1/genders.spec.in 2020-05-15 21:52:08.000000000 +0200 @@ -9,11 +9,46 @@ Requires: perl BuildRequires: bison flex BuildRequires: perl(ExtUtils::MakeMaker) -BuildRequires: python -BuildRequires: python-devel BuildRequires: libtool BuildRoot: %{_tmppath}/%{name}-%{version} +%{!?_with_perl_extensions: %{!?_without_perl_extensions: %define _with_perl_extensions --with-perl-extensions}} +%{!?_with_python_extensions: %{!?_without_python_extensions: %define _with_python_extensions --with-python-extensions}} +%{!?_with_cplusplus_extensions: %{!?_without_cplusplus_extensions: %define _with_cplusplus_extensions --with-cplusplus-extensions}} +%{!?_with_java_extensions: %{!?_without_java_extensions: %define _without_java_extensions --without-java-extensions}} + +# choose vendor arch by default +%{!?_with_perl_site_arch: %{!?_with_perl_vendor_arch: %define _with_perl_vendor_arch --with-perl-vendor-arch}} + +# If python extensions are requested, then build versions +%if %{?_with_python_extensions:1}%{!?_with_python_extensions:0} + +# Helper variable that tells us how many builds we have to do +%global _numbuilds 0 + +# build for python 2 unless speficially requested otherwise +%{!?_with_python2: %define _with_python2 1} +%if 0%{?_with_python2} +BuildRequires: python2 +BuildRequires: python2-devel +%global _numbuilds %(expr %{expand: %{_numbuilds}} + 1) +%endif + +# build for python 3 unless speficially requested otherwise +%{!?_with_python3: %define _with_python3 1} +%if 0%{?_with_python3} +BuildRequires: python3 +BuildRequires: python3-devel +%global _numbuilds %(expr %{expand: %{_numbuilds}} + 1) +%endif + +%else +# Helper variable that tells us how many builds we have to do +%global _numbuilds 1 +%define _with_python2 0 +%define _with_python3 0 +%endif + %description Genders is a static cluster configuration database used for cluster configuration management. It is used by a variety of tools and @@ -24,24 +59,82 @@ into a plain text file, it becomes possible to change the configuration of a cluster by modifying only one file. +%if 0%{?_with_python2} +%package python +Summary: python2 bindings +Group: System Environment/Base +%description python +python2 bindings +%endif + +%if 0%{?_with_python3} +%package python%{python3_version_nodots} +Summary: python3 bindings +Group: System Environment/Base +%description python%{python3_version_nodots} +python3 bindings +%endif + %package compat Summary: Compatibility library Group: System Environment/Base %description compat genders API that is compatible with earlier releases of genders -%{!?_with_perl_extensions: %{!?_without_perl_extensions: %define _with_perl_extensions --with-perl-extensions}} -%{!?_with_python_extensions: %{!?_without_python_extensions: %define _with_python_extensions --with-python-extensions}} -%{!?_with_cplusplus_extensions: %{!?_without_cplusplus_extensions: %define _with_cplusplus_extensions --with-cplusplus-extensions}} -%{!?_with_java_extensions: %{!?_without_java_extensions: %define _without_java_extensions --without-java-extensions}} +%prep +%if 0%{!?_numbuilds} || 0%{?_numbuilds} == 0 +echo -e "Python extensions were requested, but none will be built.\n\ +Are _with_python2 and _with_python3 both disabled?" +exit 1 +%endif -# choose vendor arch by default -%{!?_with_perl_site_arch: %{!?_with_perl_vendor_arch: %define _with_perl_vendor_arch --with-perl-vendor-arch}} +%setup -q -n %{name}-%{version} -%prep -%setup -q -n %{name}-%{version} +%if 0%{?_with_python3} +%{__rm} -rf %{py3dir} +%{__cp} -a . %{py3dir} +%endif %build + +%if 0%{?_with_python2} || 0%{!?_with_python3} +# Ensure that AC_PATH_PROG is set for python2 +export PYTHON=%{__python2} +# Ensure we change into the build directory +pushd . +%else +# Ensure that AC_PATH_PROG is set for python3 +export PYTHON=%{__python3} +# Ensure we change into the build directory +pushd %{py3dir} +%endif + +%configure --program-prefix=%{?_program_prefix:%{_program_prefix}} \ + --with-extension-destdir="$RPM_BUILD_ROOT" \ + %{?_with_perl_extensions} \ + %{?_without_perl_extensions} \ + %{?_with_perl_site_arch} \ + %{?_without_perl_site_arch} \ + %{?_with_perl_vendor_arch} \ + %{?_without_perl_vendor_arch} \ + %{?_with_python_extensions} \ + %{?_without_python_extensions} \ + %{?_with_cplusplus_extensions} \ + %{?_without_cplusplus_extensions} \ + %{?_with_java_extensions} \ + %{?_without_java_extensions} +make +popd + +%if 0%{?_numbuilds} && 0%{?_numbuilds} > 1 && 0%{?_with_python3} + +# We know that we have one more build *and* that this must be for python3 + +# Ensure that AC_PATH_PROG is set for python3 +export PYTHON=%{__python3} + +# Ensure we change into the build directory +pushd %{py3dir} %configure --program-prefix=%{?_program_prefix:%{_program_prefix}} \ --with-extension-destdir="$RPM_BUILD_ROOT" \ %{?_with_perl_extensions} \ @@ -57,10 +150,43 @@ %{?_with_java_extensions} \ %{?_without_java_extensions} make +popd + +%endif %install + +# Clean up any old remnanants rm -rf $RPM_BUILD_ROOT + +%if 0%{?_with_python2} || 0%{!?_with_python3} +# Ensure that AC_PATH_PROG is set for python2 +export PYTHON=%{__python2} +# Ensure we change into the build directory +pushd . +%else +# Ensure that AC_PATH_PROG is set for python3 +export PYTHON=%{__python3} +# Ensure we change into the build directory +pushd %{py3dir} +%endif + DESTDIR="$RPM_BUILD_ROOT" make install +popd + +%if 0%{?_numbuilds} && 0%{?_numbuilds} > 1 && 0%{?_with_python3} +# We know that we have one more build *and* that this must be for python3 + +# Ensure that AC_PATH_PROG is set for python3 +export PYTHON=%{__python3} + +# Ensure we change into the build directory +pushd %{py3dir} +DESTDIR="$RPM_BUILD_ROOT" make install +popd + +%endif + %files %defattr(-,root,root) @@ -88,9 +214,6 @@ %{_mandir}/man3/Genders* %{_perldir}/* %endif -%if %{?_with_python_extensions:1}%{!?_with_python_extensions:0} -%{_exec_prefix}/lib*/python* -%endif %if %{?_with_cplusplus_extensions:1}%{!?_with_cplusplus_extensions:0} %{_libdir}/libgendersplusplus.* %endif @@ -104,4 +227,15 @@ %{_mandir}/man3/gendlib* %{_prefix}/lib/genders/* +%if 0%{?_with_python2} +%files python +%defattr(-,root,root) +%{_libdir}/python2* +%endif + +%if 0%{?_with_python3} +%files python%{python3_version_nodots} +%defattr(-,root,root) +%{_libdir}/python3* +%endif
