开源软件构建与测试

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 8

_service:tar_scm:gpgme.spec Changed

@@ -1,6 +1,6 @@
 Name:           gpgme
-Version:        1.17.0
-Release:        3
+Version:        1.21.0
+Release:        1
 Summary:        GnuPG Made Easy
 License:        GPLv2+ and LGPLv2+
 URL:            https://gnupg.org/related_software/gpgme/
@@ -13,14 +13,13 @@
 Patch1:         gpgme-1.3.2-largefile.patch
 # Let's fix stupid AX_PYTHON_DEVEL
 Patch2:         0001-fix-stupid-ax_python_devel.patch
-# support python3.10
-Patch3:         gpgme-Add-support-for-building-with-Python3.10.patch
+Patch3:         backport-0002-setup_py_extra_opts.patch
 
 BuildRequires:  autoconf automake gcc gcc-c++ gawk gnupg2 >= 2.2.24
 BuildRequires:  libgpg-error-devel >= 1.36 libassuan-devel >= 2.4.2
 BuildRequires:  swig chrpath cmake qt5-qtbase-devel python3-devel
 Requires:       gnupg2 >= 2.2.24
-Provides:       %{name}%{?_isa} <= %{version}-%{release}
+Provides:       %{name}%{?_isa} = %{version}-%{release}
 
 
 %description
@@ -34,10 +33,10 @@
 Summary:        C++ API wrapper for GPGME
 Requires:       %{name} = %{version}-%{release}
 Obsoletes:      gpgme-pp < 1.8.0-7
-Obsoletes:      %{name}pp
+Obsoletes:      %{name}pp < %{version}-%{release}
 Provides:       gpgme-pp = %{version}-%{release} 
 Provides:       gpgme-pp%{?_isa} = %{version}-%{release}
-Provides:       %{name}pp%{?_isa} <= %{version}-%{release}
+Provides:       %{name}pp%{?_isa} = %{version}-%{release}
 
 %description -n cpp-%{name}
 %{summary}.
@@ -45,8 +44,8 @@
 %package -n qt-%{name}
 Summary:        Qt API wrapper for GPGME
 Requires:       cpp-%{name} = %{version}-%{release}
-Obsoletes:      q%{name}
-Provides:       q%{name}
+Obsoletes:      q%{name} < %{version}-%{release}
+Provides:       q%{name} = %{version}-%{release}
 
 %description -n qt-%{name}
 %{summary}.
@@ -56,8 +55,8 @@
 %{?python_provide:%python_provide python3-gpg}
 Requires:       %{name} = %{version}-%{release}
 Obsoletes:      platform-python-gpg < %{version}-%{release}
-Obsoletes:      python3-gpg
-Provides:       python3-gpg
+Obsoletes:      python3-gpg < %{version}-%{release}
+Provides:       python3-gpg = %{version}-%{release}
 
 %description -n python3-%{name}
 %{summary}.
@@ -65,10 +64,10 @@
 %package devel
 Summary:        Development headers and libraries for %{name}
 Requires:       %{name} = %{version}-%{release} libgpg-error-devel >= 1.36 info
-Obsoletes:      gpgme-pp-devel < 1.8.0-7 %{name}pp-devel q%{name}-devel
-Provides:       gpgme-pp-devel = %{version}-%{release} %{name}pp-devel q%{name}-devel
-Obsoletes:      %{name}pp-devel q%{name}-devel
-provides:       %{name}pp-devel q%{name}-devel
+Obsoletes:      gpgme-pp-devel < 1.8.0-7
+Provides:       gpgme-pp-devel = %{version}-%{release}
+Obsoletes:      %{name}pp-devel < %{version}-%{release} q%{name}-devel < %{version}-%{release}
+Provides:       %{name}pp-devel = %{version}-%{release} q%{name}-devel = %{version}-%{release}
 
 %description devel
 %{summary}.
@@ -84,17 +83,13 @@
 %autosetup -n %{name}-%{version} -p1
 
 %build
-# Generate the same python dir as in the %%install
-export SETUPTOOLS_USE_DISTUTILS=stdlib
 %configure --disable-static --disable-silent-rules --enable-languages=cpp,qt,python
 %make_build
 
 %install
-# python-setuptools >= v60.0.0 changes the SETUPTOOLS_USE_DISTUTILS default value to local,
-# it does't use Python's standard library distutils default.
-# As a result, failed to build gpgme.
-# Now, set SETUPTOOLS_USE_DISTUTILS value to stdlib
-export SETUPTOOLS_USE_DISTUTILS=stdlib
+# The SETUP_PY_EXTRA_OPTS used in the patch backport-0002-setup_py_extra_opts.patch
+# This forces setuptools to use .egg-info format
+export SETUP_PY_EXTRA_OPTS="--single-version-externally-managed --root=/"
 %make_install
 
 chrpath -d  $(find %{buildroot} -name gpgme-json)
@@ -108,8 +103,6 @@
 chrpath -d %{buildroot}%{_libdir}/libq%{name}.so*
 
 %check
-# Generate the same python dir as in the %%install
-export SETUPTOOLS_USE_DISTUTILS=stdlib
 make check
 
 %ldconfig_scriptlets
@@ -155,6 +148,12 @@
 
 
 %changelog
+* Mon Jul 17 2023 yixiangzhike <yixiangzhike007@163.com> - 1.21.0-1
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:update to 1.21.0
+
 * Sat May 13 2023 yixiangzhike <yixiangzhike007@163.com> - 1.17.0-3
 - Type:bugfix
 - CVE:NA

_service:tar_scm:backport-0002-setup_py_extra_opts.patch Added

_service:tar_scm:gpgme-Add-support-for-building-with-Python3.10.patch Deleted

@@ -1,687 +0,0 @@
-From 82e25a4a831699a08aeefc9f3cda4c6ebedbb26a Mon Sep 17 00:00:00 2001
-From: yixiangzhike <yixiangzhike007@163.com>
-Date: Tue, 28 Dec 2021 15:48:33 +0800
-Subject: PATCH gpgme Add support for building with python3.10
-
----
- configure    | 634 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- configure.ac |   2 +-
- m4/python.m4 |   2 +-
- 3 files changed, 636 insertions(+), 2 deletions(-)
-
-diff --git a/configure b/configure
-index f307736..6cfa831 100755
---- a/configure
-+++ b/configure
-@@ -23921,6 +23921,642 @@ $as_echo "$as_me: WARNING:
- 
-         if test -n "$PYTHON"; then
-       # If the user set $PYTHON, use it and don't search something else.
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version is >= 3.10" >&5
-+$as_echo_n "checking whether $PYTHON version is >= 3.10... " >&6; }
-+      prog="import sys
-+# split strings by '.' and convert to numeric.  Append some zeros
-+# because we need at least 4 digits for the hex conversion.
-+# map returns an iterator in Python 3.0 and a list in 2.x
-+minver = list(map(int, '3.10'.split('.'))) + 0, 0, 0
-+minverhex = 0
-+# xrange is not present in Python 3.0 and range returns an iterator
-+for i in list(range(0, 4)): minverhex = (minverhex << 8) + minveri
-+sys.exit(sys.hexversion < minverhex)"
-+  if { echo "$as_me:$LINENO: $PYTHON -c "$prog"" >&5
-+   ($PYTHON -c "$prog") >&5 2>&5
-+   ac_status=$?
-+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+   (exit $ac_status); }; then :
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+			       as_fn_error $? "Python interpreter is too old" "$LINENO" 5
-+fi
-+      am_display_PYTHON=$PYTHON
-+    else
-+      # Otherwise, try each interpreter until we find one that satisfies
-+      # VERSION.
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 3.10" >&5
-+$as_echo_n "checking for a Python interpreter with version >= 3.10... " >&6; }
-+if ${am_cv_pathless_PYTHON+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+	for am_cv_pathless_PYTHON           in python3.10 none; do
-+	  test "$am_cv_pathless_PYTHON" = none && break
-+	  prog="import sys
-+# split strings by '.' and convert to numeric.  Append some zeros
-+# because we need at least 4 digits for the hex conversion.
-+# map returns an iterator in Python 3.0 and a list in 2.x
-+minver = list(map(int, '3.10'.split('.'))) + 0, 0, 0
-+minverhex = 0
-+# xrange is not present in Python 3.0 and range returns an iterator
-+for i in list(range(0, 4)): minverhex = (minverhex << 8) + minveri
-+sys.exit(sys.hexversion < minverhex)"
-+  if { echo "$as_me:$LINENO: $am_cv_pathless_PYTHON -c "$prog"" >&5
-+   ($am_cv_pathless_PYTHON -c "$prog") >&5 2>&5
-+   ac_status=$?
-+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+   (exit $ac_status); }; then :
-+  break
-+fi
-+	done
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_pathless_PYTHON" >&5
-+$as_echo "$am_cv_pathless_PYTHON" >&6; }
-+      # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON.
-+      if test "$am_cv_pathless_PYTHON" = none; then
-+	PYTHON=:
-+      else
-+        # Extract the first word of "$am_cv_pathless_PYTHON", so it can be a program name with args.
-+set dummy $am_cv_pathless_PYTHON; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if ${ac_cv_path_PYTHON+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  case $PYTHON in
-+  \\/* | ?:\\/*)
-+  ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+  ;;
-+esac
-+fi
-+PYTHON=$ac_cv_path_PYTHON
-+if test -n "$PYTHON"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5
-+$as_echo "$PYTHON" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+      fi
-+      am_display_PYTHON=$am_cv_pathless_PYTHON
-+    fi
-+
-+
-+  if test "$PYTHON" = :; then
-+      :
-+  else
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5
-+$as_echo_n "checking for $am_display_PYTHON version... " >&6; }
-+if ${am_cv_python_version+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version:3)"`
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
-+$as_echo "$am_cv_python_version" >&6; }
-+  PYTHON_VERSION=$am_cv_python_version
-+
-+
-+
-+  PYTHON_PREFIX='${prefix}'
-+
-+  PYTHON_EXEC_PREFIX='${exec_prefix}'
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5
-+$as_echo_n "checking for $am_display_PYTHON platform... " >&6; }
-+if ${am_cv_python_platform+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5
-+$as_echo "$am_cv_python_platform" >&6; }
-+  PYTHON_PLATFORM=$am_cv_python_platform
-+
-+
-+  # Just factor out some code duplication.
-+  am_python_setup_sysconfig="\
-+import sys
-+# Prefer sysconfig over distutils.sysconfig, for better compatibility
-+# with python 3.x.  See automake bug#10227.
-+try:
-+    import sysconfig
-+except ImportError:
-+    can_use_sysconfig = 0
-+else:
-+    can_use_sysconfig = 1
-+# Can't use sysconfig in CPython 2.7, since it's broken in virtualenvs:
-+# <https://github.com/pypa/virtualenv/issues/118>
-+try:
-+    from platform import python_implementation
-+    if python_implementation() == 'CPython' and sys.version:3 == '2.7':
-+        can_use_sysconfig = 0
-+except ImportError:
-+    pass"
-+
-+
-+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5
-+$as_echo_n "checking for $am_display_PYTHON script directory... " >&6; }
-+if ${am_cv_python_pythondir+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test "x$prefix" = xNONE
-+     then
-+       am_py_prefix=$ac_default_prefix
-+     else
-+       am_py_prefix=$prefix
-+     fi
-+     am_cv_python_pythondir=`$PYTHON -c "
-+$am_python_setup_sysconfig
-+if can_use_sysconfig:
-+    sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'})
-+else:
-+    from distutils import sysconfig
-+    sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix')
-+sys.stdout.write(sitedir)"`

_service:tar_scm:gpgme-1.17.0.tar.bz2 -> _service:tar_scm:gpgme-1.21.0.tar.bz2 Changed